pmd规范

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java

@@ -54,7 +54,7 @@ public class BaseSalesController {
 
         Integer maxLevel = 0;
         /******线下渠道需要点击下钻，该值只会在线下时才会使用********/
-        LevelVo levelVo = this.storeSearchUtils.getLevel(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
+        LevelVo levelVo = this.storeSearchUtils.getLevel(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJson());
         maxLevel = levelVo.getMaxLevel();
         if(qo.getLevel() == null){
             qo.setLevel(levelVo.getLevel());
@@ -68,7 +68,7 @@ public class BaseSalesController {
         /****首页进入基础页面时，如果渠道为空，根据当前条件判断渠道，channel==null表示多渠道***/
         if(qo.getChannel() == null){
             /**********设置层级名称，只有在首次进入页面会展示，下钻均显示返回上一级*********/
-            Integer newChannel = this.storeSearchUtils.getChannel(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
+            Integer newChannel = this.storeSearchUtils.getChannel(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJson());
             qo.setChannel(newChannel);
         }
         /***********如果是线下的第一层级或者门店导购层级，需要展示切换层级按钮*************/
@@ -92,7 +92,7 @@ public class BaseSalesController {
         vo.setPage(this.goDownComponent.parseData(response.getResult(), qo.getChannel(), qo.getEnterpriseId(), qo.getLevel(), maxLevel));
         //合计
         dto.setCountType(2);
-        Integer wgs = storeSearchUtils.isWgs(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
+        Integer wgs = storeSearchUtils.isWgs(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJson());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
         boolean isContainNoOwnership = (qo.getChannel() == null || (qo.getChannel() == StoreChannelEnum.OFFLINE.getChannel().intValue() && qo.getLevel().intValue() == levelVo.getLevel())) && wgs == 1;
         if(isContainNoOwnership){
@@ -118,8 +118,8 @@ public class BaseSalesController {
     }
 
     private void setCommonBaseDTO(BaseSalesParamsDTO dto, BaseSalesParamQo qo, List<Integer> childrenStoreGroupIdList) {
-        List<Integer> list = this.storeSearchUtils.storeSearch(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
-        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
+        List<Integer> list = this.storeSearchUtils.storeSearch(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJson());
+        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJson());
         List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(qo.getUserId(), qo.getEnterpriseId());
 
         dto.setChannel(qo.getChannel());

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/PerformanceOverviewController.java

@@ -35,8 +35,8 @@ public class PerformanceOverviewController {
     @RequestMapping("get-performance-overview")
     public RestResponse selectPerformanceOverview(PerformanceOverviewQoAbstract params) {
         log.info("业绩概览参数：{}", JSON.toJSONString(params));
-        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
-        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
+        params.setOnlineStoreIdList(storeSearchUtils.onLineStoreSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
+        params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(performanceOverviewApiService.selectPerformanceOverview(params));