|
|
@@ -8,6 +8,7 @@ use bizGhs\admin\classes\AdminClass;
|
|
|
use bizGhs\express\classes\GhsExpressOrderClass;
|
|
|
use bizHd\order\classes\OrderGoodsClass;
|
|
|
use bizGhs\order\classes\OrderItemClass;
|
|
|
+use bizHd\purchase\classes\PurchaseClass;
|
|
|
use bizHd\saas\classes\StaffClass;
|
|
|
use common\components\dict;
|
|
|
use common\components\imgUtil;
|
|
|
@@ -614,7 +615,6 @@ class IntraCityController extends BaseController
|
|
|
if ($order->mainId != $this->mainId) {
|
|
|
util::fail('不是你的订单');
|
|
|
}
|
|
|
-
|
|
|
if ($order->status != 3) {
|
|
|
util::fail('不能取消');
|
|
|
}
|
|
|
@@ -622,6 +622,11 @@ class IntraCityController extends BaseController
|
|
|
//订单 没叫跑腿、已送达、已取消
|
|
|
util::fail('不能取消哈');
|
|
|
}
|
|
|
+ $cgId = $order->purchaseId ?? 0;
|
|
|
+ $cg = PurchaseClass::getById($cgId, true);
|
|
|
+ if (empty($cg)) {
|
|
|
+ util::fail('没有采购单信息');
|
|
|
+ }
|
|
|
|
|
|
$main = $this->main;
|
|
|
$wxStoreId = $main->wxStoreId ?? '';
|
|
|
@@ -638,6 +643,8 @@ class IntraCityController extends BaseController
|
|
|
// 更新订单状态
|
|
|
$order->sendStatus = 3;
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 3;
|
|
|
+ $cg->save();
|
|
|
|
|
|
$params = ['staffId' => 0, 'staffName' => ''];
|
|
|
OrderClass::cancelOrderSend($order, $params);
|
|
|
@@ -713,6 +720,15 @@ class IntraCityController extends BaseController
|
|
|
noticeUtil::push($errRemind, '15280215347');
|
|
|
return $this->asJson(['return_code' => 1, 'return_msg' => '系统错误3']);
|
|
|
}
|
|
|
+ $cgId = $order->purchaseId ?? 0;
|
|
|
+ $cg = PurchaseClass::getById($cgId, true);
|
|
|
+ if (empty($cg)) {
|
|
|
+ $errRemind = '没有找到采购单,store_order_id: ' . $storeOrderId . ',wx_store_id: ' . $wxStoreId;
|
|
|
+ Yii::error($errRemind, 'intracity');
|
|
|
+ noticeUtil::push($errRemind, '15280215347');
|
|
|
+ return $this->asJson(['return_code' => 1, 'return_msg' => '系统错误4']);
|
|
|
+ }
|
|
|
+
|
|
|
$orderStatus = intval($callbackData['order_status']);
|
|
|
|
|
|
//同个配送单,同个状态的,5秒内不允许重复请求,重要勿删
|
|
|
@@ -730,6 +746,8 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
$order->sendStatus = 0;//已叫跑腿,等跑腿接单
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 0;//已叫跑腿,等跑腿接单
|
|
|
+ $cg->save();
|
|
|
$params = [
|
|
|
'fhType' => 0,
|
|
|
'fhWl' => '',
|
|
|
@@ -748,6 +766,8 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
$order->sendStatus = 1;//跑腿已接单
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 1;//跑腿已接单
|
|
|
+ $cg->save();
|
|
|
}
|
|
|
break;
|
|
|
// 配送员到店
|
|
|
@@ -757,6 +777,8 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
$order->sendStatus = 4;//跑腿到店
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 4;//跑腿到店
|
|
|
+ $cg->save();
|
|
|
}
|
|
|
break;
|
|
|
// 配送中
|
|
|
@@ -766,6 +788,8 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
$order->sendStatus = 5;//跑腿配送中
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 5;//跑腿配送中
|
|
|
+ $cg->save();
|
|
|
}
|
|
|
break;
|
|
|
// 配送完成
|
|
|
@@ -775,6 +799,8 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
$order->sendStatus = 2;//已送达
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 2;//已送达
|
|
|
+ $cg->save();
|
|
|
$params = ['staffId' => 0, 'staffName' => ''];
|
|
|
OrderClass::confirmReach($order, $params);
|
|
|
}
|
|
|
@@ -787,6 +813,8 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
$order->sendStatus = 3;
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 3;
|
|
|
+ $cg->save();
|
|
|
$params = ['staffId' => 0, 'staffName' => ''];
|
|
|
OrderClass::cancelOrderSend($order, $params);
|
|
|
}
|
|
|
@@ -801,6 +829,8 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
$order->sendStatus = 3;
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 3;
|
|
|
+ $cg->save();
|
|
|
$params = ['staffId' => 0, 'staffName' => ''];
|
|
|
OrderClass::cancelOrderSend($order, $params);
|
|
|
}
|
|
|
@@ -820,6 +850,8 @@ class IntraCityController extends BaseController
|
|
|
$eo->save();
|
|
|
$order->sendStatus = 3;
|
|
|
$order->save();
|
|
|
+ $cg->sendStatus = 3;
|
|
|
+ $cg->save();
|
|
|
$params = ['staffId' => 0, 'staffName' => ''];
|
|
|
OrderClass::cancelOrderSend($order, $params);
|
|
|
}
|