From f95325fd2635a9af08c0acac70e70379978d128a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 10 七月 2023 19:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 127 +++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 64 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 de01b85..4e6c0fb 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
@@ -14,6 +14,7 @@
import com.dsh.account.feignclient.course.model.QueryStoreList;
import com.dsh.account.feignclient.course.model.StuCourseResp;
import com.dsh.account.feignclient.other.ImgConfigClient;
+import com.dsh.account.feignclient.other.RechargeConfigClient;
import com.dsh.account.feignclient.other.StoreClient;
import com.dsh.account.feignclient.other.model.Store;
import com.dsh.account.feignclient.other.model.TImgConfig;
@@ -32,11 +33,13 @@
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.dsh.account.model.vo.userBenefitDetail.BillingDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.IndexOfUserBenefirVo;
+import com.dsh.account.model.vo.userBenefitDetail.RechargeCentVo;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.*;
import com.dsh.account.util.akeylogin.Md5Util;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
@@ -94,6 +97,9 @@
@Resource
private RechargeRecordsMapper rrMapper;
+
+ @Resource
+ private RechargeConfigClient reconMapper;
@Override
public ClassInfoVo queryUserOfStus(Integer id,String latitude,String longitude) {
@@ -469,82 +475,55 @@
}
@Override
- public BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId) {
+ public BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) {
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);
+ Date monthStart = null;
+ Date monthEnd = null;
+ if (StringUtils.hasText(yearMonth)) {
+ monthStart = DateTimeHelper.getCurrentIdetMouthStart(yearMonth);
+ monthEnd = DateTimeHelper.getCurrentIdeaMouthEnd(yearMonth);
+ } else {
+ monthStart = DateTimeHelper.getCurrentMouthStart();
+ monthEnd = DateTimeHelper.getCurrentMouthEnd();
+ }
// 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);
- }
+ List<VipPayment> vipPayments = vipPaymentMapper.selectList(new QueryWrapper<VipPayment>()
+ .eq("payStatus", 2)
+ .eq("appUserId", appUserId)
+ .between("insertTime", monthStart, monthEnd));
+ if (vipPayments.size() > 0) {
+ for (VipPayment vipPayment : vipPayments) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.getMsg());
+ 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)
+ .eq("appUserId", appUserId)
+ .between("insertTime", monthStart, monthEnd));
+ if (rechargeRecords.size() > 0) {
+ for (RechargeRecords rechargeRecord : rechargeRecords) {
+ BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins());
+ consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
+ consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount());
+ details.add(consumeDetail);
+ }
+ }
+
vo.setDetails(details);
return vo;
}
@@ -558,4 +537,24 @@
}
}
+ @Override
+ public List<RechargeCentVo> getSysRechargeConfig(Integer appUserId) {
+ List<RechargeCentVo> centVos = new ArrayList<>();
+ TAppUser tAppUser = this.baseMapper.selectById(appUserId);
+ List<Map<String, Object>> rechargeConfig = reconMapper.getRechargeConfig();
+ if (rechargeConfig.size() > 0 ){
+ for (Map<String, Object> stringObjectMap : rechargeConfig) {
+ RechargeCentVo vo = new RechargeCentVo();
+ vo.setAmount("¥ "+stringObjectMap.get("money"));
+ if (tAppUser.getIsVip() == 1){
+ vo.setWpGold(stringObjectMap.get("MemberCoins")+"币");
+ }else {
+ vo.setWpGold(stringObjectMap.get("usersCoins")+"币");
+ }
+ centVos.add(vo);
+ }
+ }
+ return centVos;
+ }
+
}
--
Gitblit v1.7.1