diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 384b8d809..90e31bea6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -144,7 +144,7 @@ public class BaseController { if (basicInfo.getCredit() == null) { basicInfo.setCredit(user.getCredit()); } - wxCUserBasicInfoService.updateObj(basicInfo, user.getId(),user); + wxCUserBasicInfoService.updateObj(basicInfo, user); } else { Date cur = new Date(); WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index 8d06691b4..5a33ab869 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -67,7 +67,7 @@ public interface WxCUserBasicInfoService { * * @param record */ - void updateObj(WxCUserBasicInfo record, Long newId, WxCUser user); + void updateObj(WxCUserBasicInfo record, WxCUser user); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index d2291ee05..d6256281f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -594,32 +594,32 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { } @Override - public void updateObj(WxCUserBasicInfo record, Long newId,WxCUser user) { + public void updateObj(WxCUserBasicInfo record, WxCUser user) { // 1. update c_user_tags CUserTagNewIdVo userTagVo = new CUserTagNewIdVo(); userTagVo.setTenantId(record.getTenantId()); userTagVo.setUserId(record.getId()); - userTagVo.setNewUserId(newId); + userTagVo.setNewUserId(user.getId()); wxCUserTagsMapper.updateNewId(userTagVo); // 2. update score history WxScoreHistoryNewIdVo scoreHistoryNewIdVo = new WxScoreHistoryNewIdVo(); scoreHistoryNewIdVo.setTenantId(record.getTenantId()); scoreHistoryNewIdVo.setCUserId(record.getId()); - scoreHistoryNewIdVo.setNewUserId(newId); + scoreHistoryNewIdVo.setNewUserId(user.getId()); scoreHistoryMapper.updateNewId(scoreHistoryNewIdVo); // 3. update credit history WxCreditHistoryNewIdVo creditHistoryNewIdVo = new WxCreditHistoryNewIdVo(); creditHistoryNewIdVo.setTenantId(record.getTenantId()); creditHistoryNewIdVo.setCUserId(record.getId()); - creditHistoryNewIdVo.setNewUserId(newId); + creditHistoryNewIdVo.setNewUserId(user.getId()); creditHistoryMapper.updateNewId(creditHistoryNewIdVo); // 10. base info CUserBaseVo userBaseVo = new CUserBaseVo(); org.springframework.beans.BeanUtils.copyProperties(record, userBaseVo); - userBaseVo.setNewId(newId); + userBaseVo.setNewId(user.getId()); userBaseVo.setCredit(user.getCredit()); userBaseVo.setPoins(user.getScore()); wxCUserBasicInfoMapper.updateNewId(userBaseVo); diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java index 5a9be8c7f..9d64c38ec 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java @@ -137,7 +137,7 @@ public class BaseController { if (basicInfo.getPoins() == null) { basicInfo.setPoins(user.getScore()); } - wxCUserBasicInfoService.updateObj(basicInfo, user.getId(),user); + wxCUserBasicInfoService.updateObj(basicInfo, user); } else { Date cur = new Date(); WxCUserBasicInfo basicInfo = new WxCUserBasicInfo();