1

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;

app/models/store/StoreCouponUser.php

@@ -136,28 +136,15 @@ class StoreCouponUser extends BaseModel
             $cateId = array_merge($cateId, $temp);
             $cateId = array_unique($cateId);
             foreach ($cateId as $value) {
-//                $lst2[] = $model->alias('a')
-//                    ->join('store_coupon b', 'b.id=a.cid')
-//                    ->where('a.uid', $uid)
-//                    ->where('a.is_fail', 0)
-//                    ->where('a.status', 0)
-//                    ->where('a.use_min_price', '<=', $_price)
-//                    ->whereFindinSet('b.category_id', $value)
-//                    ->where('b.type', 1)
-//                    ->field('a.*,b.type')
-//                    ->order('a.coupon_price', 'DESC')
-//                    ->select()
-//                    ->hidden(['status', 'is_fail'])
-//                    ->toArray();
                 $lst2[] = $model->alias('a')
                     ->join('store_coupon b', 'b.id=a.cid')
                     ->where('a.uid', $uid)
                     ->where('a.is_fail', 0)
                     ->where('a.status', 0)
                     ->where('a.use_min_price', '<=', $_price)
-                    ->whereFindInSet('b.category_id', $value) // 确保这里使用的是 whereFindInSet
+                    ->whereFindinSet('b.category_id', $value)
                     ->where('b.type', 1)
-                    ->field('a.*, b.type')
+                    ->field('a.*,b.type')
                     ->order('a.coupon_price', 'DESC')
                     ->select()
                     ->hidden(['status', 'is_fail'])

app/models/store/StoreOrder.php

@@ -347,27 +347,27 @@ class StoreOrder extends BaseModel
                 }
             }
             //使用优惠劵
-            $res1 = true;
-            if ($couponId) {
-                $couponInfo = StoreCouponUser::validAddressWhere()->where('id', $couponId)->where('uid', $uid)->find();
-                if (!$couponInfo) return self::setErrorInfo('选择的优惠劵无效!', true);
-                $coupons = StoreCouponUser::getUsableCouponList($uid, ['valid' => $cartInfo], $payPrice);
-                $flag = false;
-                foreach ($coupons as $coupon) {
-                    if ($coupon['id'] == $couponId) {
-                        $flag = true;
-                        continue;
-                    }
-                }
-                if (!$flag)
-                    return self::setErrorInfo('不满足优惠劵的使用条件!', true);
-                $payPrice = (float)bcsub($payPrice, $couponInfo['coupon_price'], 2);
-                $res1 = StoreCouponUser::useCoupon($couponId);
-                $couponPrice = $couponInfo['coupon_price'];
-            } else {
-                $couponId = 0;
-                $couponPrice = 0;
-            }
+//            $res1 = true;
+//            if ($couponId) {
+//                $couponInfo = StoreCouponUser::validAddressWhere()->where('id', $couponId)->where('uid', $uid)->find();
+//                if (!$couponInfo) return self::setErrorInfo('选择的优惠劵无效!', true);
+//                $coupons = StoreCouponUser::getUsableCouponList($uid, ['valid' => $cartInfo], $payPrice);
+//                $flag = false;
+//                foreach ($coupons as $coupon) {
+//                    if ($coupon['id'] == $couponId) {
+//                        $flag = true;
+//                        continue;
+//                    }
+//                }
+//                if (!$flag)
+//                    return self::setErrorInfo('不满足优惠劵的使用条件!', true);
+//                $payPrice = (float)bcsub($payPrice, $couponInfo['coupon_price'], 2);
+//                $res1 = StoreCouponUser::useCoupon($couponId);
+//                $couponPrice = $couponInfo['coupon_price'];
+//            } else {
+//                $couponId = 0;
+//                $couponPrice = 0;
+//            }
             if (!$res1) return self::setErrorInfo('使用优惠劵失败!', true);
 
             //$shipping_type = 1 快递发货 $shipping_type = 2 门店自提