From be8a63ba1e3f2e26f5cdefe519c37ad4cfd90435 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期日, 05 十一月 2023 09:45:11 +0800
Subject: [PATCH] 11.5
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 350ae1b..f13ab2f 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -719,9 +719,12 @@
if (merchandise.getRedemptionMethod() == 1){
detailsResponse.setExchangeType(1);
detailsResponse.setIntegral(merchandise.getIntegral());
- }else {
+ }else if (merchandise.getRedemptionMethod() == 2){
detailsResponse.setExchangeType(2);
detailsResponse.setIntegral(merchandise.getIntegral());
+ detailsResponse.setCash(merchandise.getCash());
+ }else if (merchandise.getRedemptionMethod() == 3){
+ detailsResponse.setExchangeType(3);
detailsResponse.setCash(merchandise.getCash());
}
detailsResponse.setStartTime(simpleDateFormat.format(merchandise.getStartTime()));
@@ -791,9 +794,10 @@
// Print the result
if (isSameDate) {
- detailsResponse.setUseStatus(3);
+
} else {
System.out.println("The two dates do not have the same date.");
+ detailsResponse.setUseStatus(3);
}
@@ -860,6 +864,7 @@
if (c==null){
continue;
}
+
ExchangeDetailsResponse detailsResponse = new ExchangeDetailsResponse();
detailsResponse.setDetailsId(Long.valueOf(c.getId()));
detailsResponse.setGoodName(c.getName());
@@ -879,6 +884,8 @@
}
+ Comparator<ExchangeDetailsResponse> comparator = Comparator.comparing(ExchangeDetailsResponse::getStartTime).reversed();
+ Collections.sort(responses, comparator);
detailsVo.setDetailsResponses(responses);
}
@@ -1231,6 +1238,15 @@
}
+ //拿到积分商品现金的消费记录
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/getConsumeDetails")
+ public List<ConsumeDetail> getConsumeDetails(@RequestBody BillingDataRequestVo requestVo){
+ return upmseService.getConsumeDetails(requestVo);
+
+
+
+ }
public int dealTimeStatus(String startTime, String endTime){
--
Gitblit v1.7.1