Commit e6ce306b by 墨竹

feat:代开发升级修改

parent 1807010c
...@@ -2089,7 +2089,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -2089,7 +2089,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
memberUnionRelatedService.updateExternalUseridByWxEnterpriseId(wxEnterpriseId); memberUnionRelatedService.updateExternalUseridByWxEnterpriseId(wxEnterpriseId);
log.info("转换corpid、userid end params:{}", params); log.info("转换corpid、userid end params:{}", params);
//迁移完成 //迁移完成
//updateUseridFlagById(wxEnterpriseId, corpid); updateUseridFlagById(wxEnterpriseId, corpid);
} }
/** /**
...@@ -2111,9 +2111,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA ...@@ -2111,9 +2111,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
boolean flag = qywxUserApiService.finishOpenidMigration(corpid, serviceCorpid, tabHaobanWxApplication.getAgentId(), openidType); boolean flag = qywxUserApiService.finishOpenidMigration(corpid, serviceCorpid, tabHaobanWxApplication.getAgentId(), openidType);
if (flag) { if (flag) {
wxApplicationMapper.updateCorpidById(tabHaobanWxApplication.getWxApplicationId(), openCorpid); wxApplicationMapper.updateCorpidById(tabHaobanWxApplication.getWxApplicationId(), openCorpid);
wxEnterpriseService.updateUseridFlagById(1, openCorpid, wxEnterpriseId); wxEnterpriseService.updateUseridFlagById(1, null, wxEnterpriseId);
} else { } else {
wxEnterpriseService.updateUseridFlagById(3, openCorpid, wxEnterpriseId); wxEnterpriseService.updateUseridFlagById(3, null, wxEnterpriseId);
} }
String lockKey = "updateNewUseridCorpid_" + wxEnterpriseId; String lockKey = "updateNewUseridCorpid_" + wxEnterpriseId;
RedisUtil.unlock(lockKey); RedisUtil.unlock(lockKey);
......
...@@ -106,6 +106,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -106,6 +106,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
@RequestMapping(value = "get-info-by-code", method = {RequestMethod.GET, RequestMethod.POST}) @RequestMapping(value = "get-info-by-code", method = {RequestMethod.GET, RequestMethod.POST})
@IgnoreLogin @IgnoreLogin
public HaobanResponse getInfoByCode(String code) { public HaobanResponse getInfoByCode(String code) {
logger.info("code:{}",code);
String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code); String userDTOJson = qywxCorpApiService.getCodeSession(config.getWxSuiteid(), code);
// {"errcode":0,"corpid":"wweac4ef962720aa12","session_key":"oNKOu4tDcnTWdj4wOg75YQ==","errmsg":"ok", // {"errcode":0,"corpid":"wweac4ef962720aa12","session_key":"oNKOu4tDcnTWdj4wOg75YQ==","errmsg":"ok",
// "open_userid":"wo59NLDQAAxeJ-Nr7_vwkZVc7QOG73PQ","userid":"xugaohua","deviceid":"0BB1D1FA-C5A2-4BDD-80A2-33B6BB230F8A"} // "open_userid":"wo59NLDQAAxeJ-Nr7_vwkZVc7QOG73PQ","userid":"xugaohua","deviceid":"0BB1D1FA-C5A2-4BDD-80A2-33B6BB230F8A"}
...@@ -114,7 +115,7 @@ public class WxEnterpriseInfoController extends WebBaseController { ...@@ -114,7 +115,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
if (user == null) { if (user == null) {
return resultResponse(HaoBanErrCode.ERR_6); return resultResponse(HaoBanErrCode.ERR_6);
} }
String userId = user.getUserid(); String userId = user.getOpen_userid();
String corpId = user.getCorpid(); String corpId = user.getCorpid();
WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId); WxEnterpriseDTO enterprise = wxEnterpriseApiService.getEnterpriseBycorpId(corpId);
StaffDTO loginStaff = null; StaffDTO loginStaff = null;
......
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