shish 2 lat temu
rodzic
commit
52abc439c2
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      biz-ghs/order/classes/OrderClass.php

+ 2 - 2
biz-ghs/order/classes/OrderClass.php

@@ -2041,7 +2041,7 @@ class OrderClass extends BaseClass
         }
         $sameNum = count($sameIds);
         if ($all == 1 && $sameNum > 1) {
-            $orderList = OrderClass::getAllByCondition(['id' => ['in', $sameIds]], 'id asc', '*');
+            $orderList = OrderClass::getAllByCondition(['id' => ['in', $sameIds]], null, '*');
             if (empty($orderList)) {
                 return ['imgFile' => ''];
             }
@@ -2054,7 +2054,7 @@ class OrderClass extends BaseClass
                 $remainDebtPrice = bcadd($currentOrder['remainDebtPrice'], $remainDebtPrice, 2);
                 $actPrice = bcadd($currentOrder['actPrice'], $actPrice, 2);
                 $tkPrice = bcadd($tkPrice, $currentOrder['tkPrice'], 2);
-                $itemData = OrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null);
+                $itemData = OrderItemClass::getAllByCondition(['orderSn' => $orderSn], 'id asc', '*', null);
                 if (!empty($itemData)) {
                     foreach ($itemData as $singleItem) {
                         $productId = $singleItem['productId'] ?? 0;