订单通知

biz/message/classes/InformUserClass.php

@@ -13,48 +13,49 @@ use biz\base\classes\BaseClass;
 
 class InformUserClass extends BaseClass
 {
-	
-	public static $baseFile = '\biz\message\models\InformUser';
-	
-	//花送到了通知客户 shish
-	public static function sendComplete($user, $order, $merchant)
-	{
-		$openId = $user['openId'];
-		$merchantId = $merchant['id'];
-		$orderId = $order['id'];
-		$miniOpenId = isset($user['miniOpenId']) ? $user['miniOpenId'] : '';
-		if (isset($user['subscribe']) && $user['subscribe'] == 1) {
-			$allTM = xhTMessageService::getList($merchantId);
-			$shortTempId = 'OPENTM201205968';//订单送达通知
-			$tempId = $allTM[$shortTempId];
-			$url = Yii::$app->params['mallDomain'] . "/#/pages/order/detail?id={$orderId}&account=" . $merchantId;
-			$url = httpUtil::becomeHttps($url);
-			$data = [
-				"touser" => $openId,
-				"template_id" => $tempId,
-				"url" => $url,
-				"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"]
-				]
-			];
-			if (!empty($miniOpenId)) {
-				$data['miniprogram']['appid'] = $merchant['miniAppId'];
-				$data['miniprogram']['pagepath'] = 'pages/order/detail?id=' . $orderId;
-			}
-			wxUtil::sendTaskInform($data, $merchant);
-		} else {
-			if (isset($order['bookMobile']) && !empty($order['bookMobile']) && stringUtil::isMobile($order['bookMobile'])) {
-				$mobile = $order['bookMobile'];
-				$msg = '您的鲜花已送达，感谢惠顾，祝您生活愉快。';
-				sms::send($mobile, $msg, $merchant);
-			}
-		}
-		
-		//通知商家
-	}
-	
+
+    public static $baseFile = '\biz\message\models\InformUser';
+
+    //花送到了通知客户 shish
+    public static function sendComplete($user, $order, $merchant)
+    {
+        $openId = $user['openId'];
+        $merchantId = $merchant['id'];
+        $orderId = $order['id'];
+        $miniOpenId = isset($user['miniOpenId']) ? $user['miniOpenId'] : '';
+        if (isset($user['subscribe']) && $user['subscribe'] == 1) {
+            $allTM = xhTMessageService::getList($merchantId);
+            $shortTempId = 'OPENTM201205968';//订单送达通知
+            $tempId = $allTM[$shortTempId];
+            $url = Yii::$app->params['mallDomain'] . "/#/pages/order/detail?id={$orderId}&account=" . $merchantId;
+            $url = httpUtil::becomeHttps($url);
+            $receiveUserName = isset($order['receiveUserName']) && !empty($order['receiveUserName']) ? $order['receiveUserName'] : '未填写';
+            $data = [
+                "touser" => $openId,
+                "template_id" => $tempId,
+                "url" => $url,
+                "data" => [
+                    "first" => ["value" => '您的订单已送达', "color" => "#173177"],
+                    "keyword1" => ["value" => (string)$order['orderSn'], "color" => "#173177"],
+                    "keyword2" => ["value" => $receiveUserName, "color" => "#173177"],
+                    "keyword3" => ["value" => '已送达', "color" => "#173177"],
+                    "remark" => ["value" => '感谢您的惠顾，祝你生活愉快！', "color" => "#173177"]
+                ]
+            ];
+            if (!empty($miniOpenId)) {
+                $data['miniprogram']['appid'] = $merchant['miniAppId'];
+                $data['miniprogram']['pagepath'] = 'pages/order/detail?id=' . $orderId;
+            }
+            wxUtil::sendTaskInform($data, $merchant);
+        } else {
+            if (isset($order['bookMobile']) && !empty($order['bookMobile']) && stringUtil::isMobile($order['bookMobile'])) {
+                $mobile = $order['bookMobile'];
+                $msg = '您的鲜花已送达，感谢惠顾，祝您生活愉快。';
+                sms::send($mobile, $msg, $merchant);
+            }
+        }
+
+        //通知商家
+    }
+
 }

biz/order/classes/OrderClass.php

@@ -146,14 +146,6 @@ class OrderClass extends BaseClass
     {
         $id = $order['id'];
         self::updateById($id, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'currentFlow' => 4]);
-        $userId = $order['userId'];
-        $user = UserClass::getById($userId);
-        $merchantId = $order['merchantId'];
-        $merchant = MerchantClass::getById($merchantId);
-        //完成通知客户
-        InformUserClass::sendComplete($user, $order, $merchant);
-        //完成通知管理员
-        InformAdminClass::sendComplete($order, $merchant);
     }
 
     //转化出送到时间 shish 2020.3.15

biz/order/classes/OrderSendClass.php

@@ -3,7 +3,11 @@
 namespace biz\order\classes;
 
 use biz\merchant\classes\MerchantAssetClass;
+use biz\merchant\classes\MerchantClass;
+use biz\message\classes\InformAdminClass;
+use biz\message\classes\InformUserClass;
 use biz\message\services\InformAdminService;
+use biz\user\classes\UserClass;
 use common\components\stringUtil;
 use common\components\util;
 use common\services\xhOrderDayNumService;
@@ -93,17 +97,14 @@ class OrderSendClass extends BaseClass
         $reachId = $actionIdList['reach'];
         OrderSendClass::updateByCondition(['orderId' => $id, 'actionId' => $reachId], ['option' => $option, 'finishTime' => $time]);
 
-        //送达通知管理员
-        $params = [
-            'order' => $order,
-        ];
-        $type = 'reach';
-        //这里的service需要往class移，后期优化
-        $shopId = $order['shopId'];
-        InformAdminService::addInform($shopId, $type, $params);
-
-        //送达通知客户，暂时只通知关注了公众号的客户
-
+        $userId = $order['userId'];
+        $user = UserClass::getById($userId);
+        $merchantId = $order['merchantId'];
+        $merchant = MerchantClass::getById($merchantId);
+        //完成通知客户
+        InformUserClass::sendComplete($user, $order, $merchant);
+        //完成通知管理员
+        InformAdminClass::sendComplete($order, $merchant);
     }
 
 }