Browse Source

zhenjuan

release_toaliyun_real
xhxu 5 years ago
parent
commit
8657e07120
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java

+ 8
- 8
mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java View File

@@ -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);
}


Loading…
Cancel
Save