From 6926c5a086d1da028a041753bfe4dcaf623c41e3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 10 八月 2024 13:46:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TCouponController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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 7462917..61ac718 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
@@ -1,6 +1,7 @@
package com.ruoyi.other.controller;
+import com.ruoyi.account.api.dto.GrantCouponDto;
import com.ruoyi.account.api.feignClient.AppCouponClient;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
import com.ruoyi.account.api.vo.ExchangeRecordVO;
@@ -13,9 +14,17 @@
import com.ruoyi.other.service.TActivityService;
import com.ruoyi.other.service.TCouponService;
import com.ruoyi.other.service.TGoodsService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -64,8 +73,37 @@
@PostMapping("/exchangeRecord")
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券查看详情-兑换记录")
public AjaxResult<PageInfo<ExchangeRecordVO>> exchangeRecord(@RequestBody ExchangeRecordGoodsQuery dto) {
-
- return AjaxResult.ok(null);
+ PageInfo<ExchangeRecordVO> data = appCouponClient.getExchangeRecordByCouponId(dto).getData();
+ List<ExchangeRecordVO> records = data.getRecords();
+ for (ExchangeRecordVO record : records) {
+ TCoupon byId = tCouponService.getById(record.getCouponId());
+ if (byId!=null){
+ record.setDiscountAmount("￥"+byId.getDiscountAmount());
+ if (Objects.equals(byId.getMeetTheConditions(), BigDecimal.ZERO)){
+ record.setMeetTheConditions("无门槛");
+ }else{
+ record.setMeetTheConditions("满"+byId.getMeetTheConditions()+"元可用");
+ }
+ }
+ }
+ return AjaxResult.ok(data);
+ }
+ @ApiOperation(tags = {"管理后台-优惠券管理"},value = "发放优惠券")
+ @GetMapping(value = "/pageList")
+ public AjaxResult pageList(@RequestBody GrantCouponDto dto) {
+ TCoupon byId = tCouponService.getById(dto.getCouponId());
+ Integer waysToObtain = byId.getWaysToObtain();
+ dto.setWaysToObtain(waysToObtain);
+ switch (byId.getValidityPeriodMode()){
+ case 1:
+ dto.setEndTime(byId.getEndTime());
+ break;
+ case 2:
+ dto.setEndTime(LocalDateTime.now().plusDays(byId.getDays()));
+ break;
+ }
+ // 远程送优惠券
+ return AjaxResult.success();
}
@ApiOperation(tags = {"管理后台-优惠券管理"},value = "优惠券列表分页查询")
@PostMapping(value = "/pageList")
--
Gitblit v1.7.1