|
|
@@ -207,14 +207,14 @@ class PurchaseClass extends BaseClass
|
|
|
public static function debt($info)
|
|
|
{
|
|
|
$payWay = dict::getDict('payWay', 'debtPay');
|
|
|
- self::complete($info, $payWay);
|
|
|
+ self::payAfter($info, $payWay);
|
|
|
}
|
|
|
|
|
|
//余额支付 ssh 2021.1.24
|
|
|
public static function balancePay($info)
|
|
|
{
|
|
|
$payWay = dict::getDict('payWay', 'balancePay');
|
|
|
- self::complete($info, $payWay);
|
|
|
+ self::payAfter($info, $payWay);
|
|
|
}
|
|
|
|
|
|
//检查采购单
|
|
|
@@ -233,7 +233,7 @@ class PurchaseClass extends BaseClass
|
|
|
public static function staffKdPay($info)
|
|
|
{
|
|
|
$payWay = $info->payWay;
|
|
|
- self::complete($info, $payWay);
|
|
|
+ self::payAfter($info, $payWay);
|
|
|
}
|
|
|
|
|
|
//采购订单支付成功后回调处理流程
|
|
|
@@ -250,11 +250,11 @@ class PurchaseClass extends BaseClass
|
|
|
Yii::info($msg);
|
|
|
util::fail($msg);
|
|
|
}
|
|
|
- self::complete($info, $payWay);
|
|
|
+ self::payAfter($info, $payWay);
|
|
|
}
|
|
|
|
|
|
//第三方支付、余额支付和欠款支付后调用的流程 shish 2021.4.27
|
|
|
- public static function complete($info, $payWay)
|
|
|
+ public static function payAfter($info, $payWay)
|
|
|
{
|
|
|
if (empty($info)) {
|
|
|
util::fail('没有找到订单');
|
|
|
@@ -314,6 +314,7 @@ class PurchaseClass extends BaseClass
|
|
|
$ghsOrder->status = OrderClass::ORDER_STATUS_UN_SEND;
|
|
|
$ghsOrder->debt = OrderClass::DEBT_YES;
|
|
|
$ghsOrder->save();
|
|
|
+
|
|
|
/**供货商门店资产变化**/
|
|
|
$shopId = $ghsOrder->shopId;
|
|
|
$actPrice = $ghsOrder->actPrice;
|
|
|
@@ -326,6 +327,13 @@ class PurchaseClass extends BaseClass
|
|
|
$shop->unPayOrder -= 1;
|
|
|
$shop->unSendOrder += 1;
|
|
|
$shop->save();
|
|
|
+
|
|
|
+ /**增加供货商已下单流程**/
|
|
|
+ $time = date("Y-m-d H:i:s");
|
|
|
+ $currentOrderSn = $ghsOrder->orderSn;
|
|
|
+ $placeData = ['payTime' => $time, 'orderSn' => $currentOrderSn, 'orderId' => $saleId];
|
|
|
+ OrderSendClass::placeOrder($placeData);
|
|
|
+
|
|
|
//自取订单,订单直接完成,【现在有三个地方有订单完成操作】,找不到请搜索【】内关键词。
|
|
|
if (isset($ghsOrder->sendType) && $ghsOrder->sendType == OrderClass::SEND_TYPE_NO) {
|
|
|
OrderClass::withoutSend($ghsOrder->attributes);
|