From f1d9bbe5e8e1adcc6c207510b56efce276a1bd09 Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 3 Sep 2019 18:03:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]C=E7=AB=AF=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=99=BB=E5=BD=95=E5=90=8E=E7=A7=AF=E5=88=86=E5=92=8C?= =?UTF-8?q?=E6=88=90=E9=95=BF=E5=80=BC=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/BaseController.java | 9 +++++---- .../com/iformall/controller/WxUserGrantController.java | 2 +- .../service/impl/WxCUserBasicInfoServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 90e31bea6..cfe444b2f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -27,6 +27,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import java.util.Objects; @RestController public class BaseController { @@ -128,8 +129,8 @@ public class BaseController { List list = wxCUserBasicInfoService.findByPhone(user.getTenantId(), phone); if (list.size() > 0) { WxCUserBasicInfo basicInfo = list.get(0); - // 微信名称 - if (basicInfo.getNickName() == null || basicInfo.getNickName().equals(user.getNickName())) { + // 微信名称,统一成微信昵称 + if (!Objects.equals(basicInfo.getNickName(), user.getNickName())) { basicInfo.setNickName(user.getNickName()); } // 性别 @@ -137,11 +138,11 @@ public class BaseController { basicInfo.setSex(user.getGender()); } // 成长值 - if (basicInfo.getPoins() == null) { + if (Objects.nonNull(user.getScore())) { basicInfo.setPoins(user.getScore()); } // 积分 - if (basicInfo.getCredit() == null) { + if (Objects.nonNull(user.getCredit())) { basicInfo.setCredit(user.getCredit()); } wxCUserBasicInfoService.updateObj(basicInfo, user); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 63ef3f549..526a2be4a 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -527,7 +527,7 @@ public class WxUserGrantController extends BaseController { if(isFirstPhone) { // 首次授权, 增加成长值及积分 // 成长值 - user.setScore(wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE, user)); + user.setScore(user.getScore() + wxScoreRulesService.addScore(EnumScoreType.WECHAT_PHONE, user)); //增加积分 wxCUserService.addCredit(user, EnumScoreType.WECHAT_PHONE); } 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 aae8f2fcd..e8eb23446 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -620,7 +620,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { CUserBaseVo userBaseVo = new CUserBaseVo(); org.springframework.beans.BeanUtils.copyProperties(record, userBaseVo); userBaseVo.setNewId(user.getId()); - userBaseVo.setCredit(user.getCredit()); + //userBaseVo.setCredit(user.getCredit()); userBaseVo.setPoins(user.getScore()); wxCUserBasicInfoMapper.updateNewId(userBaseVo); }