Ver código fonte

Merge branch 'zhongqi-optimize' into dev

shish 3 meses atrás
pai
commit
c7ebe0afda
1 arquivos alterados com 1 adições e 1 exclusões
  1. 1 1
      app-hd/controllers/OrderController.php

+ 1 - 1
app-hd/controllers/OrderController.php

@@ -730,6 +730,7 @@ class OrderController extends BaseController
             //解决重复提交
             //解决重复提交
             util::checkRepeatCommit($this->adminId . '_' . $dealPrice, 3);
             util::checkRepeatCommit($this->adminId . '_' . $dealPrice, 3);
 
 
+            $totalNum = 0;
             if ($dealPrice == 0) {
             if ($dealPrice == 0) {
                 $productIds = [];
                 $productIds = [];
                 $hsIds = [];
                 $hsIds = [];
@@ -754,7 +755,6 @@ class OrderController extends BaseController
                 $priceMap = \bizGhs\custom\classes\CustomClass::$levelPriceKeyMap;
                 $priceMap = \bizGhs\custom\classes\CustomClass::$levelPriceKeyMap;
                 $addPriceMap = \bizGhs\custom\classes\CustomClass::$levelAddPriceKeyMap;
                 $addPriceMap = \bizGhs\custom\classes\CustomClass::$levelAddPriceKeyMap;
                 $level = 0;
                 $level = 0;
-                $totalNum = 0;
                 foreach ($productList as $currentProduct) {
                 foreach ($productList as $currentProduct) {
                     $property = $currentProduct['property'] ?? 0;
                     $property = $currentProduct['property'] ?? 0;
                     $currentPrice = $currentProduct['unitPrice'] ?? 0;
                     $currentPrice = $currentProduct['unitPrice'] ?? 0;