|
|
@@ -17,9 +17,9 @@ use linslin\yii2\curl;
|
|
|
|
|
|
class OrderSendService extends BaseService
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
public static $baseFile = '\biz\order\classes\OrderSendClass';
|
|
|
-
|
|
|
+
|
|
|
//打单 shish 2019.12.17
|
|
|
public static function printOrder($data)
|
|
|
{
|
|
|
@@ -37,6 +37,7 @@ class OrderSendService extends BaseService
|
|
|
}
|
|
|
$time = time();
|
|
|
OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $printOrderId], ['option' => $option, 'finishTime' => $time]);
|
|
|
+ OrderClass::updateById($id, ['status' => 1]);
|
|
|
|
|
|
//进入发货流程
|
|
|
$deliverId = $actionIdList['deliver'];
|
|
|
@@ -64,6 +65,7 @@ class OrderSendService extends BaseService
|
|
|
}
|
|
|
$time = time();
|
|
|
OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $deliverId], ['option' => $option, 'finishTime' => $time]);
|
|
|
+ OrderClass::updateById($id, ['status' => 2]);
|
|
|
|
|
|
$sendType = isset($data['sendType']) ? $data['sendType'] : 1;
|
|
|
//使用快递
|
|
|
@@ -107,7 +109,8 @@ class OrderSendService extends BaseService
|
|
|
}
|
|
|
$time = time();
|
|
|
OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $reachId], ['option' => $option, 'finishTime' => $time]);
|
|
|
-
|
|
|
+ OrderClass::updateById($id, ['status' => 3]);
|
|
|
+
|
|
|
//进入完成流程
|
|
|
$finishId = $actionIdList['finish'];
|
|
|
$data = ['actionId' => $finishId, 'orderId' => $id, 'finishTime' => $time, 'addTime' => $time, 'inTurn' => $finishId];
|
|
|
@@ -116,7 +119,7 @@ class OrderSendService extends BaseService
|
|
|
$data['actionSign'] = isset($actionList[$finishId]['sign']) ? $actionList[$finishId]['sign'] : '';
|
|
|
util::success(['nextAction' => $data]);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//发货详情 shish 2019.12.15
|
|
|
public static function sendList($order)
|
|
|
{
|
shish