门店分组绑定校验

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

@@ -195,16 +195,22 @@ public class InfoController extends WebBaseController{
             logger.info("改企业不存在:{}", qo.getGicEnterpriseId());
             return resultResponse(HaoBanErrCode.ERR_400002);
         }
-        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDetailDTO.getWxEnterpriseId(), SecretTypeEnum.MEMBER_WAPP.getVal(), qo.getGicEnterpriseId());
-        if (null == secretSetting||StringUtils.isBlank(secretSetting.getSecretVal())) {
-            return resultResponse(HaoBanErrCode.ERR_10019);
-        }
+
         MemberLoginQo user = new MemberLoginQo();
         if (StringUtils.isBlank(qo.getUserId())) {
-        	logger.info("corpId============>{},secretVal===============>{},code=================》{}",enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), qo.getCode());
-            String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), qo.getCode());
-            logger.info("会员微信登录信息=============>{}", userDTOJson);
-            user = JSON.parseObject(userDTOJson, MemberLoginQo.class);
+//            SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDetailDTO.getWxEnterpriseId(), SecretTypeEnum.MEMBER_WAPP.getVal(), qo.getGicEnterpriseId());
+//            if (null == secretSetting||StringUtils.isBlank(secretSetting.getSecretVal())) {
+//                return resultResponse(HaoBanErrCode.ERR_10019);
+//            }
+//
+//        	logger.info("corpId============>{},secretVal===============>{},code=================》{}",enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), qo.getCode());
+//            String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), qo.getCode());
+            user = getUserByCode(enterpriseDTO, qo.getCode(), qo.getGicEnterpriseId());
+
+            if (user != null && (!user.getCorpId().equals(enterpriseDTO.getCorpid()))) {
+                WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getEnterpriseBycorpId(user.getCorpId());
+                user = getUserByCode(enterpriseDTO, qo.getCode(), qo.getGicEnterpriseId());
+            }
             if (user == null) {
                 return resultResponse(HaoBanErrCode.ERR_6);
             }
@@ -262,8 +268,23 @@ public class InfoController extends WebBaseController{
         return resultResponse(HaoBanErrCode.ERR_1, user);
 
     }
-	
-	@RequestMapping("save-user-login-log")
+
+    private MemberLoginQo getUserByCode(WxEnterpriseDTO enterpriseDTO, String code, String enterpriseId) {
+        SecretSettingDTO secretSetting = wxEnterpriseApiService.getSecretSetting(enterpriseDTO.getWxEnterpriseId(), SecretTypeEnum.MEMBER_WAPP.getVal(), enterpriseId);
+        if (null == secretSetting || StringUtils.isBlank(secretSetting.getSecretVal())) {
+            logger.info("MEMBER_WAPPsecret配置没有配置");
+            return null;
+        }
+        String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), code);
+        logger.info("会员微信登录信息=============>{}", userDTOJson);
+        MemberLoginQo user = JSON.parseObject(userDTOJson, MemberLoginQo.class);
+        if (user == null) {
+            return null;
+        }
+        return user;
+    }
+
+    @RequestMapping("save-user-login-log")
 	public HaobanResponse saveUserLoginLog(UserLoginLogDTO userLoginLogDTO) {
 		staffApiService.insertUserLoginLog(userLoginLogDTO);
 		return resultResponse(HaoBanErrCode.ERR_1);