shish il y a 4 ans
Parent
commit
247fc5df33
1 fichiers modifiés avec 3 ajouts et 2 suppressions
  1. 3 2
      biz-hd/order/services/OrderService.php

+ 3 - 2
biz-hd/order/services/OrderService.php

@@ -249,8 +249,6 @@ class OrderService extends BaseService
         $data['prePrice'] = $totalPrice;
         $data['prePrice'] = $totalPrice;
         $data['orderPrice'] = $modifyPrice;
         $data['orderPrice'] = $modifyPrice;
 
 
-        $data['cash'] = 0;
-        $data['mainPay'] = $modifyPrice;
         if (isset($data['cash']) && is_numeric($data['cash']) && $data['cash'] > 0) {
         if (isset($data['cash']) && is_numeric($data['cash']) && $data['cash'] > 0) {
             $cashAmount = $data['cash'] ?? 0;
             $cashAmount = $data['cash'] ?? 0;
             //现金付款如果大于订单金额,则切换成现金付款模式
             //现金付款如果大于订单金额,则切换成现金付款模式
@@ -264,6 +262,9 @@ class OrderService extends BaseService
                 $data['cash'] = $cashAmount;
                 $data['cash'] = $cashAmount;
                 $data['mainPay'] = bcsub($modifyPrice, $cashAmount, 2);
                 $data['mainPay'] = bcsub($modifyPrice, $cashAmount, 2);
             }
             }
+        } else {
+            $data['cash'] = 0;
+            $data['mainPay'] = $modifyPrice;
         }
         }
 
 
         //如果有订金
         //如果有订金