合并

app/admin/controller/order/WholeController.php

@@ -1762,9 +1762,9 @@ class WholeController extends Curd
             $couponUseJson = [];
             if (!empty($params['join_order_member_id']) && !empty($params['preferential'])) {
                 $couponResult = OrderService::payUseCoupon($params['join_order_member_id'], $params['goodsContentList'], $params['preferential'], $params['order_amount_total']);
-                if (!empty($couponResult['pay_amount']) && $couponResult['pay_amount'] != $params['order_amount_pay']) {
-                    throw new BusinessException("计算优惠后，实付金额错误！");
-                }
+//                if (!empty($couponResult['pay_amount']) && $couponResult['pay_amount'] != $params['order_amount_pay']) {
+//                    throw new BusinessException("计算优惠后，实付金额错误！");
+//                }
                 // 组装优惠券使用数据，存主表优惠里
                 $couponUseJson = $couponResult['use_coupon_json'];
             }

app/admin/service/order/OrderService.php

@@ -447,7 +447,6 @@ class OrderService
                     return [];
                 }
             }
-            dump("跳过foreach");
             $amountBalance = [
                 'pay_amount' => $payAmount,
                 'welfare_balance' => 0,