|
@@ -796,7 +796,7 @@ class OrderService
|
|
|
if ($couponDetail->coupon_category == 'PIECE' && $countAndAmount['count'] < $couponDetail->coupon_minimum_limit) {
|
|
|
continue;
|
|
|
}
|
|
|
- if (in_array($couponDetail->coupon_classify, ['立减券', '满减券'])) {
|
|
|
+ if (in_array($couponDetail->coupon_classify, ['立减券','满减券'])) {
|
|
|
if (Redis::sIsMember($cacheKey, $couponId)) {
|
|
|
continue;
|
|
|
}
|
|
@@ -804,7 +804,34 @@ class OrderService
|
|
|
if ($couponDetail->coupon_category == 'PIECE' || ($couponDetail->coupon_category == 'NORMAL' && $countAndAmount['amount'] >= $couponDetail->coupon_minimum_limit)) {
|
|
|
$payAmount = $payAmount - $couponDetail->coupon_value;
|
|
|
}
|
|
|
- } elseif ($couponDetail->coupon_classify == '折扣券') {
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ elseif ($couponDetail->coupon_classify == '折扣券') {
|
|
|
if (Redis::sIsMember($cacheKey, $couponId)) {
|
|
|
continue;
|
|
|
}
|
|
@@ -894,7 +921,7 @@ class OrderService
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- return compact('count', 'amount','goodsIds');
|
|
|
+ return compact('count', 'amount', 'goodsIds');
|
|
|
} catch (\Exception $e) {
|
|
|
dump($e->getTrace());
|
|
|
}
|