优惠券使用

app/admin/service/order/OrderService.php

@@ -606,16 +606,20 @@ class OrderService
                 if (!$couponDetail) {
                     continue;
                 }
-                if ($settlementNow == 'Y') {
-                    $updateData = [
-                        'coupon_detail_status' => 'USED',
-                        'coupon_detail_used_datetime' => date('Y-m-d H:i:s'),
-                    ];
-                } else {
-                    $updateData = [
-                        'coupon_detail_status' => 'WAITING',
-                    ];
-                }
+                $updateData = [
+                    'coupon_detail_status' => 'USED',
+                    'coupon_detail_used_datetime' => date('Y-m-d H:i:s'),
+                ];
+//                if ($settlementNow == 'Y') {
+//                    $updateData = [
+//                        'coupon_detail_status' => 'USED',
+//                        'coupon_detail_used_datetime' => date('Y-m-d H:i:s'),
+//                    ];
+//                } else {
+//                    $updateData = [
+//                        'coupon_detail_status' => 'WAITING',
+//                    ];
+//                }
                 // 计算优惠券包含的优惠商品的件数和总价
                 $countAndAmount = self::countAndAmount($goods, $couponId);
                 // 如果是计件