From 33658ae5597c9e395545fac39d8fe4bfc732f2ca Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期五, 07 七月 2023 18:37:36 +0800
Subject: [PATCH] account：充值记录-实体类
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 6 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 2111e73..de01b85 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
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.entity.RechargeRecords;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TStudent;
+import com.dsh.account.entity.VipPayment;
+import com.dsh.account.enums.RechargeRecordEnum;
import com.dsh.account.feignclient.activity.MerChandiseClient;
import com.dsh.account.feignclient.course.CoursePaymentClient;
import com.dsh.account.feignclient.course.model.CourseOfStoreVo;
@@ -14,8 +17,10 @@
import com.dsh.account.feignclient.other.StoreClient;
import com.dsh.account.feignclient.other.model.Store;
import com.dsh.account.feignclient.other.model.TImgConfig;
+import com.dsh.account.mapper.RechargeRecordsMapper;
import com.dsh.account.mapper.TAppUserMapper;
import com.dsh.account.mapper.TStudentMapper;
+import com.dsh.account.mapper.VipPaymentMapper;
import com.dsh.account.model.AddAppUserVo;
import com.dsh.account.model.JoinPlayPaiVo;
import com.dsh.account.model.LoginSMSCodeVo;
@@ -35,6 +40,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -83,10 +89,11 @@
@Resource
private ImgConfigClient icfgClient;
+ @Resource
+ private VipPaymentMapper vipPaymentMapper;
-
-
-
+ @Resource
+ private RechargeRecordsMapper rrMapper;
@Override
public ClassInfoVo queryUserOfStus(Integer id,String latitude,String longitude) {
@@ -464,17 +471,81 @@
@Override
public BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId) {
BillingDetailsVo vo = new BillingDetailsVo();
+ List<BillingDetailsVo.ConsumeDetail> details = new ArrayList<>();
+
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
if (null != yearMonth){
+
Date monthStart = DateTimeHelper.getCurrentIdetMouthStart(yearMonth);
Date monthEnd = DateTimeHelper.getCurrentIdeaMouthEnd(yearMonth);
+// 1.赛事报名
+// 2.课包购买
-
+// 3.场地预约
+// 4.智慧球场
+// 5.年度会员
+ List<VipPayment> vipPayments = vipPaymentMapper.selectList(new QueryWrapper<VipPayment>()
+ .eq("payStatus",2 )
+ .between("insertTime",monthStart, monthEnd));
+ if (vipPayments.size() > 0){
+ for (VipPayment vipPayment : vipPayments) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.name());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime()));
+ consumeDetail.setConsumeAmount("+"+vipPayment.getAmount());
+ details.add(consumeDetail);
+ }
+ }
+// 6.续课
+// 7.充值
+ List<RechargeRecords> rechargeRecords = rrMapper.selectList(new QueryWrapper<RechargeRecords>()
+ .eq("payStatus", 2)
+ .between("insertTime",monthStart, monthEnd));
+ if (rechargeRecords.size() > 0){
+ for (RechargeRecords rechargeRecord : rechargeRecords) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.name()+"："+rechargeRecord.getPlayPaiCoins());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
+ consumeDetail.setConsumeAmount("+"+rechargeRecord.getAmount());
+ details.add(consumeDetail);
+ }
+ }
}else {
Date currentMouthStart = DateTimeHelper.getCurrentMouthStart();
Date currentMouthEnd = DateTimeHelper.getCurrentMouthEnd();
-
-
+// 1.赛事报名
+// 2.课包购买
+// 3.场地预约
+// 4.智慧球场
+// 5.年度会员
+ List<VipPayment> vipPayments = vipPaymentMapper.selectList(new QueryWrapper<VipPayment>()
+ .eq("payStatus",2 )
+ .between("insertTime",currentMouthStart, currentMouthEnd));
+ if (vipPayments.size() > 0){
+ for (VipPayment vipPayment : vipPayments) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.name());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime()));
+ consumeDetail.setConsumeAmount("+"+vipPayment.getAmount());
+ details.add(consumeDetail);
+ }
+ }
+// 6.续课
+// 7.充值
+ List<RechargeRecords> rechargeRecords = rrMapper.selectList(new QueryWrapper<RechargeRecords>()
+ .eq("payStatus", 2)
+ .between("insertTime",currentMouthStart, currentMouthEnd));
+ if (rechargeRecords.size() > 0){
+ for (RechargeRecords rechargeRecord : rechargeRecords) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.name()+"："+rechargeRecord.getPlayPaiCoins());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
+ consumeDetail.setConsumeAmount("+"+rechargeRecord.getAmount());
+ details.add(consumeDetail);
+ }
+ }
}
+ vo.setDetails(details);
return vo;
}
--
Gitblit v1.7.1