feat:区经统计

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffClerkRelationApiServiceImpl.java

@@ -21,7 +21,6 @@ import com.gic.haoban.manage.api.enums.BindTypeEnum;
 import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.service.AuditApiService;
 import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
-import com.gic.haoban.manage.api.service.hm.HmClerkRelationApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.entity.MemberClerkChatConfig;
@@ -69,14 +68,10 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
     @Autowired
     private StaffService staffService;
     @Autowired
-    private ExternalClerkRelatedService externalClerkRelatedService;
-    @Autowired
     private QywxUserApiService qywxUserApiService;
     @Autowired
     private WxEnterpriseService wxEnterpriseService;
     @Autowired
-    private HmClerkRelationApiService hmClerkRelationApiService;
-    @Autowired
     private HmQrcodeService hmQrcodeService;
     @Autowired
     private Config config;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -2,7 +2,6 @@ package com.gic.haoban.manage.web.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.dubbo.common.utils.CollectionUtils;
 import com.alibaba.fastjson.JSON;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
@@ -26,6 +25,7 @@ import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.StaffStoreVO;
 import com.gic.haoban.manage.web.vo.StoreDetailVO;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -147,7 +147,7 @@ public class StoreController extends WebBaseController {
             vo.setEnableHaoban(clerk.getEnableHaoban());
             list.add(vo);
         }
-        if (org.apache.commons.collections.CollectionUtils.isEmpty(list)) {
+        if (CollectionUtils.isEmpty(list)) {
             return resultResponse(HaoBanErrCode.ERR_1, list);
         }
         List<String> storeIdList = list.stream().map(dto -> dto.getStoreId()).collect(Collectors.toList());
@@ -166,7 +166,7 @@ public class StoreController extends WebBaseController {
 
     //获取首页销售数据
     @RequestMapping("/sale-date")
-    public HaobanResponse saleDate(String storeId, String clerkType, String clerkId) {
+    public HaobanResponse saleDate(String storeId, String clerkType, String clerkId, List<String> storeIds) {
         if (StringUtils.isAnyBlank(storeId, clerkType, clerkId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
@@ -228,9 +228,9 @@ public class StoreController extends WebBaseController {
                     countyList.add(countyMap.get(key));
                 }
                 return resultResponse(HaoBanErrCode.ERR_1, countyList);
+            default:
+                return resultResponse(HaoBanErrCode.ERR_8);
         }
-
-        return resultResponse(HaoBanErrCode.ERR_8);
     }
 
     //修改门店数据
@@ -315,9 +315,6 @@ public class StoreController extends WebBaseController {
         }
         vo.setAreaId(store.getAreaId());
         vo.setStoreAddress(store.getFullArea() + " " + store.getStoreAddress());
-//		StaffDepartmentRelatedDTO staffDepartmentRelatedDTO = staffDepartmentRelatedApiService.getByStaffDepartmentRelatedId(staffDepartmentRelatedId);
-//		vo.setClerkCode(staffDepartmentRelatedDTO.getClerkCode());
-//		vo.setBindFlag(StringUtils.isEmpty(staffDepartmentRelatedDTO.getClerkCode())?0:1);
         vo.setAuditDetail(list);
 
         AuditSettingDTO auditSettingDTO = auditSettingApiService.findSettingByWxEnterpriseId(wxEnterpriseId);