|
|
|
@@ -75,11 +75,11 @@ public class WxCUserController extends BaseController { |
|
|
|
if (StringUtils.isEmpty(wxCUserFromBDto.getAppId())) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "C端appId不能为空"); |
|
|
|
} |
|
|
|
if (wxCUserFromBDto.getBUserId() == null) { |
|
|
|
if (wxCUserFromBDto.getUserId() == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "bUserId不能为空"); |
|
|
|
} |
|
|
|
//根据bUserId查询B端用户是否存在 |
|
|
|
WxMerchantBUser bUser = wxMerchantBUserService.getById(wxCUserFromBDto.getBUserId()); |
|
|
|
WxMerchantBUser bUser = wxMerchantBUserService.getById(wxCUserFromBDto.getUserId()); |
|
|
|
if (bUser == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "B端用户不存在"); |
|
|
|
} |
|
|
|
@@ -121,7 +121,7 @@ public class WxCUserController extends BaseController { |
|
|
|
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); |
|
|
|
//新增来自B端的会员关联数据 |
|
|
|
wxCUserFromB = new WxCUserFromB(); |
|
|
|
wxCUserFromB.setBUserId(wxCUserFromBDto.getBUserId()); |
|
|
|
wxCUserFromB.setBUserId(wxCUserFromBDto.getUserId()); |
|
|
|
wxCUserFromB.setCUserId(wxCUserBasicInfo.getId()); |
|
|
|
wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); |
|
|
|
wxCUserFromB.setMerchantId(bUser.getMerchantId()); |
|
|
|
@@ -151,7 +151,7 @@ public class WxCUserController extends BaseController { |
|
|
|
wxCUserBasicInfoService.save(wxCUserBasicInfo); |
|
|
|
//新增来自B端的会员关联数据 |
|
|
|
wxCUserFromB = new WxCUserFromB(); |
|
|
|
wxCUserFromB.setBUserId(wxCUserFromBDto.getBUserId()); |
|
|
|
wxCUserFromB.setBUserId(wxCUserFromBDto.getUserId()); |
|
|
|
wxCUserFromB.setCUserId(cUserId); |
|
|
|
wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); |
|
|
|
wxCUserFromB.setMerchantId(bUser.getMerchantId()); |
|
|
|
@@ -217,8 +217,8 @@ public class WxCUserController extends BaseController { |
|
|
|
if (StringUtils.isEmpty(wxCUserFromBDto.getAppId())) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "C端appid不能为空"); |
|
|
|
} |
|
|
|
if (wxCUserFromBDto.getBUserId() == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "bUserId不能为空"); |
|
|
|
if (wxCUserFromBDto.getUserId() == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL, "B端userId不能为空"); |
|
|
|
} |
|
|
|
WxCUserFromB wxCUserFromB = wxCUserFromBService.getByOpenidAndAppId(wxCUserFromBDto); |
|
|
|
if(wxCUserFromB!=null){ |
|
|
|
|