shish 6 rokov pred
rodič
commit
4c6ae433ac

+ 0 - 1
app/business/controllers/OrderController.php

@@ -6,7 +6,6 @@ use biz\merchant\services\MerchantAssetService;
 use biz\merchant\services\MerchantExtendService;
 use biz\merchant\services\MerchantService;
 use biz\merchant\services\ShopService;
-use biz\order\classes\OrderClass;
 use biz\order\classes\OrderSendClass;
 use biz\order\services\OrderService;
 use biz\saas\services\RegionService;

+ 2 - 2
app/business/controllers/OrderSendController.php

@@ -42,7 +42,7 @@ class OrderSendController extends BaseController
 		$post['merchantId'] = $this->merchantId;
 		OrderSendService::deliver($post);
 	}
-
+	
 	//送达 shish 2019.12.17
 	public function actionReach()
 	{
@@ -51,7 +51,7 @@ class OrderSendController extends BaseController
 		$option = isset($post['option']) ? $post['option'] : 0;
 		$order = OrderService::getById($id);
 		OrderService::valid($order, $this->merchantId);
-		OrderSendService::reach(['id' => $id, 'option' => $option]);
+		OrderSendService::reach($order, ['option' => $option]);
 	}
 	
 	//向快递公司发起配送需求

+ 36 - 0
biz/message/classes/InformUserClass.php

@@ -2,10 +2,46 @@
 
 namespace biz\message\classes;
 
+use biz\merchant\classes\MerchantClass;
+use common\components\sms;
+use common\components\wxUtil;
+use common\services\xhTMessageService;
 use Yii;
 use biz\base\classes\BaseClass;
 
 class InformUserClass extends BaseClass
 {
+	
 	public static $baseFile = '\biz\message\models\InformUser';
+	
+	//花送到了通知客户 shish
+	public static function sendComplete($user, $order)
+	{
+		//通知客户
+		$openId = $user['openId'];
+		$merchantId = $user['merchantId'];
+		$merchant = MerchantClass::getById($merchantId);
+		if (isset($user['subscribe']) && $user['subscribe'] == 1) {
+			$allTM = xhTMessageService::getList($merchantId);
+			$shortTempId = 'OPENTM201205968';//订单送达通知
+			$tempId = $allTM[$shortTempId];
+			$data = ["touser" => $openId, "template_id" => $tempId,
+				"url" => Yii::$app->params['mHost'] . "/#/pages/order/detail?id=" . $order['id'],
+				"data" => [
+					"first" => ["value" => '您的订单已送达', "color" => "#173177"],
+					"keyword1" => ["value" => (string)$order['orderSn'], "color" => "#173177"],
+					"keyword2" => ["value" => $order['receiveUserName'], "color" => "#173177"],
+					"keyword3" => ["value" => '已送达', "color" => "#173177"],
+					"remark" => ["value" => '感谢您惠顾,祝你生活愉快!', "color" => "#173177"]]];
+			wxUtil::sendTaskInform($data, $merchant);
+			return true;
+		}
+		
+		if (isset($user['mobile']) && !empty($user['mobile'])) {
+			$mobile = $user['mobile'];
+			$msg = '您的鲜花已送达,感谢惠顾,祝您生活愉快。';
+			sms::send($mobile, $msg, $merchant);
+		}
+	}
+	
 }

+ 11 - 5
biz/order/classes/OrderClass.php

@@ -2,7 +2,9 @@
 
 namespace biz\order\classes;
 
+use biz\message\classes\InformUserClass;
 use biz\stat\classes\StatOrderCountClass;
+use biz\user\classes\UserClass;
 use common\components\stringUtil;
 use common\services\xhOrderDayNumService;
 use common\services\xhOrderMonthNumService;
@@ -30,7 +32,7 @@ class OrderClass extends BaseClass
 	const ORDER_STATUS_UN_PAY = 0;
 	//订单总流程数
 	const ORDER_TOTAL_FLOW = 5;
-
+	
 	//未确认配送方式
 	const SEND_TYPE_UNKNOWN = 0;
 	//自取
@@ -52,7 +54,7 @@ class OrderClass extends BaseClass
 		$data['payStatus'] = 0;
 		$data['createTime'] = $date;
 		$data['addTime'] = time();
-
+		
 		$month = date("Ym");
 		$riseNum = StatOrderCountClass::addOrder($month, $merchantId);
 		//将花店每月的总订单数作为编号
@@ -125,9 +127,13 @@ class OrderClass extends BaseClass
 	}
 	
 	//订单完成 shish 2020.3.12
-	public static function complete($id)
+	public static function complete($order)
 	{
-		self::updateById($id, ['status' => self::ORDER_STATUS_COMPLETE]);
+		$id = $order['id'];
+		self::updateById($id, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'currentFlow' => 4]);
+		$userId = $order['userId'];
+		$user = UserClass::getById($userId);
+		InformUserClass::sendComplete($user,$order);
 	}
 	
 	//转化出送到时间 shish 2020.3.15
@@ -143,5 +149,5 @@ class OrderClass extends BaseClass
 		}
 		return $reachTime;
 	}
-	
+
 }

+ 5 - 5
biz/order/services/OrderSendService.php

@@ -41,7 +41,7 @@ class OrderSendService extends BaseService
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $printOrderId], ['option' => $option, 'finishTime' => $time]);
 		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'currentFlow' => 2, 'printStatus' => 1]);
-
+		
 		//进入发货流程
 		$deliverId = $actionIdList['deliver'];
 		$data = ['actionId' => $deliverId, 'orderId' => $id, 'finishTime' => 0, 'addTime' => $time, 'inTurn' => $deliverId];
@@ -101,9 +101,9 @@ class OrderSendService extends BaseService
 	}
 	
 	//送达 shish 2019.12.17
-	public static function reach($data)
+	public static function reach($order, $data)
 	{
-		$id = $data['id'];
+		$id = $order['id'];
 		$option = $data['option'];
 		$actionIdList = OrderSendClass::$actionId;
 		$reachId = $actionIdList['reach'];
@@ -117,8 +117,8 @@ class OrderSendService extends BaseService
 		}
 		$time = time();
 		OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $reachId], ['option' => $option, 'finishTime' => $time]);
-		OrderClass::updateById($id, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'currentFlow' => 4]);
-		
+		OrderClass::complete($order);
+
 		util::complete();
 	}