feat:查询数量接口调整

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/StoreRoleDTO.java

+package com.gic.haoban.manage.api.dto.role;
+
+import java.io.Serializable;
+
+/**
+ * @author xuwenqian
+ * @date 2022/9/23 4:57 下午
+ */
+public class StoreRoleDTO implements Serializable {
+    private static final long serialVersionUID = -598102622663116081L;
+    private Integer storeCount;
+    private String storeId;
+
+    public Integer getStoreCount() {
+        return storeCount;
+    }
+
+    public void setStoreCount(Integer storeCount) {
+        this.storeCount = storeCount;
+    }
+
+    public String getStoreId() {
+        return storeId;
+    }
+
+    public void setStoreId(String storeId) {
+        this.storeId = storeId;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.role.StoreRoleDTO;
 
 import java.util.List;
 
@@ -269,6 +270,6 @@ public interface StaffApiService {
      * @param clerkId        职员id
      * @return int
      */
-    int getCountHaoBanStoreIdsByClerkId(String clerkId,String wxEnterpriseId);
+    StoreRoleDTO getCountHaoBanStoreIdsByClerkId(String clerkId, String wxEnterpriseId);
 
 }

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

@@ -23,6 +23,7 @@ import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.RolesListUtils;
 import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.dto.role.StoreRoleDTO;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.service.config.Config;
@@ -908,20 +909,23 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
-    public int getCountHaoBanStoreIdsByClerkId(String clerkId, String wxEnterpriseId) {
-        ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
-        if (clerkDTO == null) {
-            logger.info("导购不存在：clerkId:{}", clerkId);
-            return 0;
+    public StoreRoleDTO getCountHaoBanStoreIdsByClerkId(String clerkId, String wxEnterpriseId) {
+        List<String> storeIds = getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
+        StoreRoleDTO storeRoleDTO = new StoreRoleDTO();
+        if (CollectionUtils.isEmpty(storeIds)) {
+            storeRoleDTO.setStoreCount(0);
+            return storeRoleDTO;
         }
-        String enterpriseId = clerkDTO.getEnterpriseId();
-        int haobanStoreCount = storeRangeService.getCountStoreIdByWxEnterpriseId(wxEnterpriseId, enterpriseId);
-        if (haobanStoreCount == 0) {
-            logger.info("好办门店空,eid={}", enterpriseId);
-            return 0;
+        if (storeIds.contains("-1")) {
+            int gicStoreCount = storeWidgetService.getClerkWidgetStore(clerkId);
+            storeRoleDTO.setStoreCount(gicStoreCount);
+        }
+        int size = storeIds.size();
+        storeRoleDTO.setStoreCount(size);
+        if (size == 1) {
+            storeRoleDTO.setStoreId(storeIds.get(0));
         }
-        int gicStoreCount = storeWidgetService.getClerkWidgetStore(clerkId);
-        return Math.min(haobanStoreCount,gicStoreCount);
+        return storeRoleDTO;
     }
 
     /**

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

@@ -266,7 +266,7 @@ public class StaffController extends WebBaseController {
                 }
             }
             if (dto.getManageFlag() != null && dto.getManageFlag() == 1) {
-                dto.setManageStoreCount(staffApiService.getCountHaoBanStoreIdsByClerkId(dto.getClerkId(),staff.getWxEnterpriseId()));
+                dto.setManageStoreCount(staffApiService.getCountHaoBanStoreIdsByClerkId(dto.getClerkId(),staff.getWxEnterpriseId()).getStoreCount());
             }
         }
         return resultResponse(HaoBanErrCode.ERR_1, retList);

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

@@ -29,6 +29,7 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.dto.role.HaobanRoleDTO;
+import com.gic.haoban.manage.api.dto.role.StoreRoleDTO;
 import com.gic.haoban.manage.api.enums.*;
 import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.api.service.role.HaobanRoleApiService;
@@ -1275,9 +1276,12 @@ public class ClerkController extends WebBaseController {
      * @return
      */
     @RequestMapping(value = "/getCountHaoBanStoreIdsByClerkId", method = RequestMethod.GET)
-    public RestResponse<Integer> getCountHaoBanStoreIdsByClerkId(String clerkId) {
-        int count = staffApiService.getCountHaoBanStoreIdsByClerkId(clerkId, this.getLoginUser().getWxEnterpriseId());
-        return RestResponse.successResult(count);
+    public RestResponse<StoreRoleVO> getCountHaoBanStoreIdsByClerkId(String clerkId) {
+        StoreRoleDTO storeRoleDTO = staffApiService.getCountHaoBanStoreIdsByClerkId(clerkId, this.getLoginUser().getWxEnterpriseId());
+        StoreRoleVO storeRoleVO = new StoreRoleVO();
+        storeRoleVO.setStoreCount(storeRoleDTO.getStoreCount());
+        storeRoleVO.setStoreDTO(storeService.getStore(storeRoleDTO.getStoreId()));
+        return RestResponse.successResult(storeRoleVO);
     }
 
     /**

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

@@ -65,6 +65,13 @@ public class StoreController extends WebBaseController {
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
 
+    /**
+     * 好办小程序-绑定的门店列表
+     * @param staffId
+     * @param wxEnterpriseId
+     * @param gicEnterpriseId
+     * @return
+     */
     @IgnoreLogin
     @RequestMapping("/store-list")
     public HaobanResponse storeList(String staffId, String wxEnterpriseId, String gicEnterpriseId) {
@@ -166,11 +173,17 @@ public class StoreController extends WebBaseController {
 
     //获取首页销售数据
     @RequestMapping("/sale-date")
-    public HaobanResponse saleDate(String storeId, String clerkType, String clerkId, String enterpriseId,List<String> storeIds) {
-        if (StringUtils.isAnyBlank(storeId, clerkType, clerkId)) {
+    public HaobanResponse saleDate(String storeId, Integer clerkType, String clerkId, String enterpriseId) {
+        if (StringUtils.isAnyBlank(storeId, clerkId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        if (StringUtils.isNotBlank(storeId)) {
+        List<String> storeIds = new ArrayList<>();
+        if (clerkType == 2) {
+            List<String> haobanStoreIds = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, this.getLoginUser().getWxEnterpriseId());
+            if (!haobanStoreIds.contains("-1")) {
+                storeIds.addAll(haobanStoreIds);
+            }
+        }else {
             storeIds.add(storeId);
         }
         String date = DateUtil.format(new Date(), "yyyy-MM-dd");

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/StoreRoleVO.java

+package com.gic.haoban.manage.web.vo;
+
+import com.gic.enterprise.api.dto.StoreDTO;
+
+import java.io.Serializable;
+
+/**
+ * @author xuwenqian
+ * @date 2022/9/23 4:57 下午
+ */
+public class StoreRoleVO implements Serializable {
+    private static final long serialVersionUID = -598102622663116081L;
+    private Integer storeCount;
+    private StoreDTO storeDTO;
+
+    public Integer getStoreCount() {
+        return storeCount;
+    }
+
+    public void setStoreCount(Integer storeCount) {
+        this.storeCount = storeCount;
+    }
+
+    public StoreDTO getStoreDTO() {
+        return storeDTO;
+    }
+
+    public void setStoreDTO(StoreDTO storeDTO) {
+        this.storeDTO = storeDTO;
+    }
+}