Bladeren bron

支付成功之后,跑腿回调

shish 7 maanden geleden
bovenliggende
commit
ed62e48748

+ 11 - 7
app-hd/controllers/NoticeController.php

@@ -6,6 +6,7 @@ use biz\common\classes\GhsNotifyClass;
 use biz\shop\classes\ShopClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\custom\classes\CustomRechargeClass;
+use bizGhs\express\classes\GhsDeliveryOrderClass;
 use bizGhs\order\classes\OrderClearClass;
 use bizGhs\order\classes\RefundOrderClass;
 use bizHd\cg\classes\CgRefundClass;
@@ -154,6 +155,11 @@ class NoticeController extends PublicController
                 $saleId = $cg->saleId ?? 0;
                 $order = OrderClass::getById($saleId, true);
 
+                if(!empty($order)){
+                    //付款成功之后呼叫跑腿,关键词 pay_after_call_pt,多处要同步修改
+                    GhsDeliveryOrderClass::payAfter($order);
+                }
+
                 //不是预订单,并且供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏、海翔,则订单直接完成掉。是预订单,则确认发货时直接完成掉。有多个地方要修改,请搜索关键词zjFinish
                 if (!empty($cg) && !empty($order)) {
                     if (isset($cg->book) && $cg->book == 0) {
@@ -247,14 +253,7 @@ class NoticeController extends PublicController
                         $shopId = $order->shopId ?? 0;
                         $shop = ShopClass::getById($shopId, true);
                         if (!empty($shop)) {
-
-                            //花店采购,供货商端微信收到通知
-//                            $noticeText = json_encode(['orderId' => $saleId]);
-//                            $noticeKey = "hdCgNoticeGhs";
-//                            Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
-
                             GhsNotifyClass::newOrderNotify($saleId);
-
                         }
                     }
                 }
@@ -373,6 +372,11 @@ class NoticeController extends PublicController
                 $saleId = $cg->saleId ?? 0;
                 $order = OrderClass::getById($saleId, true);
 
+                if(!empty($order)){
+                    //付款成功之后呼叫跑腿,关键词 pay_after_call_pt,多处要同步修改
+                    GhsDeliveryOrderClass::payAfter($order);
+                }
+
                 //不是预订单,并且供货商不是源花汇、小明鲜花、淄博花超、云漫梦金鹏、海翔、镜中花卉,则订单直接完成掉。是预订单,则确认发货时直接完成掉。有多个地方要修改,请搜索关键词zjFinish
                 if (!empty($cg) && !empty($order)) {
                     if (isset($cg->book) && $cg->book == 0) {

+ 5 - 11
app-hd/controllers/PurchaseController.php

@@ -8,6 +8,7 @@ use biz\ghs\classes\GhsClass;
 use biz\shop\classes\ShopClass;
 use biz\shop\classes\ShopExtClass;
 use bizGhs\custom\classes\CustomClass;
+use bizGhs\express\classes\GhsDeliveryOrderClass;
 use bizGhs\order\classes\OrderClass;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\purchase\classes\PurchaseItemClass;
@@ -820,21 +821,14 @@ class PurchaseController extends BaseController
             $order = OrderClass::getById($saleId, true);
             if (!empty($order)) {
 
+                //付款成功之后呼叫跑腿,关键词 pay_after_call_pt,多处要同步修改
+                GhsDeliveryOrderClass::payAfter($order);
+
                 $shopId = $order->shopId ?? 0;
                 $shop = ShopClass::getById($shopId, true);
                 if (!empty($shop)) {
-                    //微信通知供货商
-                    //WxMessageClass::ghsHasNewOrderInform($shop, $order);
-//                    $noticeText = json_encode(['orderId' => $saleId]);
-//                    $noticeKey = "hdCgNoticeGhs";
-//                    Yii::$app->redis->executeCommand('LPUSH', [$noticeKey, $noticeText]);
-
+                    //通知供货商
                     GhsNotifyClass::newOrderNotify($saleId);
-
-                    //向供货商APP发通知
-//                    $cgShop = ShopClass::getById($cg->shopId, true, 'shopName, merchantName');
-//                    $push = new push('ghs', push::MSG_TYPE_ORDER);
-//                    $push->ghsOrderMessage($shop, $cgShop, $order);
                 }
                 //订单生成时唤起在线打印
                 if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {

+ 12 - 0
biz-ghs/express/classes/GhsDeliveryOrderClass.php

@@ -15,6 +15,18 @@ class GhsDeliveryOrderClass extends BaseClass
     //public static $baseFile = '\bizGhs\express\models\GhsDelivery';
     public static $baseFile = GhsDeliveryOrderAR::class;
 
+    public static function payAfter($order)
+    {
+        $orderId = $order->id ?? 0;
+        try {
+            noticeUtil::push('批发,付款成功之后要发跑腿的订单:' . $order->id, '15280215347');
+        } catch (\Exception $e) {
+            $msg = $e->getMessage();
+            $remind = "批发,付款成功之后要发跑腿的订单,报错 {$orderId} {$msg}";
+            noticeUtil::push($remind);
+        }
+    }
+
     //发跑腿准备数据
     public static function prepareAskData($post, $order)
     {

+ 12 - 0
biz-hd/express/classes/HdDeliveryOrderClass.php

@@ -14,6 +14,18 @@ class HdDeliveryOrderClass extends BaseClass
 {
     public static $baseFile = HdDeliveryOrderAR::class;
 
+    public static function payAfter($order)
+    {
+        $orderId = $order->id ?? 0;
+        try {
+            noticeUtil::push('零售,付款成功之后要发跑腿的订单:' . $order->id, '15280215347');
+        } catch (\Exception $e) {
+            $msg = $e->getMessage();
+            $remind = "零售,付款成功之后要发跑腿的订单,报错 {$orderId} {$msg}";
+            noticeUtil::push($remind);
+        }
+    }
+
     //发跑腿准备数据
     public static function prepareAskData($post, $order)
     {