调试回调

app-ghs/controllers/NoticeController.php

@@ -174,7 +174,7 @@ class NoticeController extends PublicController
         $orderStatus = $postData['order_status'];
         $orderSn = $orderInfo['orderSn'];
         $sjId = $orderInfo['merchantId'] ?? 0;
-        $sendTime = $orderInfo['$orderInfo'];
+        $sendTime = $orderInfo['sendTime'];
 
         switch ($orderStatus){
             case DadaExpressServices::ORDER_WAIT_ACCEPT:

app-ghs/controllers/OrderController.php

@@ -315,7 +315,7 @@ class OrderController extends BaseController
         } catch (\Exception $exception) {
             $transaction->rollBack();
             Yii::info("发快递操作报错：" . $exception->getMessage());
-            util::fail('操作失败');
+            util::fail('操作失败'. $exception->getMessage());
         }
     }
 

biz-ghs/order/classes/OrderClass.php

@@ -379,7 +379,7 @@ class OrderClass extends BaseClass
             'sjId' => $sjId,
             'expressId' => $expressId,
             'sendTime' => strtotime($order['sendTime']),
-            'cost' => $dadaRes['free'],
+            'cost' => $dadaRes['fee'],
             'distance' => $dadaRes['distance'],
             'status' => 1,
             'expressName' => $expressName,
@@ -390,7 +390,7 @@ class OrderClass extends BaseClass
             'expressName' => $expressName,
             'expressId' => $expressId,
             'distance' => $dadaRes['distance'],
-            'cost' => $dadaRes['free'],
+            'cost' => $dadaRes['fee'],
             'status' => 2,
             'tip' => 0,
         ];

sql.sql

@@ -1889,4 +1889,9 @@ ALTER TABLE `xhSj` CHANGE  `shopPhotoList` `photoList` VARCHAR(1000) NOT NULL DE
 ALTER TABLE `xhSj` ADD fullAddress VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '完整地址' AFTER `address`;
 ALTER TABLE `xhSj` DROP COLUMN `property`;
 ALTER TABLE `xhSj` MODIFY `style` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '商家类型 1花店 2供货商 3昆明供货商';
-ALTER TABLE `xhSj` CHANGE `merchantName` `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '商家名称';
+ALTER TABLE `xhSj` CHANGE `merchantName` `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '商家名称';
+
+========
+==linqh
+ALTER TABLE `xhGhsOrderExpress`
+MODIFY COLUMN `distance`  decimal(10,1) NOT NULL DEFAULT 0.0 COMMENT '距离' AFTER `expressName`;