合并

app/admin/controller/order/WholeController.php

@@ -1762,7 +1762,7 @@ 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 ($couponResult['pay_amount'] != $params['order_amount_pay']) {
+                if (!empty($couponResult['pay_amount']) && $couponResult['pay_amount'] != $params['order_amount_pay']) {
                     throw new BusinessException("计算优惠后，实付金额错误！");
                 }
                 // 组装优惠券使用数据，存主表优惠里