From 79896552fa31dea34403e64076431a0e2277e50f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 28 六月 2020 16:47:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index 7c96e19..662df06 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -305,14 +305,22 @@
userInfoVO.setTotalOrder(commonOrderCountService.countHistoryOrderNum(uid));
// 绱鍏戞崲閲戝竵
- userInfoVO.setTotalGoldCoinUsed(integralDetailService.sumUseGoldCoin(uid));
+ userInfoVO.setTotalGoldCoinUsed(Math.abs(integralDetailService.sumUseGoldCoin(uid)));
// 閭�璇蜂汉
UserInfo boss = threeSaleSerivce.getBoss(uid);
if (boss == null) {
userInfoVO.setBossName("");
} else {
- userInfoVO.setBossName("涓婄骇锛�" + boss.getNickName());
+ userInfoVO.setBossName("閭�璇蜂汉锛�" + boss.getNickName());
+ }
+
+ // 寰俊鍙�
+ String wxId = userInfoVO.getWxId();
+ if (StringUtil.isNullOrEmpty(wxId)) {
+ userInfoVO.setWxId("");
+ } else {
+ userInfoVO.setWxId("寰俊鍙�:" + wxId);
}
}
--
Gitblit v1.8.0