多单

biz-ghs/order/classes/OrderClass.php

@@ -1386,20 +1386,20 @@ class OrderClass extends BaseClass
             foreach ($data['list'] as $key => $val) {
 
                 //同个人同地址当天订单数
-                $sameTimeIds = $val['sameTimeIds'] ?? '';
-                if (!empty($sameTimeIds)) {
-                    $sameIds = explode(',', $sameTimeIds);
-                    $sameNum = count($sameIds);
+                $sameNum = $val['mergeNum'];
+                if ($sameNum > 0) {
+                    $mergeId = $val['mergeId'] ?? 0;
+                    if (!empty($mergeId)) {
+                        $mergeList = OrderMergeClass::getAllByCondition(['mergeId' => $mergeId], null, 'orderId');
+                        $ids = array_column($mergeList, 'orderId');
+                        $sameTimeIds = implode(',', $ids);
+                        $data['list'][$key]['sameTimeIds'] = $sameTimeIds;
+                    }
                 } else {
-                    $sameNum = $val['mergeNum'];
-                    if ($sameNum > 0) {
-                        $mergeId = $val['mergeId'] ?? 0;
-                        if (!empty($mergeId)) {
-                            $mergeList = OrderMergeClass::getAllByCondition(['mergeId' => $mergeId], null, 'orderId');
-                            $ids = array_column($mergeList, 'orderId');
-                            $sameTimeIds = implode(',', $ids);
-                            $data['list'][$key]['sameTimeIds'] = $sameTimeIds;
-                        }
+                    $sameTimeIds = $val['sameTimeIds'] ?? '';
+                    if (!empty($sameTimeIds)) {
+                        $sameIds = explode(',', $sameTimeIds);
+                        $sameNum = count($sameIds);
                     }
                 }
                 $data['list'][$key]['sameTimeIdsNum'] = $sameNum;