订单优化

biz/order/classes/OrderClass.php

@@ -10,9 +10,9 @@ use biz\base\classes\BaseClass;
 
 class OrderClass extends BaseClass
 {
-
+	
 	public static $baseFile = '\biz\order\models\Order';
-
+	
 	//已退款
 	const ORDER_STATUS_REFUND = 6;
 	//完成
@@ -29,7 +29,10 @@ class OrderClass extends BaseClass
 	const ORDER_STATUS_UN_PAY = 0;
 	//订单总流程数
 	const ORDER_TOTAL_FLOW = 5;
-
+	
+	//送达时间段
+	public static $reachPeriod = [0 => '上午', 1 => '下午', 2 => '晚上'];
+	
 	//添加订单 shish 2019.12.5
 	public static function addOrder($data)
 	{
@@ -120,5 +123,19 @@ class OrderClass extends BaseClass
 	{
 		self::updateById($id, ['status' => self::ORDER_STATUS_COMPLETE]);
 	}
-	
+
+	//转化出送到时间 shish 2020.3.15
+	public static function getReachTime($order)
+	{
+		$reachTime = '';
+		if (isset($order['reachDate']) && !empty($order['reachDate'])) {
+			$prev = date("n-j", strtotime($order['reachDate']));
+			$periodData = self::$reachPeriod;
+			$periodKey = $order['reachPeriod'];
+			$period = isset($periodData[$periodKey]) ? $periodData[$periodKey] : '上午';
+			$reachTime = $prev . ' ' . $period;
+		}
+		return $reachTime;
+	}
+
 }

biz/order/services/OrderService.php

@@ -55,14 +55,14 @@ class OrderService extends BaseService
 			$id = $val['id'];
 			$userId = $val['userId'];
 			$data['list'][$key]['goodsInfoList'] = isset($goodsList[$id]) ? $goodsList[$id] : [];
-			//订花人头像
 			$data['list'][$key]['bookAvatar'] = isset($userInfoList[$userId]['smallAvatarUrl']) ? $userInfoList[$userId]['smallAvatarUrl'] : '';
 			$merchantId = $val['merchantId'];
 			$data['list'][$key]['merchantName'] = isset($merchantList[$merchantId]['merchantName']) ? $merchantList[$merchantId]['merchantName'] : '';
+			$data['list'][$key]['reachTime'] = OrderClass::getReachTime($val);
 		}
 		return $data;
 	}
-
+	
 	//取客户最近若干条订单 shish 2019.11.30
 	public static function getUserOrder($userId, $limit = 10, $order = null, $with = null)
 	{

console/controllers/UpgradeController.php

@@ -1242,8 +1242,11 @@ UPDATE `xhMerchantExtend` SET `freeDistance`=5;";
 		$sql = "ALTER TABLE `xhUser` ADD hasPayPwd TINYINT NOT NULL DEFAULT 0 COMMENT '0 没有支付密码 1有' AFTER `payPassword`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
+		$sql = "ALTER TABLE `xhOrder` ADD inform TINYINT NOT NULL DEFAULT 0 COMMENT '通知 0待通知 1通知成功 2通知失败' AFTER `sendStatus`;";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+
 	}
-	
+
 	//数据迁移 shish 2020.1.12
 	//./yii upgrade/sync
 	public function actionSync()