1.订单支付回调添加跑腿业务 2.删除员工时，把员工设备的状态更为退出 3.没有找到跑腿缓存数据时不发app通知

app-ghs/controllers/NoticeController.php

@@ -6,7 +6,6 @@ use biz\express\classes\ExpressShanClass;
 use bizGhs\express\services\DadaExpressServices;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\OrderExpressClass;
-use bizGhs\order\classes\OrderSendClass;
 use bizGhs\order\services\OrderService;
 use common\components\dict;
 use common\components\noticeUtil;
@@ -14,7 +13,6 @@ use common\components\payUtil;
 use common\components\shans\shans;
 use Yii;
 use common\components\util;
-use biz\recharge\classes\RechargeClass;
 
 class NoticeController extends PublicController
 {

app-ghs/controllers/OrderController.php

@@ -1650,7 +1650,7 @@ class OrderController extends BaseController
 //                $push->ghsOrderMessage($shop, $cgShop, $order);
             }
 
-            if ($order->sendType == 2 && $order->status == 2) { //订单状态 2待配送
+            if ($order->sendType == 2 && $order->payStatus == 1) {
                 GhsDeliveryOrderClass::payAfter($order);// 付款成功之后呼叫跑腿
             }
         }

app-hd/controllers/NoticeController.php

@@ -155,7 +155,7 @@ class NoticeController extends PublicController
                 $saleId = $cg->saleId ?? 0;
                 $order = OrderClass::getById($saleId, true);
 
