gorden hai 6 meses
pai
achega
40cc3e426b

+ 0 - 2
app/admin/controller/order/WholeController.php

@@ -4331,7 +4331,6 @@ class WholeController extends Curd
         $goods = $request->post('goods', []);
         $coupon = $request->post('coupon', []);
         $payAmount = $request->post('pay_amount', 0);
-//        $totalAmount = $request->post('total_amount', 0);
         $memberId = $request->post('member_id', '');
         if (empty($goods) || empty($coupon) || empty($memberId)) {
             return json_fail("参数异常");
@@ -4355,7 +4354,6 @@ class WholeController extends Curd
             ];
         }
 
-        dump("使用过的抵扣券:", Redis::sMembers("ORDER:USE:COUPON:" . $memberId));
         Redis::del("ORDER:USE:COUPON:" . $memberId);
 
         return json_success("success", ['pay_amount' => $amountBalance['pay_amount']]);

+ 2 - 2
app/admin/service/order/OrderService.php

@@ -630,7 +630,7 @@ class OrderService
                     ];
                     Redis::set($cacheDiscountKey, json_encode($discountData,JSON_UNESCAPED_UNICODE));
                 } elseif (in_array($couponDetail->coupon_classify, ['年卡', '季卡', '月卡'])) {
-                    if (Redis::sIsMember($cacheKey, $couponId) && Redis::sIsMember($cacheKey, $goodsId)) {
+                    if (Redis::sIsMember($cacheKey, $couponId)) {
                         continue;
                     }
                     Redis::sAdd($cacheKey, $couponId);
@@ -775,7 +775,7 @@ class OrderService
                         $welfareBalance = 0;
                     }
                 } elseif (in_array($couponDetail->coupon_classify, ['年卡', '季卡', '月卡'])) {
-                    if (Redis::sIsMember($cacheKey, $couponId) && Redis::sIsMember($cacheKey, $goodsId)) {
+                    if (Redis::sIsMember($cacheKey, $couponId)) {
                         continue;
                     }
                     Redis::sAdd($cacheKey, $couponId);