小程序计算首页总计

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsController.java

@@ -158,6 +158,14 @@ public class GoodsController {
     @RequestMapping("/historyList")
     public R historyList(@RequestParam Map<String, Object> params) {
         ParamUtils.setQueryPowerByRoleType(params, null, "merchSn", true);
+        if (Dict.roleType.item_2.getItem().equals(ShiroUtils.getUserEntity().getRoleType())) {
+            StoreEntity storeEntity = storeService.queryObject(ShiroUtils.getUserEntity().getStoreId());
+            if(StringUtils.isNotEmpty(storeEntity.getThirdPartyMerchCode())) {
+                params.put("thirdPartyMerchCode", storeEntity.getThirdPartyMerchCode());
+            }else{
+                throw new RRException("请维护门店信息中的第三方商户编号信息！再进行商品查看");
+            }
+        }
         //查询列表数据
         Query query = new Query(params);
 
@@ -186,7 +194,15 @@ public class GoodsController {
      */
     @RequestMapping("/queryTotal")
     public R queryTotal(@RequestParam Map<String, Object> params) {
-        ParamUtils.setQueryPowerByRoleType(params, "storeId", "merchSn", false);
+        ParamUtils.setQueryPowerByRoleType(params, null, "merchSn", true);
+        if (Dict.roleType.item_2.getItem().equals(ShiroUtils.getUserEntity().getRoleType())) {
+            StoreEntity storeEntity = storeService.queryObject(ShiroUtils.getUserEntity().getStoreId());
+            if(StringUtils.isNotEmpty(storeEntity.getThirdPartyMerchCode())) {
+                params.put("thirdPartyMerchCode", storeEntity.getThirdPartyMerchCode());
+            }else{
+                throw new RRException("请维护门店信息中的第三方商户编号信息！再进行商品查看");
+            }
+        }
         params.put("isDelete", 0);
         int sum = goodsService.queryTotal(params);
         return R.ok().put("goodsSum", sum);