合并分支 'wangxiaogang' 到 'master'

Wangxiaogang



查看合并请求 !38

@@ -245,11 +245,11 @@ $configs = [
     //快递鸟预约取件接口寄件人参数
     'sender'=>[
         'Name' => "姚先生",
-        'Mobile' => "15555555555",
+        'Mobile' => "15300350084",
         'ProvinceName' => "河北省",
         'CityName' => "石家庄市",
         'ExpAreaName' => "新华区",
-        'Address' => "debug",
+        'Address' => "学府路121号",
     ],
 ];
 return array_merge($configs, $runtimeConfig,$wechatConfig);
\ No newline at end of file

@@ -100,6 +100,9 @@ class BirdController extends HomeBaseController
         //解析在线下单返回结果
         $result = json_decode($jsonResult, true);
         if ($result["ResultCode"] == "100") {
+            if(!empty($result['Order']['LogisticCode'])){
+                $indentModel->updateData(['id'=>$indent_id],['logistic_code'=>$result['Order']['LogisticCode']]);
+            }
             return ['code'=>20000,'msg'=>'SUCCESS','data'=>$result['Order']['LogisticCode']];//返回快递单号
         } else {
             return ['code'=>40000,'msg'=>$result['Reason']];
@@ -198,6 +201,7 @@ class BirdController extends HomeBaseController
         $indent = $indentModel->findData($where);
         if(empty($indent)){
             $this->error('未查询到该订单','','','');
+
         }
         if($indent['state'] != 5){
             $this->error('该订单不是已发货状态','','','');