浏览代码

闪送询价接口报 orderingSourceType和orderingSourceNo参数错误,暂时注释掉这两个参数

shizhongqi 7 月之前
父节点
当前提交
2ccf310bd1

+ 9 - 7
app-ghs/controllers/DeliveryController.php

@@ -47,8 +47,8 @@ class DeliveryController extends BaseController
             'didi' => ['name' => '滴滴', 'logo' => '🚗'],
             'uu' => ['name' => 'UU跑腿', 'logo' => '🛵']
         ];
-        $mainId = $this->mainId;
-        $allDeliveries = DeliveryAuthTokenClass::getAllByCondition(['mainId' => $mainId]);
+
+        $allDeliveries = DeliveryAuthTokenClass::getAllByCondition(['mainId' => $this->mainId]);
         foreach ($allDeliveries as $d) {
             $item = [
                 'id' => $d['platform'],
@@ -79,9 +79,6 @@ class DeliveryController extends BaseController
             case 'fengniao':
                 $Auth->fengniaoAuth($mainId);
                 break;
-            case 'dada':
-                $Auth->dadaAuth($mainId);
-                break;
             case 'shunfeng':
                 $Auth->shunfengAuth($mainId);
                 break;
@@ -123,7 +120,7 @@ class DeliveryController extends BaseController
 
         $ret = DeliveryAuthTokenClass::deleteByCondition(['mainId' => $this->mainId, 'platform' => $platform]);
         if ($ret > 0) {
-            util::success(['message' => '取消授权成功']);
+            util::success([], '取消授权成功');
         } else {
             util::fail('取消授权失败');
         }
@@ -140,7 +137,12 @@ class DeliveryController extends BaseController
         return $this->asJson($cities);
     }
 
-    // 查询开通城市
+    /**
+     * @deprecated
+     *
+     * 查询开通城市
+     * @return array
+     */
     public function actionOpenCitiesLists()
     {
         $platform = Yii::$app->request->get('platform');

+ 2 - 2
common/components/delivery/services/adapter/ShansongAdapter.php

@@ -134,8 +134,8 @@ class ShansongAdapter extends Shansong implements Adapter
                 'goodType' => $receiver['goodType'],  // 物品类型,默认10-其他
                 'weight' => (int) ($receiver['weight'] ?? 1),         // 物品重量(必须是整数kg)
                 'remarks' => $receiver['remarks'] ?? '', // 备注
-                'orderingSourceType' => 1, // 订单来源枚举: 1.闪送 5.其他平台
-                'orderingSourceNo' => $data['sendNum'], // 对应orderingSourceType流水号,传参数时必须和orderingSourceType成对出现
+                //'orderingSourceType' => 1, // 订单来源枚举: 1.闪送 5.其他平台
+                //'orderingSourceNo' => $data['sendNum'], // 对应orderingSourceType流水号,传参数时必须和orderingSourceType成对出现
                 'expectStartTime' => isset($receiver['expectStartTime']) ? (int) $receiver['expectStartTime'] : null,
                 'expectEndTime' => isset($receiver['expectEndTime']) ? (int) $receiver['expectEndTime'] : null,
             ];