diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java index 3a9aa427c..626225612 100755 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCUserController.java @@ -31,7 +31,7 @@ import java.util.List; */ @RestController @RequestMapping("/api/cuser") -@Api(description = "B端来源用户") +@Api(description = "B端来源会员") public class WxCUserController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -116,11 +116,21 @@ public class WxCUserController extends BaseController { if(!byPhone.isEmpty()){ //更新会员信息 WxCUserBasicInfo wxCUserBasicInfo = byPhone.get(0); - wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); - wxCUserBasicInfo.setBirthdate(wxCUserFromBDto.getBirthdate()); - wxCUserBasicInfo.setSex(wxCUserFromBDto.getSex() ); - wxCUserBasicInfo.setAddress(wxCUserFromBDto.getAddress()); - wxCUserBasicInfo.setPhone(wxCUserFromBDto.getPhone()); + if(!StringUtils.isEmpty(wxCUserFromBDto.getName())){ + wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); + } + if(wxCUserFromBDto!=null){ + wxCUserBasicInfo.setBirthdate(wxCUserFromBDto.getBirthdate()); + } + if(wxCUserFromBDto.getSex()!=null){ + wxCUserBasicInfo.setSex(wxCUserFromBDto.getSex() ); + } + if(!StringUtils.isEmpty(wxCUserFromBDto.getAddress())){ + wxCUserBasicInfo.setAddress(wxCUserFromBDto.getAddress()); + } + if(!StringUtils.isEmpty(wxCUserFromBDto.getPhone())){ + wxCUserBasicInfo.setPhone(wxCUserFromBDto.getPhone()); + } wxCUserBasicInfo.setUpdateDate(new Date()); wxCUserBasicInfoService.update(wxCUserBasicInfo); wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); @@ -159,11 +169,21 @@ public class WxCUserController extends BaseController { } }else{ WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getcUserId()); - wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); - wxCUserBasicInfo.setBirthdate(wxCUserFromBDto.getBirthdate()); - wxCUserBasicInfo.setSex(wxCUserFromBDto.getSex() ); - wxCUserBasicInfo.setAddress(wxCUserFromBDto.getAddress()); - wxCUserBasicInfo.setPhone(wxCUserFromBDto.getPhone()); + if(!StringUtils.isEmpty(wxCUserFromBDto.getName())){ + wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); + } + if(wxCUserFromBDto!=null){ + wxCUserBasicInfo.setBirthdate(wxCUserFromBDto.getBirthdate()); + } + if(wxCUserFromBDto.getSex()!=null){ + wxCUserBasicInfo.setSex(wxCUserFromBDto.getSex() ); + } + if(!StringUtils.isEmpty(wxCUserFromBDto.getAddress())){ + wxCUserBasicInfo.setAddress(wxCUserFromBDto.getAddress()); + } + if(!StringUtils.isEmpty(wxCUserFromBDto.getPhone())){ + wxCUserBasicInfo.setPhone(wxCUserFromBDto.getPhone()); + } wxCUserBasicInfoService.update(wxCUserBasicInfo); wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, wxCUserBasicInfo); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java index 83d77ce26..e78eec4ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserFromBServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.WxCUserFromB; import com.iformall.mapper.WxCUserFromBMapper; import com.iformall.service.WxCUserFromBService; @@ -34,6 +35,8 @@ public class WxCUserFromBServiceImpl implements WxCUserFromBService { @Override public void saveOrUpdate(WxCUserFromB record) { if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); Date date = new Date(); record.setCreateTime(date); record.setUpdateTime(date);