|
|
@@ -278,6 +278,15 @@ class OrderService extends BaseService
|
|
|
PurchaseService::payAfter($purchase, $payWay);
|
|
|
self::payAfter($returnOrder, $payWay);
|
|
|
|
|
|
+ //开历史订单
|
|
|
+ $orderDate = $data['orderDate'] ?? '';
|
|
|
+ if (!empty($orderDate)) {
|
|
|
+ $purchase->payTime = $orderDate . ' 12:00:00';
|
|
|
+ $purchase->save();
|
|
|
+ $returnOrder->payTime = $orderDate . ' 12:00:00';
|
|
|
+ $returnOrder->save();
|
|
|
+ }
|
|
|
+
|
|
|
//不是预订单,并且采购人没有开批发店,供货商不是源花汇、小明鲜花、淄博花超、石头花艺,则订单直接完成掉。是预订单,则确认发货时直接完成掉。有多个地方要修改,请搜索关键词zjFinish
|
|
|
if (isset($returnOrder->book) && $returnOrder->book == 0) {
|
|
|
$ghsShopId = $ghs['shopId'] ?? 0;
|