From c4fa4cd0c5a43d47b3623263153527e79da7bf75 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 14:36:44 +0800
Subject: [PATCH] app端的福利主页账单的feign请求bug修复，商品详情修复
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 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 275b2da..c4a005c 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
@@ -26,10 +26,7 @@
import com.dsh.account.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.account.feignclient.other.model.TImgConfig;
import com.dsh.account.mapper.*;
-import com.dsh.account.model.AddAppUserVo;
-import com.dsh.account.model.JoinPlayPaiVo;
-import com.dsh.account.model.LoginSMSCodeVo;
-import com.dsh.account.model.LoginWeChatVo;
+import com.dsh.account.model.*;
import com.dsh.account.model.dto.Coupon;
import com.dsh.account.model.vo.classDetails.CourseVenue;
import com.dsh.account.model.vo.classDetails.ExerciseVideo;
@@ -507,6 +504,7 @@
List<ConsumeDetail> details = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
+ SimpleDateFormat result = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date monthStart = null;
Date monthEnd = null;
if (StringUtils.hasText(yearMonth)) {
@@ -518,59 +516,59 @@
}
BillingDataRequestVo requestVo = new BillingDataRequestVo();
- requestVo.setMonthStart(monthStart);
- requestVo.setMonthEnd(monthEnd);
+ requestVo.setMonthStart(result.format(monthStart));
+ requestVo.setMonthEnd(result.format(monthEnd));
requestVo.setAppUserId(appUserId);
// 1.赛事报名
- List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(requestVo);
- if (allCompetitionPayRecord.size() > 0 ){
- for (PaymentCompetition paymentCompetition : allCompetitionPayRecord) {
+ BillingRequestVo allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(allCompetitionPayRecord.getRequests())){
+ for (BillingRequest paymentCompetition : allCompetitionPayRecord.getRequests()) {
ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
+ consumeDetail.setConsumeTime(paymentCompetition.getTime());
consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
details.add(consumeDetail);
consumeDetail.setType(1);
}
}
// 2.取消赛事报名
- List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(requestVo);
- if (cancelOrderOfUserPayRecord.size() > 0 ){
- for (PaymentCompetition paymentCompetition : cancelOrderOfUserPayRecord) {
+ BillingRequestVo cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(cancelOrderOfUserPayRecord.getRequests())){
+ for (BillingRequest paymentCompetition : cancelOrderOfUserPayRecord.getRequests()) {
ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
+ consumeDetail.setConsumeTime(paymentCompetition.getTime());
consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount());
consumeDetail.setType(1);
details.add(consumeDetail);
}
}
// 3.课包购买
- List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(requestVo);
- if (amountPayRecord.size() > 0 ){
- for (TCoursePackagePayment coursePackagePayment : amountPayRecord) {
+ BillingRequestVo amountPayRecord = paymentClient.getAmountPayRecord(requestVo);
+ if (ToolUtil.isNotEmpty(amountPayRecord.getRequests())){
+ for (BillingRequest coursePackagePayment : amountPayRecord.getRequests()) {
ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg());
- consumeDetail.setConsumeTime(simpleDateFormat.format(coursePackagePayment.getInsertTime()));
- consumeDetail.setConsumeAmount("-" + coursePackagePayment.getCashPayment());
+ consumeDetail.setConsumeTime(coursePackagePayment.getTime());
+ consumeDetail.setConsumeAmount("-" + coursePackagePayment.getAmount());
consumeDetail.setType(2);
details.add(consumeDetail);
}
}
// 4.场地预约
- List<SiteBooking> allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
- if (allSiteBookingList.size() > 0){
- for (SiteBooking booking : allSiteBookingList) {
+ RequestOfTypeVo allSiteBookingList = stClient.getAllSiteBookingList(requestVo);
+ if (ToolUtil.isNotEmpty(allSiteBookingList.getRequest())){
+ for (BillingRequestOfType booking : allSiteBookingList.getRequest()) {
ConsumeDetail consumeDetail = new ConsumeDetail();
if (booking.getStatus() != 5){
consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
- consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
- consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getPayTime()));
+ consumeDetail.setConsumeAmount("-" + booking.getAmount());
+ consumeDetail.setConsumeTime(booking.getTime());
consumeDetail.setType(2);
}else {
consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_VENUE_RESERVATION.getMsg());
- consumeDetail.setConsumeAmount("+" + booking.getPayMoney());
- consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getCancelTime()));
+ consumeDetail.setConsumeAmount("+" + booking.getAmount());
+ consumeDetail.setConsumeTime(booking.getTime());
consumeDetail.setType(1);
}
details.add(consumeDetail);
--
Gitblit v1.7.1