qo名称修改

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

 package com.gic.cloud.web.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
@@ -11,7 +23,7 @@ import com.gic.cloud.web.vo.LevelVo;
 import com.gic.commons.util.CollectionUtil;
 import com.gic.data.api.dto.BaseDTO;
 import com.gic.data.api.dto.BaseSalesDTO;
-import com.gic.data.api.qo.common.CommonQO;
+import com.gic.data.api.qo.common.AbstractCommonQo;
 import com.gic.enterprise.dto.WmStoreDTO;
 import com.gic.enterprise.service.WmStoreApiService;
 import com.gic.mall.share.api.dto.shop.ShopDTO;
@@ -19,17 +31,6 @@ import com.gic.mall.share.api.enums.ShopTypeEnum;
 import com.gic.mall.share.api.service.ShopApiService;
 import com.gic.store.dto.ClerkDTO;
 import com.gic.store.service.ClerkApiService;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 /**
  * 工具
  * @ClassName: GoDownComponent

@@ -85,7 +86,7 @@ public class GoDownComponent {
         }
     }
 
-    public LevelVo setValue(CommonQO params, BaseSalesVo vo){
+    public LevelVo setValue(AbstractCommonQo params, BaseSalesVo vo){
         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()));
@@ -124,7 +125,7 @@ public class GoDownComponent {
     }
 
 
-    public void setValueTotal(CommonQO params, LevelVo levelVo){
+    public void setValueTotal(AbstractCommonQo params, LevelVo levelVo){
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
         boolean isContainNoOwnership = (params.getChannel() == null || (params.getChannel() == StoreChannelEnum.OFFLINE.getChannel().intValue() && params.getLevel().intValue() == levelVo.getLevel())) && wgs == 1;
@@ -140,7 +141,7 @@ public class GoDownComponent {
         }
     }
 
-    public void setValueTotal(CommonQO params){
+    public void setValueTotal(AbstractCommonQo params){
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
         if(wgs == 1){
@@ -155,7 +156,7 @@ public class GoDownComponent {
         }
     }
 
-    public void setValueWgs(CommonQO params, LevelVo levelVo){
+    public void setValueWgs(AbstractCommonQo params, LevelVo levelVo){
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         if(params.getChannel() != null && params.getChannel() == 1 && params.getLevel() == levelVo.getLevel().intValue() && wgs == 1){
             params.setChannel(null);
@@ -172,7 +173,7 @@ public class GoDownComponent {
         }
     }
 
-    public void setValueWgs(CommonQO params){
+    public void setValueWgs(AbstractCommonQo params){
         Integer wgs = storeSearchUtils.isWgs(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON());
         if(wgs == 1){
             params.setChannel(null);

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

@@ -56,7 +56,7 @@ public class MemberCloudDataController {
      * @return  com.gic.commons.webapi.reponse.RestResponse

     
*/
     @RequestMapping("get-member-distribution-trend")
