Просмотр исходного кода

配送订单表单数据添加 流水号(sendNum)

shizhongqi 8 месяцев назад
Родитель
Сommit
048edb4a57

+ 2 - 1
common/components/delivery/services/adapter/FengniaoAdapter.php

@@ -66,7 +66,7 @@ class FengniaoAdapter extends Fengniao implements Adapter
 
         $sn = $order['orderSn'];
         // 批发
-        if(strstr($sn, 'XSD_CS')){
+        if(strstr($sn, 'XSD_CS') || strstr($sn, 'XSD')){
             $itemInfos = OrderItemClass::getAllByCondition(['orderSn' => $sn], null, 'id, name, unitPrice, num, unitWeight');
             $goodsWeight = 0;
             $goodsItemList = [];
@@ -118,6 +118,7 @@ class FengniaoAdapter extends Fengniao implements Adapter
             'order_type' => $orderType,
             'chain_store_id' => $this->getShopId(), // 动态修改为门店号 -- (点对点不传)
             'order_remark' => $order['remark'],
+            'serial_number' => $order['sendNum'] // 配送编号,方便寻找订单对应的花材
         ];
         if($orderType == 3) {
             $orderData['require_receive_time'] = strtotime($params['order_time']) * 1000;

+ 1 - 0
common/components/delivery/services/adapter/ShansongAdapter.php

@@ -133,6 +133,7 @@ class ShansongAdapter extends Shansong implements Adapter
                 'goodType' => $receiver['goodType'],  // 物品类型,默认10-其他
                 'weight' => (int) ($receiver['weight'] ?? 1),         // 物品重量(必须是整数kg)
                 'remarks' => $receiver['remarks'] ?? '', // 备注
+                'orderingSourceNo' => $data['sendNum'], // 对应orderingSourceType流水号,传参数时必须和orderingSourceType成对出现
                 'expectStartTime' => isset($receiver['expectStartTime']) ? (int) $receiver['expectStartTime'] : null,
                 'expectEndTime' => isset($receiver['expectEndTime']) ? (int) $receiver['expectEndTime'] : null,
             ];

+ 1 - 0
common/components/delivery/services/adapter/ShunfengAdapter.php

@@ -120,6 +120,7 @@ class ShunfengAdapter extends Shunfeng implements Adapter
             'rider_pick_method' => 1, // 物流流向(1:从门店取件送至用户)
             'return_flag' => 511, // 返回字段控制标志位(511:全部返回)
             'payment_method' => 1, // 支付方式(1:立即支付,2:到付)
+            'order_sequence' => $order['sendNum'],
         ];
 
         // 用户期望上门时间 --  expect_pickup_time