From 81c7a72b9c6c27d4a41cdb66a9a6d2b0750f2d65 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 11 Apr 2022 14:18:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E5=9C=A8=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=B8=AD=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=9A=84=E4=B8=80=E4=BA=9B=E6=9E=81?=
 =?UTF-8?q?=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java | 5 +++++
 .../cn/lili/modules/order/cart/render/impl/CouponRender.java | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java
index e05113b1..45d9cd87 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java
@@ -160,4 +160,9 @@ public class TradeDTO implements Serializable {
         }
         return skuList;
     }
+
+    public void removeCoupon() {
+        this.canUseCoupons = new ArrayList<>();
+        this.cantUseCoupons = new ArrayList<>();
+    }
 }
diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java
index 9eb7f01e..549dbd04 100644
--- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java
+++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java
@@ -57,8 +57,12 @@ public class CouponRender implements CartRenderStep {
      * @param tradeDTO 交易dto
      */
     private void renderCouponRule(TradeDTO tradeDTO) {
+        // 清除之前的优惠券
+        tradeDTO.removeCoupon();
+
         List<MemberCoupon> memberCouponList = memberCouponService.getMemberCoupons(tradeDTO.getMemberId());
 
+        //获取最新优惠券
         memberCouponList = memberCouponList.stream()
                 .filter(item -> item.getStartTime().before(new Date()) && item.getEndTime().after(new Date()))
                 .collect(Collectors.toList());