From 8657e07120bba02d1ac9040e4329a87a2920f002 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 29 Dec 2020 12:11:25 +0800 Subject: [PATCH] zhenjuan --- .../iformall/controller/WxCUserController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 91ab110c4..32b2665b7 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -169,13 +169,6 @@ public class WxCUserController extends BaseController { } 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{ TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(wxCUser.getTenantId()); @@ -251,6 +244,7 @@ public class WxCUserController extends BaseController { wxCUser.setUserId(wxCUserBasicInfo.getId()); } + } wxCUserService.saveOrUpdate(wxCUser); @@ -260,6 +254,12 @@ public class WxCUserController extends BaseController { addCredit(wxCUserBasicInfo, EnumScoreType.COMPLETE_INFO, bUser,wxMerchant); } 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端来源会员 wxCUserFromB.setInfo(JSONObject.toJSONString(wxCUserBasicInfo)); wxCUserFromBService.saveOrUpdate(wxCUserFromB); @@ -314,7 +314,7 @@ public class WxCUserController extends BaseController { wxCUser.setAppId(wxCUserFromBDto.getAppId()); wxCUser.setOpenId(wxCUserFromBDto.getOpenid()); WxCUser byOpenId = wxCUserService.getByOpenId(wxCUser); - if(null != byOpenId.getUserId()){ + if(byOpenId != null && byOpenId.getUserId() != null){ WxCUserBasicInfo byId = wxCUserBasicInfoService.getById(byOpenId.getUserId(), byOpenId.getFinalTenantId()); return new ResultData(byId); }