Commit 5c2b696a by 墨竹

feat:会员登录bug修改

parent 316d9548
......@@ -262,20 +262,16 @@ public class WxEnterpriseInfoController extends WebBaseController {
logger.info("改企业不存在:{}", qo.getGicEnterpriseId());
return resultResponse(HaoBanErrCode.ERR_400002);
}
MemberLoginQo user = new MemberLoginQo();
if (StringUtils.isBlank(qo.getUserId())) {
user = getUserByCode(enterpriseDTO, qo.getCode(), qo.getGicEnterpriseId());
if (user != null && (!user.getCorpId().equals(enterpriseDTO.getCorpid()))) {
return resultResponse(HaoBanErrCode.ERR_500003, user.getCorpId());
}
if (user == null) {
return resultResponse(HaoBanErrCode.ERR_6);
}
} else {
user.setUserId(qo.getUserId());
}
user.setCorpId(enterpriseDTO.getCorpid());
StaffDTO staffDTO = staffApiService.selectByUserIdAndEnterpriseId(user.getUserId(), enterpriseDTO.getWxEnterpriseId());
if (staffDTO == null) {
logger.info("成员不存在");
......@@ -298,7 +294,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
user.setNationCode(staffDTO.getNationCode());
user.setWxUserId(staffDTO.getWxUserId());
List<StaffClerkInfoDTO> result = staffClerkRelationApiService.listBindDetailByStaffId(staffDTO.getStaffId());
List<StoreMemberVO> retList = new ArrayList<>();
......@@ -321,7 +316,6 @@ public class WxEnterpriseInfoController extends WebBaseController {
VO.setClerkType(clerkDTO.getClerkType());
VO.setStaffId(staffDTO.getStaffId());
VO.setClerkId(clerkDTO.getClerkId());
retList.add(VO);
}
......@@ -339,8 +333,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
}
String userDTOJson = qywxUserApiService.getUserByCode(enterpriseDTO.getCorpid(), secretSetting.getSecretVal(), code);
logger.info("会员微信登录信息=============>{}", userDTOJson);
MemberLoginQo user = JSON.parseObject(userDTOJson, MemberLoginQo.class);
return user;
return JSON.parseObject(userDTOJson, MemberLoginQo.class);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment