观云台小程序

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

@@ -15,6 +15,7 @@ import com.gic.cloud.web.vo.MbrVo;
 import com.gic.cloud.web.vo.index.IndexSalesVo;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.data.api.dto.IndexMemberDTO;
 import com.gic.data.api.dto.IndexSalesDTO;
 import com.gic.data.api.service.IndexSalesApiService;
 import org.apache.commons.collections.CollectionUtils;
@@ -53,6 +54,26 @@ public class IndexController {
         return RestResponse.success(EntityUtil.changeEntityByJSON(IndexSalesVo.class, indexSales.getResult()));
     }
 
+    @RequestMapping("index-member")
+    public RestResponse indexMember(Integer userId, Integer enterpriseId, String searchJSON,
+                                   DateTypeQo dateTypeQo, String mbrAreaId){
+        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJSON);
+        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
+        List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
+        ServiceResponse<IndexMemberDTO> indexMember = this.indexSalesApiService.getIndexMember(enterpriseId, list, onLine,
+                StringUtils.isNoneBlank(mbrAreaId) ? Long.valueOf(mbrAreaId) : null,
+                mbrAreaIdList, dateTypeQo.getType(), dateTypeQo.getDate());
+        return RestResponse.success(indexMember.getResult());
+    }
+
+    @RequestMapping("index-consume")
+    public RestResponse indexConsume(Integer userId, Integer enterpriseId, String searchJSON,
+                                     DateTypeQo dateTypeQo, String mbrAreaId){
+        List<Integer> list = this.storeSearchUtils.storeSearch(userId, enterpriseId, searchJSON);
+        List<String> onLine = this.storeSearchUtils.onLineStoreSearch(userId, enterpriseId, searchJSON);
+        List<Long> mbrAreaIdList = this.dataAuthUtils.getMbrAreaId(userId, enterpriseId);
+        return RestResponse.success();
+    }
 
     @RequestMapping("function-list")
     public RestResponse functionList(Integer userId){