| @@ -169,13 +169,6 @@ public class WxCUserController extends BaseController { | |||||
| } | } | ||||
| wxCUserBasicInfoService.update(wxCUserBasicInfo); | wxCUserBasicInfoService.update(wxCUserBasicInfo); | ||||
| wxCUserFromB.setBUserId(wxCUserFromBDto.getUserId()); | |||||
| wxCUserFromB.setCUserId(wxCUserBasicInfo.getId()); | |||||
| wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); | |||||
| wxCUserFromB.setMerchantId(bUser.getMerchantId()); | |||||
| wxCUserFromB.updateTenantInfo(bUser); | |||||
| wxCUserFromB.setAppId(wxCUserFromBDto.getAppId()); | |||||
| wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | |||||
| }else{ | }else{ | ||||
| TenantEntity tenantEntity = new TenantEntity(); | TenantEntity tenantEntity = new TenantEntity(); | ||||
| tenantEntity.setTenantId(wxCUser.getTenantId()); | tenantEntity.setTenantId(wxCUser.getTenantId()); | ||||
| @@ -251,6 +244,7 @@ public class WxCUserController extends BaseController { | |||||
| wxCUser.setUserId(wxCUserBasicInfo.getId()); | wxCUser.setUserId(wxCUserBasicInfo.getId()); | ||||
| } | } | ||||
| } | } | ||||
| wxCUserService.saveOrUpdate(wxCUser); | wxCUserService.saveOrUpdate(wxCUser); | ||||
| @@ -260,6 +254,12 @@ public class WxCUserController extends BaseController { | |||||
| addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, bUser,wxMerchant); | addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, bUser,wxMerchant); | ||||
| } | } | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo,bUser); | wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo,bUser); | ||||
| wxCUserFromB.setBUserId(wxCUserFromBDto.getUserId()); | |||||
| wxCUserFromB.setCUserId(wxCUserBasicInfo.getId()); | |||||
| wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); | |||||
| wxCUserFromB.setMerchantId(bUser.getMerchantId()); | |||||
| wxCUserFromB.updateTenantInfo(bUser); | |||||
| wxCUserFromB.setAppId(wxCUserFromBDto.getAppId()); | |||||
| //更新B端来源会员 | //更新B端来源会员 | ||||
| wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); | ||||
| wxCUserFromBService.saveOrUpdate(wxCUserFromB); | wxCUserFromBService.saveOrUpdate(wxCUserFromB); | ||||
| @@ -314,7 +314,7 @@ public class WxCUserController extends BaseController { | |||||
| wxCUser.setAppId(wxCUserFromBDto.getAppId()); | wxCUser.setAppId(wxCUserFromBDto.getAppId()); | ||||
| wxCUser.setOpenId(wxCUserFromBDto.getOpenid()); | wxCUser.setOpenId(wxCUserFromBDto.getOpenid()); | ||||
| WxCUser byOpenId = wxCUserService.getByOpenId(wxCUser); | WxCUser byOpenId = wxCUserService.getByOpenId(wxCUser); | ||||
| if(null != byOpenId.getUserId()){ | |||||
| if(byOpenId != null && byOpenId.getUserId() != null){ | |||||
| WxCUserBasicInfo byId = wxCUserBasicInfoService.getById(byOpenId.getUserId(), byOpenId.getFinalTenantId()); | WxCUserBasicInfo byId = wxCUserBasicInfoService.getById(byOpenId.getUserId(), byOpenId.getFinalTenantId()); | ||||
| return new ResultData(byId); | return new ResultData(byId); | ||||
| } | } | ||||