소스 검색

自动完成与通知

shish 5 년 전
부모
커밋
e6e5748708
3개의 변경된 파일19개의 추가작업 그리고 8개의 파일을 삭제
  1. 6 3
      biz-ghs/order/services/OrderService.php
  2. 5 1
      biz-hd/purchase/classes/PurchaseClass.php
  3. 8 4
      console/controllers/OrderController.php

+ 6 - 3
biz-ghs/order/services/OrderService.php

@@ -177,9 +177,12 @@ class OrderService extends BaseService
 
         OrderSendClass::reach($order);
 
-        //模板消息通知
-        WxMessageClass::reachInform($shop, $order);
-
+        //自动完成订单时不需要通知
+        $noNeedWxNotice = isset(Yii::$app->params['noNeedWxNotice']) ? Yii::$app->params['noNeedWxNotice'] : 0;
+        if ($noNeedWxNotice == 0) {
+            //微信通知
+            WxMessageClass::reachInform($shop, $order);
+        }
     }
 
     //订单完成

+ 5 - 1
biz-hd/purchase/classes/PurchaseClass.php

@@ -353,7 +353,11 @@ class PurchaseClass extends BaseClass
         $shop->cgSending += 1;
         $shop->save();
 
-        WxMessageClass::cgOrderHasSend($shop, $purchase);
+        //自动完成订单时不需要通知
+        $noNeedWxNotice = isset(Yii::$app->params['noNeedWxNotice']) ? Yii::$app->params['noNeedWxNotice'] : 0;
+        if ($noNeedWxNotice == 0) {
+            WxMessageClass::cgOrderHasSend($shop, $purchase);
+        }
 
     }
 

+ 8 - 4
console/controllers/OrderController.php

@@ -28,11 +28,15 @@ class OrderController extends Controller
         $query->where(['status' => OrderClass::ORDER_STATUS_UN_SEND])->andWhere(['<=', 'addTime', $date]);
         $query->orderBy('deadline ASC');
 
+        //注意哪个平台的行为,低层很多方法会使用到
         Yii::$app->params['ptStyle'] = dict::getDict('ptStyle', 'ghs');
 
         //如果有报错,抛出异常
         Yii::$app->params['errorReport'] = 1;
 
+        //24小时后的自动确认,不需要微信通过
+        Yii::$app->params['noNeedWxNotice'] = 1;
+
         foreach ($query->batch() as $orderInfoList) {
 
             foreach ($orderInfoList as $orderInfo) {
@@ -45,11 +49,11 @@ class OrderController extends Controller
 
                 $prefix = "订单{$orderSn},ID{$id},创建于{$addTime},状态是{$status}";
                 if ($status != OrderClass::ORDER_STATUS_UN_SEND) {
-                    noticeUtil::push($prefix . " 自动确认完成操作时,状态不对", '15280215347');
+                    noticeUtil::push($prefix . " 自动完成操作时,状态不对", '15280215347');
                     continue;
                 }
                 if (empty($addTime) && $addTime > $date) {
-                    noticeUtil::push($prefix . " 自动确认完成操作时,时间不对", '15280215347');
+                    noticeUtil::push($prefix . " 自动完成操作时,时间不对", '15280215347');
                     continue;
                 }
                 try {
@@ -58,11 +62,11 @@ class OrderController extends Controller
                     $hasSendOrder = OrderClass::getById($id, true);
                     OrderService::reach($hasSendOrder);
                     $transaction->commit();
-                    noticeUtil::push($prefix . " 【自动确认完成】 SUCCESS", '15280215347');
+                    noticeUtil::push($prefix . " 【自动完成】 SUCCESS", '15280215347');
                 } catch (\Exception $e) {
                     $transaction->rollBack();
                     $msg = $e->getMessage();
-                    noticeUtil::push("销售单自动确认完成报错了!订单号:{$orderSn},错误信息:{$msg}", '15280215347');
+                    noticeUtil::push("销售单自动完成报错了!订单号:{$orderSn},错误信息:{$msg}", '15280215347');
                 }
             }
         }