Merge remote-tracking branch 'origin/developer' into developer

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexDescDTO.java

@@ -26,6 +26,7 @@ public class IndexDescDTO implements Serializable {
      */
     private String indexName;
 
+    private String unit;
     /**
      * 指标code
      */
@@ -96,6 +97,9 @@ public class IndexDescDTO implements Serializable {
 
     public void setIndexCode(String indexCode) {
         this.indexCode = indexCode;
+        if("showSalesAmt".equals(this.indexCode)){
+            this.unit = "元";
+        }
     }
 
     public String getIndexGroupName() {
@@ -177,4 +181,12 @@ public class IndexDescDTO implements Serializable {
     public void setUpdateTipsId(Integer updateTipsId) {
         this.updateTipsId = updateTipsId;
     }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
 }

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

@@ -42,7 +42,7 @@ public class BaseSalesController {
     @RequestMapping("base-sales")
     public RestResponse baseSales(Integer channel, Integer userId, Integer enterpriseId, String searchJSON,
                                   DateTypeQo dateTypeQo, String mbrAreaId, Integer level, Integer parentId,
-                                  Integer pageNum, Integer pageSize){
+                                  String sortField, Integer sortType, Integer pageNum, Integer pageSize){
         List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJSON);
         List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
         List<Integer> childrenStoreGroupIdList = this.storeSearchUtils.getChildrenStoreGroupIdList(parentId);
@@ -53,6 +53,7 @@ public class BaseSalesController {
         dto.setStoreInfoIdList(list);
         dto.setOnLine(onLine);
         dto.setMbrAreaId(StringUtils.isBlank(mbrAreaId) ? null : Long.valueOf(mbrAreaId));
+        dto.setMbrAreaIdList(mbrAreaIdList);
         dto.setType(dateTypeQo.getType());
         dto.setDate(dateTypeQo.getDate());
         dto.setChildrenStoreGroupIdList(childrenStoreGroupIdList);
@@ -64,17 +65,18 @@ public class BaseSalesController {
             level = this.storeSearchUtils.getLevel(userId, enterpriseId, searchJSON).getLevel();
         }
         BaseSalesVo vo = new BaseSalesVo();
-        this.parseData(response.getResult(), StoreChannelEnum.OFFLINE.getChannel(), enterpriseId, level);
-        vo.setPage(response.getResult());
+        vo.setPage(this.parseData(response.getResult(), channel, enterpriseId, level));
         dto.setCountType(2);//合计
         ServiceResponse<Page<BaseSalesDTO>> response1 = this.baseSalesApiService.pageBaseSales(dto);
         if(response1.isSuccess() && response1.getResult() != null && CollectionUtils.isNotEmpty(response1.getResult().getResult())){
             BaseSalesDTO total = response1.getResult().getResult().get(0);
-            total.setId("0");
-            total.setName("合计");
-            vo.setTotal(total);
+            if(total != null){
+                total.setId("0");
+                total.setName("合计");
+                vo.setTotal(total);
+            }
         }
-        if(channel == 1 && parentId == null){
+        if(channel != null && channel == 1 && parentId == null){
             dto.setCountType(3); //无归属
             ServiceResponse<Page<BaseSalesDTO>> response2 = this.baseSalesApiService.pageBaseSales(dto);
             if(response2.isSuccess() && response2.getResult() != null && CollectionUtils.isNotEmpty(response2.getResult().getResult())){
@@ -89,7 +91,7 @@ public class BaseSalesController {
         return  RestResponse.success(vo);
     }
 
-    public void parseData(Page<BaseSalesDTO> page , Integer channel, Integer enterpriseId, Integer level){
+    public Page<BaseSalesDTO> parseData(Page<BaseSalesDTO> page , Integer channel, Integer enterpriseId, Integer level){
         if(page != null && CollectionUtils.isNotEmpty(page.getResult())){
             if(channel == null){  //全渠道
                 page.getResult().stream().forEach(baseSalesDTO -> {
@@ -137,5 +139,6 @@ public class BaseSalesController {
                 });
             }
         }
+        return page;
     }
 }