WIN-2308041133\Administrator 3 semanas atrás
pai
commit
817df96590

+ 3 - 4
app/api/controller/order/StoreOrderController.php

@@ -63,8 +63,8 @@ class StoreOrderController
             'offlinePostage' => sys_config('offline_postage'),
             'integralRatio' => sys_config('integral_ratio')
         ];
-//        $usableCoupons = StoreCouponUser::getUsableCouponList($uid, $cartGroup, $priceGroup['totalPrice']);
-//        $usableCoupon = isset($usableCoupons[0]) ? $usableCoupons[0] : null;
+        $usableCoupons = StoreCouponUser::getUsableCouponList($uid, $cartGroup, $priceGroup['totalPrice']);
+        $usableCoupon = isset($usableCoupons[0]) ? $usableCoupons[0] : null;
         $cartIdA = explode(',', $cartId);
         $seckill_id = 0;
         $combination_id = 0;
@@ -75,8 +75,7 @@ class StoreOrderController
             $bargain_id = StoreCart::where('id', $cartId)->value('bargain_id');
         }
         $data['deduction'] = $seckill_id || $combination_id || $bargain_id;
-//        $data['usableCoupon'] = $usableCoupon;
-        $data['usableCoupon'] = 0;
+        $data['usableCoupon'] = $usableCoupon;
         $data['addressInfo'] = UserAddress::getUserDefaultAddress($uid);
         $data['seckill_id'] = $seckill_id;
         $data['combination_id'] = $combination_id;

+ 1 - 1
app/models/store/StoreOrder.php

@@ -368,7 +368,7 @@ class StoreOrder extends BaseModel
 //                $couponId = 0;
 //                $couponPrice = 0;
 //            }
-            if (!$res1) return self::setErrorInfo('使用优惠劵失败!', true);
+//            if (!$res1) return self::setErrorInfo('使用优惠劵失败!', true);
 
             //$shipping_type = 1 快递发货 $shipping_type = 2 门店自提
             $store_self_mention = sys_config('store_self_mention') ?? 0;