Jelajahi Sumber

允许采美豆购买优惠券负数

zhijiezhao 3 tahun lalu
induk
melakukan
bac6ac58f9

+ 1 - 1
src/main/java/com/caimei365/order/service/impl/HeliPayNonOrderServiceImpl.java

@@ -1924,7 +1924,7 @@ public class HeliPayNonOrderServiceImpl implements HeliPayNonOrderService {
         }
         double moneyCouponPrice = co.getMoneyCouponPrice();
         int needBeans = (int) moneyCouponPrice;
-        if (beans < needBeans) {
+        if (beans < 1) {
             return ResponseJson.error("采美豆数量不足!", null);
         }
         //给券

+ 4 - 0
src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -952,6 +952,10 @@ public class SubmitServiceImpl implements SubmitService {
             }
             couponAmount = coupon.getCouponAmount();
         }
+        // 美博会临时设置,7260,7261临时套餐商品,不可使用优惠券
+        if(productIdList.contains(7260)||productIdList.contains(7261)){
+            couponAmount = 0d;
+        }
         mainOrder.setCouponAmount(couponAmount);
         /**
          * 计算运费