合并订单

biz-hd/purchase/classes/PurchaseClass.php

@@ -93,7 +93,7 @@ class PurchaseClass extends BaseClass
                 //新增，如果当天只有一个订单，不需要操作
                 return false;
             }
-            $hasMerge = CgMergeSnClass::getByCondition(['ghsId' => $ghsId, 'mainId' => $mainId, 'mergeDate' => $date], true);
+            $hasMerge = CgMergeSnClass::getByCondition(['ghsId' => $ghsId, 'mergeDate' => $date], true);
             if (!empty($hasMerge)) {
                 $hasMergeId = $hasMerge->id ?? 0;
                 $cg->mergeId = $hasMergeId;
@@ -131,7 +131,7 @@ class PurchaseClass extends BaseClass
                     }
                 }
             }
-            $hasNewMerge = CgMergeSnClass::getByCondition(['ghsId' => $ghsId, 'mainId' => $mainId, 'mergeDate' => $date], true);
+            $hasNewMerge = CgMergeSnClass::getByCondition(['ghsId' => $ghsId, 'mergeDate' => $date], true);
             if (!empty($hasNewMerge)) {
                 $newMergeId = $hasNewMerge->id ?? 0;
                 $cg->mergeId = $newMergeId;