-                if(!empty($order)  && $order->sendType == 2 && $order->status == 2) {
+                if(!empty($order)  && $order->sendType == 2 && $order->payStatus == 1) {
                     //付款成功之后呼叫跑腿，关键词 pay_after_call_pt，多处要同步修改
                     GhsDeliveryOrderClass::payAfter($order);
                 }
@@ -372,7 +372,7 @@ class NoticeController extends PublicController
                 $saleId = $cg->saleId ?? 0;
                 $order = OrderClass::getById($saleId, true);
 
-                if(!empty($order) && $order->sendType == 2 && $order->status == 2) { //订单状态 2待配送
+                if(!empty($order) && $order->sendType == 2 && $order->payStatus == 1) {
                     //付款成功之后呼叫跑腿，关键词 pay_after_call_pt，多处要同步修改
                     GhsDeliveryOrderClass::payAfter($order);
                 }
@@ -587,6 +587,11 @@ class NoticeController extends PublicController
                     $saleId = $cg->saleId ?? 0;
                     $order = OrderClass::getById($saleId, true);
                     if (!empty($order)) {
+                        if($order->sendType == 2 && $order->payStatus == 1) {
+                            //付款成功之后呼叫跑腿，关键词 pay_after_call_pt，多处要同步修改
+                            GhsDeliveryOrderClass::payAfter($order);
+                        }
+
                         //订单生成时唤起在线打印
                         if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
                             //有几个地方要同步去修改
@@ -832,6 +837,11 @@ class NoticeController extends PublicController
                         $saleId = $cg->saleId ?? 0;
                         $order = OrderClass::getById($saleId, true);
                         if (!empty($order)) {
+                            if($order->sendType == 2 && $order->payStatus == 1) {
+                                //付款成功之后呼叫跑腿，关键词 pay_after_call_pt，多处要同步修改
+                                GhsDeliveryOrderClass::payAfter($order);
+                            }
+
                             //订单生成时唤起在线打印
                             if (isset($order->needPrint) && $order->needPrint == dict::getDict('needPrint', 'need')) {
                                 //有几个地方要同步去修改

app-hd/controllers/PurchaseController.php

@@ -757,7 +757,7 @@ class PurchaseController extends BaseController
             $order = OrderClass::getById($saleId, true);
             if (!empty($order)) {
                 //付款成功之后呼叫跑腿，关键词 pay_after_call_pt，多处要同步修改
-                if ($order->sendType == 2 && $order->status == 2) {
+                if ($order->sendType == 2 && $order->payStatus == 1) {
                     GhsDeliveryOrderClass::payAfter($order);
                 }
 

biz-ghs/express/classes/GhsDeliveryOrderClass.php

@@ -48,12 +48,12 @@ class GhsDeliveryOrderClass extends BaseClass
             } else {
                 noticeUtil::push("批发-缓存数据不存在或已过期，cacheKey:{$cacheKey}");
                 // 发送 app 通知
-                $title = '发跑腿失败';
-                $msg = "批发-缓存数据不存在或已过期，cacheKey:{$cacheKey}";
-                $allDevices = \bizGhs\device\classes\GhsDeviceClass::getAllByCondition(['shopId' => $shopId]);
-                $cids = array_column($allDevices, 'clientId');
-                $push = new push('ghs', push::MSG_TYPE_WORK);
-                $push->pushByCloud($cids, $title, $msg, []);
+                // $title = '发跑腿失败';
+                // $msg = "批发-缓存数据不存在或已过期，cacheKey:{$cacheKey}";
+                // $allDevices = \bizGhs\device\classes\GhsDeviceClass::getAllByCondition(['shopId' => $shopId]);
+                // $cids = array_column($allDevices, 'clientId');
+                // $push = new push('ghs', push::MSG_TYPE_WORK);
+                // $push->pushByCloud($cids, $title, $msg, []);
                 return;
             }
         } catch (\Exception $e) {

biz-hd/express/classes/HdDeliveryOrderClass.php

@@ -45,12 +45,12 @@ class HdDeliveryOrderClass extends BaseClass
             } else {
                 noticeUtil::push("零售-缓存数据不存在或已过期，cacheKey:{$cacheKey}");
                 // 发送 app 通知
-                $title = '发跑腿失败';
-                $msg = "零售-缓存数据不存在或已过期，cacheKey:{$cacheKey}";
-                $allDevices = \bizHd\device\classes\HdDeviceClass::getAllByCondition(['shopId' => $shopId, 'status' => 1]);
-                $cids = array_column($allDevices, 'clientId');
-                $push = new push('hd', push::MSG_TYPE_WORK);
-                $push->pushByCloud($cids, $title, $msg, []);
+                // $title = '发跑腿失败';
+                // $msg = "零售-缓存数据不存在或已过期，cacheKey:{$cacheKey}";
+                // $allDevices = \bizHd\device\classes\HdDeviceClass::getAllByCondition(['shopId' => $shopId, 'status' => 1]);
+                // $cids = array_column($allDevices, 'clientId');
+                // $push = new push('hd', push::MSG_TYPE_WORK);
+                // $push->pushByCloud($cids, $title, $msg, []);
 
                 return;
             }

biz-hd/staff/classes/StaffClass.php

@@ -194,6 +194,21 @@ class StaffClass extends BaseClass
             }
             $hasShop = 1;
         }
+        
+        //把 xhHdDevice 与 xhGhsDevice 表下的数据更新为退出（删除）
+        $ghsDevices = \bizGhs\device\classes\GhsDeviceClass::getAllByCondition(['adminId' => $admin->id], null, 'id,status,clientId', null, true);
+        foreach ($ghsDevices as $ghsDevice) {
+            $ghsDevice->status = 0;
+            $ghsDevice->clientId = $ghsDevice->clientId . '_delete_' . date('Y-m-d H:i:s');
+            $ghsDevice->save();
+        }
+        $hdDevices = \bizHd\device\classes\HdDeviceClass::getAllByCondition(['adminId' => $admin->id], null, 'id,status,clientId',null, true);
+        foreach ($hdDevices as $hdDevice) {
+            $hdDevice->status = 0;
+            $hdDevice->clientId = $hdDevice->clientId . '_delete_' . date('Y-m-d H:i:s');
+            $hdDevice->save();
+        }
+
         return ['hasShop' => $hasShop];
     }
 }