提示

app-ghs/controllers/DeliveryController.php

@@ -437,7 +437,7 @@ class DeliveryController extends BaseController
                 $gdo->orderStatus = -1;
 
                 OrderClass::cancelOrderSend($ghsOrder, ['staffId' => 0, 'staffName' => '']);
-                GhsNotifyClass::ptErrorNotify($ghsOrder->id, '商家主动取消');
+                GhsNotifyClass::ptErrorNotify($ghsOrder->id, '门店主动取消');
             }
 
             $gdo->cancelCost = $ret['platform'] !== 'fengniao' ? $ret['data']['deductionFee'] : $cancelCostCent; // 由于蜂鸟平台返回的扣费不一样造成

app-ghs/controllers/NoticeController.php

@@ -173,7 +173,7 @@ class NoticeController extends PublicController
      "order_id": "111111111111", 添加订单接口中的origin_id值
      "order_status": 4, 订单状态(待接单＝1,待取货＝2,配送中＝3,已完成＝4,已取消＝5, 指派单=8,妥投异常之物品返回中=9, 妥投异常之物品返回完成=10, 骑士到店=100,创建达达运单失败=1000 可参考文末的状态说明）
      "cancel_reason": "",  订单取消原因,其他状态下默认值为空字符串
-     "cancel_from": 0, 订单取消原因来源(1:达达配送员取消；2:商家主动取消；3:系统或客服取消；0:默认值)
+     "cancel_from": 0, 订单取消原因来源(1:达达配送员取消；2:门店主动取消；3:系统或客服取消；0:默认值)
      "dm_id": 1, 达达配送员id，接单以后会传
      "dm_name": "测试", 配送员姓名，接单以后会传
      "dm_mobile": "13100001111",  配送员手机号，接单以后会传

app-hd/controllers/DeliveryController.php

@@ -306,7 +306,7 @@ class DeliveryController extends BaseController
                 // 更新跑腿订单与批发订单状态
                 $hdo->orderStatus = -1;
 
-                HdNotifyClass::ptErrorNotify($Order->id, '商家主动取消');
+                HdNotifyClass::ptErrorNotify($Order->id, '门店主动取消');
             }
 
             $hdo->cancelCost = $ret['platform'] !== 'fengniao' ? $ret['data']['deductionFee'] : $cancelCostCent; // 由于蜂鸟平台返回的扣费不一样造成

app-pt/views/main/app.php

@@ -238,7 +238,7 @@
             const downloadUrls = {
                 'xiaohuabao': 'https://api.shop.hzghd.com/1266.apk', // 销花宝APP下载链接
                 'huazhanggui': 'https://api.shop.hzghd.com/217.apk', // 花掌柜APP下载链接
-                'huazhanggui_cashier': 'https://api.shop.hzghd.com/187.apk', // 花掌柜收银下载链接
+                'huazhanggui_cashier': 'https://api.shop.hzghd.com/189.apk', // 花掌柜收银下载链接
                 'xiaohuabao_cashier': 'https://api.shop.hzghd.com/148.apk' // 销花宝收银下载链接
             };
             const url = downloadUrls[appType];

common/components/delivery/platform/dada/CallBackHandler.php

@@ -235,7 +235,7 @@ class CallBackHandler
                     $which = '达达配送员取消';
                     break;
                 case 2:
-                    $which = '商家主动取消';
+                    $which = '门店主动取消';
                     break;
                 case 3:
                     $which = '系统或客服取消';