From 06ea0fe23faf2238d9d1141826ecb404367aecec Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 18 十月 2024 10:49:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
index e4e934c..9a00b7d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java
@@ -35,6 +35,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@@ -113,9 +114,8 @@
@PostMapping("/exchangeRecord")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录")
public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
- PageInfo<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
- List<ExchangeRecordVO> records = data.getRecords();
- for (ExchangeRecordVO record : records) {
+ List<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
+ for (ExchangeRecordVO record : data) {
TCoupon byId = tCouponService.getById(record.getCouponId());
if (byId!=null){
record.setDiscountAmount("￥"+byId.getDiscountAmount());
@@ -128,7 +128,9 @@
record.setDetailsPicture(byId.getDetailsPicture());
}
}
- return AjaxResult.ok(data);
+ PageInfo<ExchangeRecordVO> exchangeRecordVOPageInfo = new PageInfo<>(1, 99999999);
+ exchangeRecordVOPageInfo.setRecords(data);
+ return AjaxResult.ok(exchangeRecordVOPageInfo);
}
@@ -179,6 +181,24 @@
public AjaxResult<PageInfo<TCoupon>> pageList(@RequestBody CouponQuery dto) {
return AjaxResult.ok(tCouponService.pageList(dto));
}
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券列表分页查询")
+ @PostMapping(value = "/pageList3")
+ public AjaxResult<List<TCoupon>> pageList() {
+ List<TCoupon> tCoupons = new ArrayList<>();
+
+ List<TCoupon> list = tCouponService.lambdaQuery().eq(TCoupon::getStatus, 1)
+ .orderByDesc(TCoupon::getCreateTime).list();
+ for (TCoupon tCoupon : list) {
+ if (tCoupon.getValidityPeriodMode()==1){
+ if (LocalDateTime.now().isBefore(tCoupon.getEndTime())){
+ tCoupons.add(tCoupon);
+ }
+ }else{
+ tCoupons.add(tCoupon);
+ }
+ }
+ return AjaxResult.ok(tCoupons);
+ }
/**
* 小程序远程调用 获取优惠券信息
--
Gitblit v1.7.1