快递鸟改传参

addons/shopro/controller/order/Aftersale.php

@@ -258,7 +258,8 @@ class Aftersale extends Common
 
             $a = $expressLib->subscribe([
                 'express_code' => $orderExpress['express_code'],
-                'express_no' => $orderExpress['express_no']
+                'express_no' => $orderExpress['express_no'],
+                'Callback'   => 'aftersale',
             ]);
         } catch (\Exception $e) {
             // Nothing TODO

addons/shopro/controller/order/Express.php

@@ -69,10 +69,25 @@ class Express extends Common
      */
     public function push()
     {
-        //区分寄出  与  寄回
+        //Callback区分 发货寄出  与  退货寄回
         $data = $this->request->param();
         $expressLib = new ExpressLib();
         $result = $expressLib->push($data);
         return response($result, 200, [], 'json');
     }
+
+    /**
+     * 接受物流推送
+     *
+     * @param Request $request
+     * @return void
+     */
+    public function push_aftersale()
+    {
+        //Callback区分 发货寄出  与  退货寄回
+        $data = $this->request->param();
+        $expressLib = new ExpressLib('Kdniaoaftersale');
+        $result = $expressLib->push($data);
+        return response($result, 200, [], 'json');
+    }
 }

addons/shopro/library/express/adapter/Kdniao.php

@@ -155,6 +155,7 @@ class Kdniao
         $params = [
             'ShipperCode' => $data['express_code'],
             'LogisticCode' => $data['express_no'],
+            'Callback' => $data['Callback'],
         ];
 
         if ($data['express_code'] == 'JD') {

addons/shopro/library/express/provider/Base.php

@@ -6,6 +6,10 @@ use addons\shopro\library\express\contract\ExpressInterface;
 use app\admin\model\shopro\order\Express;
 use app\admin\model\shopro\order\ExpressLog;
 
+use app\admin\model\shopro\order\Aftersale;
+use app\admin\model\shopro\order\AftersaleExpressLog;
+
+
 class Base implements ExpressInterface
 {
 

addons/shopro/library/express/provider/Kdniao.php

@@ -251,7 +251,8 @@ class Kdniao extends Base
         $requestData = [
             'express_code' => $data['express_code'] ?? '',
             'express_no' => $data['express_no'],
-            'phone' => (isset($data['phone']) && $data['phone']) ? substr($data['phone'], 7) : ''
+            'phone' => (isset($data['phone']) && $data['phone']) ? substr($data['phone'], 7) : '',
+            'Callback' => $data['Callback'],
         ];
 
         return $requestData;