From 0911582d2f80e7f3162fb6d0b59ee12e23de133b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 17 十月 2024 09:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 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 a2eefca..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
@@ -10,6 +10,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.other.api.domain.Region;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TGoods;
@@ -32,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;
@@ -66,6 +70,7 @@
}
@PostMapping("/saveGoods")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券添加")
+ @Log(title = "【优惠券管理】添加优惠券", businessType = BusinessType.INSERT,operatorType = OperatorType.MANAGE)
public AjaxResult saveActivity(@RequestBody TCoupon dto) {
tCouponService.save(dto);
return AjaxResult.success();
@@ -75,6 +80,7 @@
@GetMapping("/delete")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券删除")
+ @Log(title = "【优惠券管理】删除优惠券", businessType = BusinessType.DELETE,operatorType = OperatorType.MANAGE)
public AjaxResult delete(String ids) {
tCouponService.removeBatchByIds(Arrays.asList(ids.split(",")));
return AjaxResult.success();
@@ -84,6 +90,7 @@
@PostMapping("/updateVip")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券修改")
+ @Log(title = "【优惠券管理】修改优惠券", businessType = BusinessType.UPDATE,operatorType = OperatorType.MANAGE)
public AjaxResult updateActivity(@RequestBody TCoupon dto) {
tCouponService.updateById(dto);
return AjaxResult.success();
@@ -107,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());
@@ -122,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);
}
@@ -130,6 +138,7 @@
private IRegionService regionService;
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "发放优惠券")
@PostMapping(value = "/grantCoupon")
+ @Log(title = "【优惠券管理】发放优惠券", businessType = BusinessType.OTHER,operatorType = OperatorType.MANAGE)
public AjaxResult grantCoupon(@RequestBody GrantCouponDto dto) {
TCoupon byId = tCouponService.getById(dto.getCouponId());
Integer waysToObtain = byId.getWaysToObtain();
@@ -172,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