|
@@ -612,31 +612,33 @@ class IntraCityController extends BaseController
|
|
|
$orderStatus = intval($callbackData['order_status']);
|
|
$orderStatus = intval($callbackData['order_status']);
|
|
|
switch ($orderStatus) {
|
|
switch ($orderStatus) {
|
|
|
case IntraCityExpress::ORDER_STATUS_CREATED: // 订单创建成功
|
|
case IntraCityExpress::ORDER_STATUS_CREATED: // 订单创建成功
|
|
|
|
|
+ $eo->order_status = 1;
|
|
|
$eo->status = 1;
|
|
$eo->status = 1;
|
|
|
break;
|
|
break;
|
|
|
case IntraCityExpress::ORDER_STATUS_CANCELED_BY_MERCHANT: // 商家取消订单
|
|
case IntraCityExpress::ORDER_STATUS_CANCELED_BY_MERCHANT: // 商家取消订单
|
|
|
- $eo->status = 2;
|
|
|
|
|
|
|
+ $eo->order_status = 2;
|
|
|
break;
|
|
break;
|
|
|
case IntraCityExpress::ORDER_STATUS_CANCELED_BY_DELIVERY: // 配送方取消订单
|
|
case IntraCityExpress::ORDER_STATUS_CANCELED_BY_DELIVERY: // 配送方取消订单
|
|
|
- $eo->status = 2;
|
|
|
|
|
|
|
+ $eo->order_status = 3;
|
|
|
break;
|
|
break;
|
|
|
case IntraCityExpress::ORDER_STATUS_ACCEPTED: // 配送员接单
|
|
case IntraCityExpress::ORDER_STATUS_ACCEPTED: // 配送员接单
|
|
|
- $eo->status = 3;
|
|
|
|
|
|
|
+ $eo->order_status = 4;
|
|
|
break;
|
|
break;
|
|
|
case IntraCityExpress::ORDER_STATUS_ARRIVED: // 配送员到店
|
|
case IntraCityExpress::ORDER_STATUS_ARRIVED: // 配送员到店
|
|
|
- $eo->status = 4;
|
|
|
|
|
|
|
+ $eo->order_status = 5;
|
|
|
break;
|
|
break;
|
|
|
case IntraCityExpress::ORDER_STATUS_DELIVERING: // 配送中
|
|
case IntraCityExpress::ORDER_STATUS_DELIVERING: // 配送中
|
|
|
- $eo->status = 5;
|
|
|
|
|
|
|
+ $eo->order_status = 6;
|
|
|
break;
|
|
break;
|
|
|
case IntraCityExpress::ORDER_STATUS_WITHDRAWN: // 配送员撤单
|
|
case IntraCityExpress::ORDER_STATUS_WITHDRAWN: // 配送员撤单
|
|
|
- $eo->status = 6;
|
|
|
|
|
|
|
+ $eo->order_status = 7;
|
|
|
break;
|
|
break;
|
|
|
case IntraCityExpress::ORDER_STATUS_COMPLETED: // 配送完成
|
|
case IntraCityExpress::ORDER_STATUS_COMPLETED: // 配送完成
|
|
|
- $eo->status = 7;
|
|
|
|
|
|
|
+ $eo->order_status = 8;
|
|
|
|
|
+ $eo->status = 2;
|
|
|
break;
|
|
break;
|
|
|
case IntraCityExpress::ORDER_STATUS_EXCEPTION: // 配送异常
|
|
case IntraCityExpress::ORDER_STATUS_EXCEPTION: // 配送异常
|
|
|
- $eo->status = 9;
|
|
|
|
|
|
|
+ $eo->order_status = 9;
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
$re = $eo->save();
|
|
$re = $eo->save();
|