自定义优惠

app/admin/controller/coupon/CouponController.php

@@ -239,7 +239,10 @@ class CouponController extends Curd
         $couponJson = [];
         if ($params['coupon_use_member'] == 'member' && isset($params['member_list'])) {
             $couponJson['member']['list'] = $params['member_list'];
+            $couponJson['member']['range'] = '';
+            $couponJson['member']['where'] = '';
         } else if ($params['coupon_use_member'] == 'condition') {
+            $couponJson['member']['list'] = [];
             if (isset($params['condition']) && $params['condition'] == 'is_vip') {
                 $couponJson['member']['range'] = 'VIP会员';
                 $couponJson['member']['where'] = urlencode(" `member_is_vip` = 'Y'");
@@ -251,8 +254,9 @@ class CouponController extends Curd
                 $couponJson['member']['where'] = urlencode(" `member_classify` = 'MEMBER'");
             }
         } else if ($params['coupon_use_member'] == 'all') {
-            $couponJson['member']['range'] = '不限';
-            $couponJson['member']['where'] = urlencode(" 1");
+            $couponJson['member']['list'] = [];
+            $couponJson['member']['range'] = '全部员工';
+            $couponJson['member']['where'] = '';
         }
 
         if (!empty($params['premises_range']) && $params['premises_range'] == 'all') {
@@ -358,12 +362,12 @@ class CouponController extends Curd
         }
         if ($params['coupon_use_member'] == 'member' && isset($params['member_list'])) {
             $couponJson['member']['list'] = $params['member_list'];
-            if (isset($couponJson['member']['range'])) {
+//            if (isset($couponJson['member']['range'])) {
                 $couponJson['member']['range'] = '';
-            }
-            if (isset($couponJson['member']['where'])) {
+//            }
+//            if (isset($couponJson['member']['where'])) {
                 $couponJson['member']['where'] = '';
-            }
+//            }
         } else if ($params['coupon_use_member'] == 'condition') {
             if (isset($params['condition']) && $params['condition'] == 'is_vip') {
                 $couponJson['member']['range'] = 'VIP会员';
@@ -375,12 +379,13 @@ class CouponController extends Curd
                 $couponJson['member']['range'] = '会员';
                 $couponJson['member']['where'] = urlencode(" `member_classify` = 'MEMBER'");
             }
-            if (isset($couponJson['member']['list'])) {
+//            if (isset($couponJson['member']['list'])) {
                 $couponJson['member']['list'] = [];
-            }
+//            }
         } else if ($params['coupon_use_member'] == 'all') {
-            $couponJson['member']['range'] = '不限';
-            $couponJson['member']['where'] = urlencode(" 1");
+            $couponJson['member']['list'] = [];
+            $couponJson['member']['range'] = '全部员工';
+            $couponJson['member']['where'] = '';
 
             if (isset($couponJson['member']['list'])) {
                 $couponJson['member']['list'] = [];

app/admin/controller/order/WholeController.php

@@ -1217,8 +1217,6 @@ class WholeController extends Curd
         if (!empty($orderDiscountJson)) {
             $json = json_decode($orderDiscountJson, true);
         }
-        $couponClassify = '';
-        $couponClassifyDesc = '';
         try {
             if ($params['preferential'] == 'wipe') {
                 if (intval($params['order_amount_total'] / 10) * 10 != $params['order_amount_pay']) {
@@ -1228,9 +1226,9 @@ class WholeController extends Curd
                 $couponClassifyDesc = $couponClassify = '抹零';
             } else if ($params['preferential'] == 'custom') {
                 if ($params['order_amount_total'] - $params['order_discount_amount'] != $params['order_amount_pay']) {
-                    throw new BusinessException("自定义优惠金额后实际支付金额错误");
+                    throw new BusinessException("餐厅前台优惠后实际支付金额错误");
                 }
-                $couponClassifyDesc = $couponClassify = '自定义优惠金额';
+                $couponClassifyDesc = $couponClassify = '餐厅前台优惠';
             } else if (intval($params['preferential']) < 100 && intval($params['preferential']) >= 50) {
                 if (($params['order_amount_total'] * intval($params['preferential'])) / 100 !== $params['order_amount_pay']) {
                     throw new BusinessException("折扣后实际支付金额错误");
@@ -1245,7 +1243,7 @@ class WholeController extends Curd
                 'coupon_id' => $params['coupon_id'] ?? null,
                 'coupon_value' => $params['order_discount_amount'] ?? '',
                 'coupon_classify' => $couponClassify,
-                'coupon_detail_id' => $couponClassifyDesc,
+                'coupon_detail_id' => [$couponClassifyDesc],
                 'coupon_classify_en' => $params['preferential']
             ];
             return $json;