Merge branch 'developer' into 'master'

查询设置无归属

See merge request !31

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

@@ -54,6 +54,7 @@ public class MemberCloudDataController {
         log.info("会员分布-趋势参数：{}", JSON.toJSONString(params));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
+        params.setOnlineStoreIdList(new ArrayList<>());
         goDownComponent.setValueTotal(params);
         return ResultControllerUtils.commonResult(memberCloudDataApiService.queryMemberDistributionTrend(params));
     }
@@ -62,6 +63,8 @@ public class MemberCloudDataController {
     public RestResponse pageMemberDistributionArea(MemberDistributionAreaQO params) {
         log.info("会员分布-区域参数：{}", JSON.toJSONString(params));
 
+        params.setOnlineStoreIdList(new ArrayList<>());
+
         BaseSalesVo vo = new BaseSalesVo();
         LevelVo levelVo = this.goDownComponent.setValue(params, vo);
         Integer maxLevel = levelVo.getMaxLevel();
@@ -88,6 +91,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-recruit-area")
     public RestResponse pageMemberRecruitArea(MemberRecruitAreaQO params) {
         log.info("会员招募-区域参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
 
         BaseSalesVo vo = new BaseSalesVo();
         LevelVo levelVo = this.goDownComponent.setValue(params, vo);
@@ -115,6 +119,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-portrait")
     public RestResponse queryMemberBasicPortrait(MemberPortraitQO params) {
         log.info("会员基础画像参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
@@ -124,6 +129,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-portrait-overview")
     public RestResponse getMemberPortraitOverview(MemberPortraitQO params) {
         log.info("会员画像-概况参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
@@ -133,6 +139,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-custom-portrait")
     public RestResponse queryMemberCustomPortrait(MemberCustomPortraitQO params) {
         log.info("会员自定义画像参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
@@ -142,6 +149,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-recruit-overview")
     public RestResponse getMemberRecruitOverview(MemberOverviewQO params) {
         log.info("会员概况-会员招募概况参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
@@ -151,6 +159,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-recruit-trend")
     public RestResponse queryMemberRecruitTrend(MemberOverviewQO params) {
         log.info("会员概况-会员招募趋势参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
         goDownComponent.setValueTotal(params);
@@ -195,6 +204,7 @@ public class MemberCloudDataController {
     @RequestMapping("get-member-custom-portrait-field")
     public RestResponse getMemberCustomPortraitField(MemberCustomPortraitQO params) {
         log.info("会员自定义画像-字段筛选参数：{}", JSON.toJSONString(params));
+        params.setOnlineStoreIdList(new ArrayList<>());
         Integer enterpriseId = params.getEnterpriseId();
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJson()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));