From 5e1e72123321330e03b1da9ca0c51780d1535b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Mon, 27 May 2024 10:15:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/OrderController.java               |  6 ++++--
 .../cashierservice/dao/TbUserCouponsMapper.java   |  2 +-
 .../cashierservice/service/OrderService.java      | 15 +++++++++++++--
 src/main/resources/mapper/TbUserCouponsMapper.xml |  6 ++++++
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
index 57a86d2..741f809 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java
@@ -62,8 +62,10 @@ public class OrderController {
     @GetMapping("/mineCoupons")
     private Result mineCoupons(@RequestHeader String token,@RequestParam("userId") String userId,@RequestParam("status") String status,
                                @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
-                               @RequestParam(value = "size", required = false, defaultValue = "1") Integer size) throws IOException {
-        return orderService.mineCoupons(userId,status,page,size);
+                               @RequestParam(value = "size", required = false, defaultValue = "1") Integer size,
+                               @RequestParam("orderId") String orderId
+                               ) throws IOException {
+        return orderService.mineCoupons(userId,orderId,status,page,size);
     }
     @GetMapping("/findCoupons")
     private Result findCoupons(@RequestHeader String token,String type,
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java
index 9f5c926..192a2e3 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbUserCouponsMapper.java
@@ -23,7 +23,7 @@ public interface TbUserCouponsMapper {
 
     int updateByPrimaryKey(TbUserCoupons record);
 
-    List<TbUserCoupons> selectByUserId(@Param("userId") String userId,@Param("status")  String status);
+    List<TbUserCoupons> selectByUserId(@Param("userId") String userId,@Param("status")  String status,@Param("amount") BigDecimal amount);
 
     TbUserCoupons selectByOrderId(@Param("orderId") Integer orderId);
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index bad942b..5da256c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -74,6 +74,10 @@ public class OrderService {
     private TbYhqParamsMapper yhqParamsMapper;
     @Autowired
     private TbShopUserMapper shopUserMapper;
+
+
+    @Autowired
+    private TbOrderInfoMapper tbOrderInfoMapper;
     /**
      * 创建订单
      *
@@ -307,9 +311,16 @@ public class OrderService {
     }
 
 
-    public Result mineCoupons(String userId, String status, Integer page, Integer size) {
+    public Result mineCoupons(String userId, String orderId,String status, Integer page, Integer size) {
+        BigDecimal amount=null;
+        if(ObjectUtil.isNotNull(orderId)&&ObjectUtil.isNotEmpty(orderId)){
+            TbOrderInfo orderInfo= tbOrderInfoMapper.selectByPrimaryKey(Integer.valueOf(orderId));
+            amount=orderInfo.getOriginAmount();
+        }
+
+
         PageHelper.startPage(page, size);
-        List<TbUserCoupons> list = userCouponsMapper.selectByUserId(userId,status);
+        List<TbUserCoupons> list = userCouponsMapper.selectByUserId(userId,status,amount);
         PageInfo pageInfo = new PageInfo(list);
         return Result.success(CodeEnum.SUCCESS, pageInfo);
     }
diff --git a/src/main/resources/mapper/TbUserCouponsMapper.xml b/src/main/resources/mapper/TbUserCouponsMapper.xml
index 02c9600..b746d3c 100644
--- a/src/main/resources/mapper/TbUserCouponsMapper.xml
+++ b/src/main/resources/mapper/TbUserCouponsMapper.xml
@@ -26,6 +26,12 @@
     <if test="status != null and status != ''">
       and status = #{status}
     </if>
+
+    <if test="amount != null and amount != ''">
+      and coupons_amount &lt;= #{amount}
+    </if>
+
+
   </select>
   <select id="selectByOrderId" resultType="com.chaozhanggui.system.cashierservice.entity.TbUserCoupons">
     select * from tb_user_coupons where order_id = #{orderId}