配送

biz/order/classes/OrderClass.php

@@ -30,6 +30,15 @@ class OrderClass extends BaseClass
 	const ORDER_STATUS_UN_PAY = 0;
 	//订单总流程数
 	const ORDER_TOTAL_FLOW = 5;
+
+	//未确认配送方式
+	const SEND_TYPE_UNKNOWN = 0;
+	//自取
+	const SEND_TYPE_NO = 1;
+	//自己送
+	const SEND_TYPE_MYSELF = 2;
+	//代送
+	const SEND_TYPE_OTHER = 3;
 	
 	//送达时间段
 	public static $reachPeriod = [0 => '上午', 1 => '下午', 2 => '晚上'];

biz/order/services/OrderSendService.php

@@ -40,7 +40,7 @@ class OrderSendService extends BaseService
 		}
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $printOrderId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => 1, 'currentFlow' => 2]);
+		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'currentFlow' => 2]);
 		
 		//进入发货流程
 		$deliverId = $actionIdList['deliver'];
@@ -64,17 +64,16 @@ class OrderSendService extends BaseService
 		}
 		$time = time();
 		
-		$sendType = isset($data['sendType']) ? $data['sendType'] : 1;
+		$sendType = isset($data['sendType']) ? $data['sendType'] : OrderClass::SEND_TYPE_UNKNOWN;
 		
-		//1 自己送 2代送
-		if ($sendType == 2) {
+		if ($sendType == OrderClass::SEND_TYPE_OTHER) {
 			$side = $data['sendSide'];
 			$sendTime = strtotime(date("Y-m-d") . ' ' . $data['sendTime']);
 			if ($sendTime < ($time + 30 * 60)) {
 				util::fail('请选择30分钟之后的时间');
 			}
 			$sendInfo = [
-				'side' => $side,
+				'sideId' => $side,
 				'sendTime' => $sendTime,
 				'addTime' => $time,
 				'sendTip' => 0,
@@ -90,7 +89,7 @@ class OrderSendService extends BaseService
 		}
 		
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $deliverId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => 2, 'currentFlow' => 3, 'sendType' => $sendType]);
+		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_SENDING, 'currentFlow' => 3, 'sendType' => $sendType]);
 		
 		//进入送达流程
 		$reachId = $actionIdList['reach'];
@@ -118,7 +117,7 @@ class OrderSendService extends BaseService
 		}
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $reachId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => 5, 'currentFlow' => 4]);
+		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'currentFlow' => 4]);
 		
 		util::complete();
 	}
@@ -144,7 +143,7 @@ class OrderSendService extends BaseService
 				}
 			}
 			if ($actionId == $idList['deliver']) {
-				$list[$key]['sendInfo'] = $order['sendType'] == 3 ? OrderExpressClass::getExpress($orderId) : [];
+				$list[$key]['sendInfo'] = $order['sendType'] == OrderClass::SEND_TYPE_OTHER ? OrderExpressClass::getExpress($orderId) : [];
 			}
 			if ($actionId == $idList['finish']) {
 				$list[$key]['classify'] = [];