From 18b58aaf9bd99cadd0e7f80fe5d80586f2f4831a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 24 十一月 2023 18:32:43 +0800
Subject: [PATCH] 11.24
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index a7d0bc2..25f4833 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -719,7 +719,11 @@
IndexOfUserBenefirVo benefirVo = new IndexOfUserBenefirVo();
TAppUser appUser = this.getById(appUserId);
- benefirVo.setUserHeadImg(appUser.getHeadImg());
+ if (appUser.getHeadImg()!=null) {
+ benefirVo.setUserHeadImg(appUser.getHeadImg());
+ }else {
+ benefirVo.setUserHeadImg("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/630864764d3c4e98822ff976a2389559.jpg");
+ }
benefirVo.setUserName(appUser.getName());
benefirVo.setWpCoin(ToolUtil.isEmpty(appUser.getPlayPaiCoins()) ? 0 : appUser.getPlayPaiCoins());
benefirVo.setUserIntegral(ToolUtil.isEmpty(appUser.getIntegral()) ? 0 : appUser.getIntegral());
@@ -929,7 +933,7 @@
RechargeCentVo vo = new RechargeCentVo();
Double money = (Double) stringObjectMap.get("money");
vo.setAmount(BigDecimal.valueOf(money) );
- if (tAppUser.getIsVip() == 1){
+ if (tAppUser.getIsVip() == 1&&tAppUser.getVipEndTime().after(new Date())){
vo.setWpGold((Integer) stringObjectMap.get("MemberCoins"));
}else {
vo.setWpGold((Integer) stringObjectMap.get("usersCoins"));
@@ -1581,7 +1585,7 @@
UserIntegralChanges userIntegralChanges = new UserIntegralChanges();
userIntegralChanges.setAppUserId(appUserId);
userIntegralChanges.setOldIntegral(appUser.getIntegral());
- userIntegralChanges.setType(5);
+ userIntegralChanges.setType(2);
appUser.setIntegral(null == appUser.getIntegral() ? points : appUser.getIntegral() - points);
userIntegralChanges.setNewIntegral(appUser.getIntegral());
userIntegralChanges.setInsertTime(new Date());
--
Gitblit v1.7.1