shish 7 сар өмнө
parent
commit
351804cb20

+ 24 - 19
app-mall/controllers/NoticeController.php

@@ -4,6 +4,7 @@ namespace mall\controllers;
 
 use biz\shop\classes\ShopClass;
 use biz\wx\classes\WxMessageClass;
+use bizHd\express\classes\HdDeliveryOrderClass;
 use bizHd\order\classes\OrderClass;
 use bizHd\order\classes\ScanPayClass;
 use bizHd\recharge\classes\RechargeClass;
@@ -166,28 +167,32 @@ class NoticeController extends PublicController
 
                     //打印小票和语音播报
                     $order = OrderClass::getByCondition(['orderSn' => $orderSn], true);
-                    OrderClass::onlinePrint($order);
+                    if (!empty($order)) {
+                        OrderClass::onlinePrint($order);
 
-                    $shopId = $order->shopId ?? 0;
-                    $shop = ShopClass::getById($shopId, true);
-                    //制作任务
-                    $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true);
-                    if ($shopExt->needWork == 1 && $order->hasWork != 1) {
-                        $mainId = $shop->mainId ?? 0;
-                        $main = MainClass::getById($mainId, true);
-                        $orderId = $order->id ?? 0;
-                        WorkClass::needWork($order, $main);
-                        $has = WorkClass::getByCondition(['orderId' => $orderId], true);
-                        if (!empty($has)) {
-                            $order->hasWork = 1;
-                            $order->save();
-                        }
-                        ShopExtClass::newWorkRemind($shopExt, $order);
-                    }
+                        //付款成功了,通知发跑腿功能,关键词 hd_pay_after_call_pt,多处要同步修改
+                        HdDeliveryOrderClass::payAfter($order);
 
-                    //来自商城的新订单微信通知
-                    WxMessageClass::hdNewOrderInform($shop, $order);
+                        $shopId = $order->shopId ?? 0;
+                        $shop = ShopClass::getById($shopId, true);
+                        //制作任务
+                        $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true);
+                        if ($shopExt->needWork == 1 && $order->hasWork != 1) {
+                            $mainId = $shop->mainId ?? 0;
+                            $main = MainClass::getById($mainId, true);
+                            $orderId = $order->id ?? 0;
+                            WorkClass::needWork($order, $main);
+                            $has = WorkClass::getByCondition(['orderId' => $orderId], true);
+                            if (!empty($has)) {
+                                $order->hasWork = 1;
+                                $order->save();
+                            }
+                            ShopExtClass::newWorkRemind($shopExt, $order);
+                        }
 
+                        //来自商城的新订单微信通知
+                        WxMessageClass::hdNewOrderInform($shop, $order);
+                    }
                 }
             }
 

+ 16 - 10
app-mall/controllers/OrderController.php

@@ -6,6 +6,7 @@ use biz\product\classes\ProductClass;
 use biz\shop\classes\ShopClass;
 use biz\wx\classes\WxMessageClass;
 use bizHd\custom\classes\HdClass;
+use bizHd\express\classes\HdDeliveryOrderClass;
 use bizHd\order\classes\ScanPayClass;
 use bizHd\wx\classes\WxOpenClass;
 use bizMall\custom\classes\CustomClass;
@@ -771,17 +772,22 @@ class OrderController extends BaseController
 
                 //打印小票和语音播报
                 $order = \bizHd\order\classes\OrderClass::getByCondition(['orderSn' => $orderSn], true);
-                \bizHd\order\classes\OrderClass::onlinePrint($order);
+                if (!empty($order)) {
+                    \bizHd\order\classes\OrderClass::onlinePrint($order);
 
-                $shopId = $order->shopId ?? 0;
-                $shop = ShopClass::getById($shopId, true);
-                if (in_array($order->fromType, [1, 3])) {
-                    //您有新的收入提醒
-                    WxMessageClass::gatheringIncomeInform($shop, $order);
-                }
-                if ($order->fromType == 2) {
-                    //来自商城的新订单微信通知
-                    WxMessageClass::hdNewOrderInform($shop, $order);
+                    //付款成功了,通知发跑腿功能,关键词 hd_pay_after_call_pt,多处要同步修改
+                    HdDeliveryOrderClass::payAfter($order);
+
+                    $shopId = $order->shopId ?? 0;
+                    $shop = ShopClass::getById($shopId, true);
+                    if (in_array($order->fromType, [1, 3])) {
+                        //您有新的收入提醒
+                        WxMessageClass::gatheringIncomeInform($shop, $order);
+                    }
+                    if ($order->fromType == 2) {
+                        //来自商城的新订单微信通知
+                        WxMessageClass::hdNewOrderInform($shop, $order);
+                    }
                 }
             }