Merge branch 'developer' into 'master'

Developer

See merge request !6

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

@@ -22,6 +22,8 @@ import com.gic.mall.share.api.service.ShopApiService;
 import com.google.inject.internal.asm.$Handle;
 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.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +32,7 @@ import java.util.List;
 
 @RestController
 public class BaseSalesController {
+    private Logger log = LogManager.getLogger(BaseSalesController.class);
     @Autowired
     private DataAuthUtils dataAuthUtils;
     @Autowired
@@ -86,6 +89,7 @@ public class BaseSalesController {
         dto.setPageNum(qo.getPageNum());
         dto.setPageSize(qo.getPageSize());
         ServiceResponse<Page<BaseSalesDTO>> response = this.baseSalesApiService.pageBaseSales(dto);
+        log.info("response:{}", JSON.toJSONString(response));
         vo.setPage(this.goDownComponent.parseData(response.getResult(), qo.getChannel(), qo.getEnterpriseId(), qo.getLevel(), maxLevel));
         dto.setCountType(2);//合计
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
@@ -94,6 +98,7 @@ public class BaseSalesController {
             dto.getOnLine().add("-1");
         }
         ServiceResponse<Page<BaseSalesDTO>> totalResponse = this.baseSalesApiService.pageBaseSales(dto);
+        log.info("totalResponse:{}", JSON.toJSONString(totalResponse));
         this.goDownComponent.parseTotal(totalResponse, vo);
         if(qo.getChannel() != null && qo.getChannel() == 1 && qo.getLevel() == levelVo.getLevel()){
             dto.setCountType(3); //无归属
@@ -103,6 +108,7 @@ public class BaseSalesController {
             dto.getStoreInfoIdList().add(-1);
             dto.getOnLine().add("-1");
             ServiceResponse<Page<BaseSalesDTO>> wgsResponse = this.baseSalesApiService.pageBaseSales(dto);
+            log.info("wgsResponse:{}", JSON.toJSONString(wgsResponse));
             this.goDownComponent.parseWgs(wgsResponse, vo);
         }
         return  RestResponse.success(vo);

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

 package com.gic.cloud.web.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.FunctionDTO;
 import com.gic.cloud.dto.FunctionModuleDTO;
@@ -21,6 +22,8 @@ import com.gic.data.api.dto.*;
 import com.gic.data.api.service.IndexSalesApiService;
 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.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,6 +33,7 @@ import java.util.List;
 
 @RestController
 public class IndexController {
+    private Logger log = LogManager.getLogger(IndexController.class);
     @Autowired
     private IndexSalesApiService indexSalesApiService;
     @Autowired
@@ -85,6 +89,10 @@ public class IndexController {
         ServiceResponse<IndexMemberBirthCntDTO> birthOrderCnt = this.indexSalesApiService.getIndexMemberBirthOrderCnt(enterpriseId, list, onLine,
                 StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
                 mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate());
+        log.info("response1:", JSON.toJSONString(response1));
+        log.info("response2:", JSON.toJSONString(response2));
+        log.info("oldOrderCnt:", JSON.toJSONString(oldOrderCnt));
+        log.info("birthOrderCnt:", JSON.toJSONString(birthOrderCnt));
         IndexConsume consume = new IndexConsume();
         if(response1.isSuccess() && response1.getResult() != null && response2.getResult() != null){
             IndexMemberOrderCntDTO indexMemberOrderCntDTO1 = response1.getResult();