|
|
@@ -13,6 +13,7 @@ use biz\wx\classes\WxMessageClass;
|
|
|
use bizGhs\base\services\BaseService;
|
|
|
use bizGhs\book\classes\BookItemClass;
|
|
|
use bizGhs\custom\classes\CustomClass;
|
|
|
+use bizGhs\custom\classes\CustomDebtChangeClass;
|
|
|
use bizGhs\order\classes\OrderClass;
|
|
|
use bizGhs\order\classes\OrderExpressClass;
|
|
|
use bizGhs\order\classes\OrderItemClass;
|
|
|
@@ -134,7 +135,7 @@ class OrderService extends BaseService
|
|
|
if (!empty($cg) && !empty($order)) {
|
|
|
$ghsShopId = $order->shopId ?? 0;
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
- $specialList = [10649, 8042, 16454, 21319,33668];
|
|
|
+ $specialList = [10649, 8042, 16454, 21319, 33668];
|
|
|
} else {
|
|
|
$specialList = [36523];
|
|
|
}
|
|
|
@@ -304,17 +305,20 @@ class OrderService extends BaseService
|
|
|
//开历史订单
|
|
|
$historyDate = $data['historyDate'] ?? '';
|
|
|
if (!empty($historyDate)) {
|
|
|
- $purchase->payTime = $historyDate . ' 12:00:00';
|
|
|
+ $currentPayTime = $historyDate . ' 12:00:00';
|
|
|
+ $purchase->payTime = $currentPayTime;
|
|
|
$purchase->save();
|
|
|
- $returnOrder->payTime = $historyDate . ' 12:00:00';
|
|
|
+ $returnOrder->payTime = $currentPayTime;
|
|
|
$returnOrder->save();
|
|
|
+ //有修改账单日期需要更新到欠款变动明细,财务好对账
|
|
|
+ CustomDebtChangeClass::updateByCondition(['capitalType' => 10, 'relateId' => $returnOrder->id], ['payTime' => $currentPayTime]);
|
|
|
}
|
|
|
|
|
|
//不是预订单,并且采购人没有开批发店,供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏,则订单直接完成掉。是预订单,则确认发货时直接完成掉。有多个地方要修改,请搜索关键词zjFinish
|
|
|
if (isset($returnOrder->book) && $returnOrder->book == 0) {
|
|
|
$ghsShopId = $ghs['shopId'] ?? 0;
|
|
|
if (getenv('YII_ENV') == 'production') {
|
|
|
- $specialList = [10649, 8042, 16454, 21319,33668];
|
|
|
+ $specialList = [10649, 8042, 16454, 21319, 33668];
|
|
|
} else {
|
|
|
$specialList = [36523];
|
|
|
}
|