-    public RestResponse queryMemberDistributionTrend(MemberDistributionTrendQO params) {
+    public RestResponse queryMemberDistributionTrend(MemberDistributionTrendQoAbstract params) {
         log.info("会员分布-趋势参数：{}", JSON.toJSONString(params));
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
         params.setMemberCardIdList(dataAuthUtils.getMbrAreaId(params.getUserId(), params.getEnterpriseId()));
@@ -66,7 +66,7 @@ public class MemberCloudDataController {
     }
 
     @RequestMapping("get-member-distribution-area")
-    public RestResponse pageMemberDistributionArea(MemberDistributionAreaQO params) {
+    public RestResponse pageMemberDistributionArea(MemberDistributionAreaQoAbstract params) {
         log.info("会员分布-区域参数：{}", JSON.toJSONString(params));
 
         params.setOnlineStoreIdList(new ArrayList<>());
@@ -95,7 +95,7 @@ public class MemberCloudDataController {
     }
 
     @RequestMapping("get-member-recruit-area")
-    public RestResponse pageMemberRecruitArea(MemberRecruitAreaQO params) {
+    public RestResponse pageMemberRecruitArea(MemberRecruitAreaQoAbstract params) {
         log.info("会员招募-区域参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
 
@@ -123,7 +123,7 @@ public class MemberCloudDataController {
     }
 
     @RequestMapping("get-member-portrait")
-    public RestResponse queryMemberBasicPortrait(MemberPortraitQO params) {
+    public RestResponse queryMemberBasicPortrait(MemberPortraitQoAbstract params) {
         log.info("会员基础画像参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
@@ -133,7 +133,7 @@ public class MemberCloudDataController {
     }
 
     @RequestMapping("get-member-portrait-overview")
-    public RestResponse getMemberPortraitOverview(MemberPortraitQO params) {
+    public RestResponse getMemberPortraitOverview(MemberPortraitQoAbstract params) {
         log.info("会员画像-概况参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
@@ -143,7 +143,7 @@ public class MemberCloudDataController {
     }
 
     @RequestMapping("get-member-custom-portrait")
-    public RestResponse queryMemberCustomPortrait(MemberCustomPortraitQO params) {
+    public RestResponse queryMemberCustomPortrait(MemberCustomPortraitQoAbstract params) {
         log.info("会员自定义画像参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
@@ -153,7 +153,7 @@ public class MemberCloudDataController {
     }
 
     @RequestMapping("get-member-recruit-overview")
-    public RestResponse getMemberRecruitOverview(MemberOverviewQO params) {
+    public RestResponse getMemberRecruitOverview(MemberOverviewQoAbstract params) {
         log.info("会员概况-会员招募概况参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
@@ -163,7 +163,7 @@ public class MemberCloudDataController {
     }
 
     @RequestMapping("get-member-recruit-trend")
-    public RestResponse queryMemberRecruitTrend(MemberOverviewQO params) {
+    public RestResponse queryMemberRecruitTrend(MemberOverviewQoAbstract params) {
         log.info("会员概况-会员招募趋势参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
         params.setStoreInfoIdList(storeSearchUtils.storeSearch(params.getUserId(), params.getEnterpriseId(), params.getSearchJSON()));
@@ -208,7 +208,7 @@ public class MemberCloudDataController {
 
 
     @RequestMapping("get-member-custom-portrait-field")
-    public RestResponse getMemberCustomPortraitField(MemberCustomPortraitQO params) {
+    public RestResponse getMemberCustomPortraitField(MemberCustomPortraitQoAbstract params) {
         log.info("会员自定义画像-字段筛选参数：{}", JSON.toJSONString(params));
         params.setOnlineStoreIdList(new ArrayList<>());
         Integer enterpriseId = params.getEnterpriseId();
@@ -230,7 +230,7 @@ public class MemberCloudDataController {
     }
 
     @RequestMapping("get-member-basic-portrait-field")
-    public RestResponse getMemberBasicPortraitField(MemberCustomPortraitQO params) {
+    public RestResponse getMemberBasicPortraitField(MemberCustomPortraitQoAbstract params) {
         log.info("会员基础画像-字段筛选参数：{}", JSON.toJSONString(params));
         Integer enterpriseId = params.getEnterpriseId();
         List<EnterprisePortraitRelDTO> list = new ArrayList<>(6);

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

 package com.gic.cloud.web.controller;
 
-import com.gic.cloud.web.auth.DataAuthUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,8 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.cloud.web.auth.DataAuthUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
-import com.gic.data.api.qo.performanceoverview.PerformanceOverviewQO;
+import com.gic.data.api.qo.performanceoverview.PerformanceOverviewQoAbstract;
 import com.gic.data.api.service.performanceoverview.PerformanceOverviewApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 /**
@@ -33,7 +33,7 @@ public class PerformanceOverviewController {
 
 
     @RequestMapping("get-performance-overview")
-    public RestResponse selectPerformanceOverview(PerformanceOverviewQO params) {
+    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()));