|
|
|
@@ -699,8 +699,19 @@ public class WxUserGrantController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isBlank(wxCUserBasicInfo.getName()) || wxCUserBasicInfo.getBirthdate() == null || wxCUserBasicInfo.getSex() == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"必填信息不能为空"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"必填信息[姓名,生日,性别]不能为空"); |
|
|
|
} |
|
|
|
|
|
|
|
boolean isFirst = true; |
|
|
|
try { |
|
|
|
//WxCUserBasicInfo curWxCUserBasicInfo = getShortCacheMember(memberId,getFinalTenantId()); |
|
|
|
WxCUserBasicInfo curWxCUserBasicInfo = wxCUserBasicInfoService.getById(memberId,getFinalTenantId()); |
|
|
|
if (StringUtils.isNotBlank(curWxCUserBasicInfo.getName ()) && null != curWxCUserBasicInfo.getBirthdate() && null != curWxCUserBasicInfo.getSex()) { |
|
|
|
isFirst = false; |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(wxCUserBasicInfo.getNickName()) |
|
|
|
|| StringUtils.isNotBlank(wxCUserBasicInfo.getAvatarUrl()) |
|
|
|
@@ -724,7 +735,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
|
|
|
|
removeCacheMember(memberId); |
|
|
|
|
|
|
|
wxCUserBasicInfoService.completeInfoMsg(tenantEntity, record.getId()); |
|
|
|
wxCUserBasicInfoService.completeInfoMsg(tenantEntity, record.getId(),isFirst); |
|
|
|
|
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
|