合并分支 'wangxiaogang' 到 'master'

接收推送消息



查看合并请求 !49

@@ -36,7 +36,7 @@ class BirdController extends HomeBaseController
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function createOrder($indent_id = 106)
+    public function createOrder($indent_id = null)
     {
         if(empty($indent_id)){
             return "缺少必要参数";
@@ -104,7 +104,7 @@ class BirdController extends HomeBaseController
             if(!empty($result['Order']['LogisticCode'])){
                 $indentModel->updateData(['id'=>$indent_id],['logistic_code'=>$result['Order']['LogisticCode']]);
             }
-            return ['code'=>20000,'msg'=>'SUCCESS','data'=>$result['Order']['LogisticCode']];//返回快递单号
+            return ['code'=>20000,'msg'=>'SUCCESS','data'=>$result];//返回快递单号
         } else {
             return ['code'=>40000,'msg'=>$result['Reason']];
         }