From 03bc927fdb8469c1417f75c2a25a06a0d6b1ae61 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 21 三月 2024 14:44:48 +0800
Subject: [PATCH] 修改bug
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 1214233..a120571 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
@@ -29,13 +29,8 @@
import com.dsh.account.feignclient.course.CoursePaymentClient;
import com.dsh.account.feignclient.course.VideoOfCourseListClient;
import com.dsh.account.feignclient.course.model.*;
-import com.dsh.account.feignclient.other.ImgConfigClient;
-import com.dsh.account.feignclient.other.RechargeConfigClient;
-import com.dsh.account.feignclient.other.SiteClient;
-import com.dsh.account.feignclient.other.StoreClient;
-import com.dsh.account.feignclient.other.model.Store;
-import com.dsh.account.feignclient.other.model.StoreDetailOfCourse;
-import com.dsh.account.feignclient.other.model.TImgConfig;
+import com.dsh.account.feignclient.other.*;
+import com.dsh.account.feignclient.other.model.*;
import com.dsh.account.mapper.*;
import com.dsh.account.model.*;
import com.dsh.account.model.AppUserByNameAndPhoneDTO;
@@ -190,6 +185,9 @@
@Autowired
private UserIntegralChangesService userIntegralChangesService;
+
+ @Resource
+ private GameRecordClient gameRecordClient;
@@ -883,6 +881,21 @@
}
// 5.智慧球场
+ GetTGameRecord getTGameRecord = new GetTGameRecord();
+ getTGameRecord.setAppUserId(appUserId);
+ getTGameRecord.setStartTiem(monthStart);
+ getTGameRecord.setEndTime(monthEnd);
+ List<TGameRecord> tGameRecord = gameRecordClient.getTGameRecord(getTGameRecord);
+ for (TGameRecord gameRecord : tGameRecord) {
+ ConsumeDetail consumeDetail = new ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.SMART_STADIUM.getMsg());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(gameRecord.getTime()));
+ consumeDetail.setConsumeAmount("-" + gameRecord.getMoney());
+ consumeDetail.setType(2);
+ consumeDetail.setDateTime(gameRecord.getTime().getTime());
+ details.add(consumeDetail);
+ }
+
// 6.年度会员
List<VipPayment> vipPayments = vipPaymentMapper.selectList(new QueryWrapper<VipPayment>()
.eq("payStatus", 2)
@@ -956,6 +969,7 @@
details.add(consumeDetail);
}
}
+
if (details.size() > 0) {
Collections.sort(details, new Comparator<ConsumeDetail>() {
@@ -1503,7 +1517,9 @@
pointsMerchandise.setCode(code);
pointsMerchandise.setInsertTime(new Date());
pointsMerchandise.setPayType(exchangeType.getExchangeType());
- pointsMerchandise.setIntegral(merchandise.getIntegral() * goodsNums);
+ if(null != merchandise.getIntegral()){
+ pointsMerchandise.setIntegral(merchandise.getIntegral() * goodsNums);
+ }
if(exchangeType.getExchangeType() == 2){
pointsMerchandise.setCash(merchandise.getCash());
pointsMerchandise.setCashPayType(exchangeType.getPayType());
--
Gitblit v1.7.1