观云台小程序

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,8 +65,7 @@ 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())){
@@ -91,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 -> {
@@ -139,5 +139,6 @@ public class BaseSalesController {
                 });
             }
         }
+        return page;
     }
 }