From b252cf2b5bf5b0a5f43aa4d71f064dc5bb107335 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Tue, 16 Apr 2019 17:40:43 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-wx-api]:=20=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E5=AD=98=E5=9C=A8=E4=BC=A0=E9=80=92=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E9=80=82=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=EF=BC=8C=E6=AD=A4=E6=97=B6=E5=90=8E=E7=AB=AF=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=80=89=E6=8B=A9=E5=90=88=E9=80=82=E7=9A=84=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/linlinjava/litemall/wx/web/WxCartController.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java
index c8d75425..7d01f3a8 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java
@@ -466,11 +466,14 @@ public class WxCartController {
         }
         else {
             LitemallCoupon coupon = couponVerifyService.checkCoupon(userId, couponId, checkedGoodsPrice);
-            // 用户选择的优惠券有问题
+            // 用户选择的优惠券有问题，则选择合适优惠券，否则使用用户选择的优惠券
             if(coupon == null){
-                return ResponseUtil.badArgumentValue();
+                couponPrice = tmpCouponPrice;
+                couponId = tmpCouponId;
+            }
+            else {
+                couponPrice = coupon.getDiscount();
             }
-            couponPrice = coupon.getDiscount();
         }
 
         // 根据订单商品总价计算运费，满88则免运费，否则8元；