refactor:删除无效代码

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

@@ -56,7 +56,7 @@ import java.util.stream.Collectors;
 @Service
 public class StaffApiServiceImpl implements StaffApiService {
 
-    private static Logger logger = LoggerFactory.getLogger(StaffApiServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(StaffApiServiceImpl.class);
     @Autowired
     StaffService staffService;
     @Autowired
@@ -404,7 +404,6 @@ public class StaffApiServiceImpl implements StaffApiService {
         staff.setPhoneNumber(arr[1]);
         staff.setNationCode(arr[0]);
         staff.setSex(user.getGender() == null ? 1 : Integer.parseInt(user.getGender()));
-//		staff.setActiveFlag(1);
         staff.setPostion(user.getPosition());
         staff.setExtendPostion(user.getExternal_position());
         //成员更改或更新
@@ -1046,7 +1045,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                     departmentIds += "," + staffDepartmentRelatedDTO.getDepartmentId();
                 }
                 if (departmentIds.startsWith(",")) {
-                    departmentIds = departmentIds.substring(1, departmentIds.length());
+                    departmentIds = departmentIds.substring(1);
                 }
                 if (map.get(departmentId) == null) {
                     this.staffEditDeal(staff, departmentIds, true);
@@ -1273,7 +1272,7 @@ public class StaffApiServiceImpl implements StaffApiService {
                     departmentIds += "," + staffDepartmentRelatedDTO.getDepartmentId();
                 }
                 if (departmentIds.startsWith(",")) {
-                    departmentIds = departmentIds.substring(1, departmentIds.length());
+                    departmentIds = departmentIds.substring(1);
                 }
                 if (map.get(departmentId) == null) {
                     this.staffEdit(staff, departmentIds);

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

-package com.gic.haoban.manage.web.controller;
-
-import com.gic.haoban.common.utils.HaobanResponse;
-import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author xuwenqian
- * @date 2021/11/25 09:43
- */
-@RestController
-public class WechatLoginController extends WebBaseController {
-
-    /**
-     * 好办小程序-登陆
-     *
-     * @return
-     */
-    @RequestMapping("welldone-login")
-    public HaobanResponse welldoneLogin() {
-
-
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-
-
-    /**
-     * 好办小程序-登出
-     *
-     * @return
-     */
-    @RequestMapping("welldone-loginout")
-    public HaobanResponse welldoneLoginOut() {
-        return resultResponse(HaoBanErrCode.ERR_1);
-    }
-}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/InfoController.java → haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -44,9 +44,9 @@ import java.util.Set;
 import java.util.stream.Collectors;
 
 @RestController
-public class InfoController extends WebBaseController {
+public class WxEnterpriseController extends WebBaseController {
 
-    private static final Logger logger = LoggerFactory.getLogger(InfoController.class);
+    private static final Logger logger = LoggerFactory.getLogger(WxEnterpriseController.class);
 
     @Autowired
     private QywxCorpApiService qywxCorpApiService;
@@ -54,49 +54,43 @@ public class InfoController extends WebBaseController {
     private StaffApiService staffApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService;
-
     @Autowired
     private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
-
     @Autowired
     private QywxUserApiService qywxUserApiService;
-
     @Autowired
     private com.gic.enterprise.api.service.StoreService storeService;
-
     @Autowired
     private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
     @Autowired
     private ClerkService clerkService;
-
 	@Autowired
 	private ManagerDictService managerDictService;
-
 	@Autowired
 	private StaffMemberRelationApiService staffMemberRelationApiService;
-
 	@Autowired
-	private StaffClerkRelationApiService staffClerkRelationApiService;
-
+    private StaffClerkRelationApiService staffClerkRelationApiService;
     @Autowired
     private ExternalClerkRelatedApiService externalClerkRelatedApiService;
-
     @Autowired
     private MemberOpenCardBusinessService memberOpenCardBusinessService;
-
     @Autowired
     private EnterpriseService enterpriseService;
+    @Autowired
+    private Config config;
 
-	@Autowired
-	private Config config;
-
-	@RequestMapping("get-info-by-code")
+    /**
+     * code授权
+     *
+     * @param code
+     * @return
+     */
+    @RequestMapping("get-info-by-code")
     public HaobanResponse getInfoByCode(String code) {
-        String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(),code);
-        logger.info("userDTOJson=============>{}",userDTOJson);
+        String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code);
+        logger.info("userDTOJson=============>{}", userDTOJson);
         UserDTO user = JSON.parseObject(userDTOJson, UserDTO.class);
-        if(user == null) {
-
+        if (user == null) {
             return resultResponse(HaoBanErrCode.ERR_6);
         }
         String userId = user.getUserid();
@@ -158,17 +152,32 @@ public class InfoController extends WebBaseController {
         infoVo.setPhoneNumber(loginStaff.getPhoneNumber());
         infoVo.setNationcode(loginStaff.getNationCode());
         infoVo.setWxUserId(loginStaff.getWxUserId());
-        return resultResponse(HaoBanErrCode.ERR_1,infoVo);
+        return resultResponse(HaoBanErrCode.ERR_1, infoVo);
+    }
+
 
+    /**
+     * 好办小程序-登陆
+     *
+     * @return
+     */
+    @RequestMapping("welldone-login")
+    public HaobanResponse welldoneLogin() {
+
+        return resultResponse(HaoBanErrCode.ERR_1);
     }
 
-    @RequestMapping("get-gyt-info-by-code")
-    public HaobanResponse getGytCode(String code) {
-        String userDTOJson = qywxUserApiService.getUserByCode("ww9ede832a84b7ae5f", "lHHKe1X683yWYAdwWATdzRTdVWo8uTnPH3nj5Gkt4og", code);
-        logger.info(userDTOJson);
-        return resultResponse(HaoBanErrCode.ERR_1,userDTOJson);
+    /**
+     * 好办小程序-登出
+     *
+     * @return
+     */
+    @RequestMapping("welldone-loginout")
+    public HaobanResponse welldoneLoginOut() {
+        return resultResponse(HaoBanErrCode.ERR_1);
     }
 
+
     @RequestMapping("get-user-by-member-code")
     public HaobanResponse getInfoByMemberCode(GetUserByMemberCodeQo qo) {
         WxEnterpriseDTO enterpriseDetailDTO = null;
@@ -277,7 +286,6 @@ public class InfoController extends WebBaseController {
 	public HaobanResponse saveUserLoginLog(UserLoginLogDTO userLoginLogDTO) {
 		staffApiService.insertUserLoginLog(userLoginLogDTO);
 		return resultResponse(HaoBanErrCode.ERR_1);
-		
 	}
 	
 	@RequestMapping("get-member-store")
@@ -361,7 +369,6 @@ public class InfoController extends WebBaseController {
         memberSendMessageVo.setBindFlag(clerkRelatedDTO.getStatusFlag() == 1 ? 1 : 0);
         memberSendMessageVo.setWxaName(settingDTO.getMiniprogramName());
 
-
         return resultResponse(HaoBanErrCode.ERR_1, memberSendMessageVo);
     }