合并订单

biz-ghs/order/classes/OrderClass.php

@@ -1387,10 +1387,20 @@ class OrderClass extends BaseClass
 
                 //同个人同地址当天订单数
                 $sameTimeIds = $val['sameTimeIds'] ?? '';
-                $sameNum = 0;
                 if (!empty($sameTimeIds)) {
                     $sameIds = explode(',', $sameTimeIds);
                     $sameNum = count($sameIds);
+                } 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;
+                        }
+                    }
                 }
                 $data['list'][$key]['sameTimeIdsNum'] = $sameNum;