首页-消费分析

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -6,10 +6,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.gic.data.api.dto.index.*;
-import com.gic.data.api.qo.index.ChannelUserOverviewQO;
-import com.gic.data.api.qo.index.IndexChannelUserRateQO;
-import com.gic.data.api.qo.index.IndexMemberOverviewQO;
-import com.gic.data.api.qo.index.IndexStoreOverviewQO;
+import com.gic.data.api.qo.index.*;
 import com.gic.enterprise.web.vo.index.ChannelUserRateVO;
 import com.gic.enterprise.web.vo.index.ChannelUserVO;
 import com.gic.enterprise.web.vo.index.MemberCardInfoVO;
@@ -436,12 +433,24 @@ public class IndexModuleController {
     }
 
 
+    /**
+     * 首页-消费分析
+     * @param consumptionType
+     * @param cardConfigId
+     * @param brandId
+     * @return
+     */
     @RequestMapping("consumption-analysis")
-    public RestResponse consumptionAnalysis(Integer consumptionType, Long cardConfigId){
+    public RestResponse consumptionAnalysis(Integer consumptionType, Long cardConfigId, Integer brandId){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<List<ConsumptionAnalysisDTO>> listServiceResponse = this.memberDataApiService.consumptionAnalysis(consumptionType, cardConfigId, enterpriseId, userId, this.getAuthStore());
-        return RestResponse.success(listServiceResponse.getResult());
+
+        IndexConsumedAnalysisQO param = new IndexConsumedAnalysisQO();
+        param.setEntId(enterpriseId);
+        param.setMemberCardIdList(getAuthAreaList(cardConfigId, enterpriseId, userId, CuTypeEnum.MCU));
+        param.setBrandId(brandId);
+        param.setAuthStoreIdList(getAuthStore());
+        return ResultControllerUtils.commonResult(this.memberDataApiService.consumptionAnalysis(param));
     }
 
     @RequestMapping("list-resource")