|
|
|
@@ -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<WxCUserBasicInfo> 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); |
|
|
|
|