feat:区经督导管理门店数量接口

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

@@ -17,7 +17,7 @@ public class StaffClerkInfoDTO implements Serializable {
 
     private String enterpriseId;
 
-    private String BrandName;
+    private String brandName;
 
     private String enterpriseName;
 
@@ -43,6 +43,10 @@ public class StaffClerkInfoDTO implements Serializable {
      */
     private Integer mainStoreFlag;
 
+    private Integer manageFlag;
+
+    private Integer manageStoreCount;
+
     public Integer getMainStoreFlag() {
         return mainStoreFlag;
     }
@@ -124,11 +128,11 @@ public class StaffClerkInfoDTO implements Serializable {
     }
 
     public String getBrandName() {
-        return BrandName;
+        return brandName;
     }
 
     public void setBrandName(String brandName) {
-        BrandName = brandName;
+        this.brandName = brandName;
     }
 
     public String getStoreId() {
@@ -179,4 +183,19 @@ public class StaffClerkInfoDTO implements Serializable {
         this.updateTime = updateTime;
     }
 
+    public Integer getManageFlag() {
+        return manageFlag;
+    }
+
+    public void setManageFlag(Integer manageFlag) {
+        this.manageFlag = manageFlag;
+    }
+
+    public Integer getManageStoreCount() {
+        return manageStoreCount;
+    }
+
+    public void setManageStoreCount(Integer manageStoreCount) {
+        this.manageStoreCount = manageStoreCount;
+    }
 }

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

@@ -11,6 +11,7 @@ import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.ExcelUtils;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.StoreService;
+import com.gic.enterprise.api.service.StoreWidgetService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
@@ -75,6 +76,8 @@ public class StaffController extends WebBaseController {
     private HaobanUserApiService haobanUserApiService;
     @Autowired
     private DealSyncOperationApiService dealSyncOperationApiService;
+    @Autowired
+    private StoreWidgetService storeWidgetService;
 
 
     @RequestMapping("set-default-gicenterprise")
@@ -254,14 +257,17 @@ public class StaffController extends WebBaseController {
             return resultResponse(HaoBanErrCode.ERR_1);
         }
         ClerkMainStoreRelatedDTO mainStoreRelatedDTO = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(staff.getWxEnterpriseId(), staffId);
-        if (null != mainStoreRelatedDTO) {
-            retList.forEach(dto -> {
+        for (StaffClerkInfoDTO dto : retList) {
+            if (mainStoreRelatedDTO != null) {
                 if (dto.getStoreId().equals(mainStoreRelatedDTO.getStoreId())) {
                     dto.setMainStoreFlag(1);
                 } else {
                     dto.setMainStoreFlag(0);
                 }
-            });
+            }
+            if (dto.getManageFlag() == 1) {
+                dto.setManageStoreCount(storeWidgetService.getClerkWidgetStore(dto.getClerkId()));
+            }
         }
         return resultResponse(HaoBanErrCode.ERR_1, retList);
     }
@@ -275,7 +281,7 @@ public class StaffController extends WebBaseController {
     @RequestMapping("del-clerk-relation")
     public HaobanResponse delStaffClerkList(String clerkId) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
-        boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getClerkId(), clerkId,ChannelCodeEnum.ADMIN_UNBIND.getCode());
+        boolean b = staffClerkRelationApiService.unbindByStaffAndClerkId(login.getClerkId(), clerkId, ChannelCodeEnum.ADMIN_UNBIND.getCode());
         return resultResponse(HaoBanErrCode.ERR_1, b);
     }
 
@@ -286,7 +292,7 @@ public class StaffController extends WebBaseController {
      * @return
      */
     @RequestMapping("search-clerk-relation")
-    public HaobanResponse staffClerkSearch(String search,Integer manageFlag) {
+    public HaobanResponse staffClerkSearch(String search, Integer manageFlag) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = login.getWxEnterpriseId();
         if (null == wxEnterpriseId) {
@@ -347,7 +353,7 @@ public class StaffController extends WebBaseController {
      * @return
      */
     @RequestMapping("add-clerk-relation")
-    public HaobanResponse staffClerkSearch(String staffId, String clerkId,Integer manageFlag) {
+    public HaobanResponse staffClerkSearch(String staffId, String clerkId, Integer manageFlag) {
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
         if (StringUtils.isAnyBlank(staffId, clerkId)) {
             return resultResponse(HaoBanErrCode.ERR_2);

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

@@ -16,6 +16,7 @@ import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.StoreDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreService;
+import com.gic.enterprise.api.service.StoreWidgetService;
 import com.gic.haoban.app.customer.service.api.service.CustomerApiService;
 import com.gic.haoban.app.customer.service.api.service.DistributeApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
@@ -89,6 +90,8 @@ public class ClerkController extends WebBaseController {
     private QywxUserApiService qywxUserApiService;
     @Autowired
     private Config config;
+    @Autowired
+    private StoreWidgetService storeWidgetService;
 
     //选择成员列表
     @RequestMapping("/staff-list")
@@ -1178,12 +1181,11 @@ public class ClerkController extends WebBaseController {
     }
 
     /**
-     * 我的-好友会员数
+     * 我的-关联导购数量
      *
      * @return
      */
     @RequestMapping("can-relation-count")
-    @IgnoreLogin
     public RestResponse canRelationCount(@RequestBody @Valid CommonQO qo) {
         List<EnterpriseDetailDTO> list = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(qo.getWxEnterpriseId());
         if (list == null || list.isEmpty()) {
@@ -1199,6 +1201,16 @@ public class ClerkController extends WebBaseController {
         return RestResponse.successResult(clerkList.size());
     }
 
+    /**
+     * 好友数量
+     * @param clerkId
+     * @return
+     */
+    @RequestMapping(value = "manage-store-count",method = RequestMethod.GET)
+    public RestResponse<Integer> manageStoreCount(String clerkId) {
+        return RestResponse.successResult(storeWidgetService.getClerkWidgetStore(clerkId));
+    }
+
 
     /**
      * 根据员工id获取openId