Wesmiler

app/Services/Common/OrderService.php

@@ -238,8 +238,7 @@ class OrderService extends BaseService
         $mobile = isset($info['receiver_mobile']) ? $info['receiver_mobile'] : '';
         $receiverArea = isset($info['receiver_area']) && $info['receiver_area']? $info['receiver_area'] : '';
         if (empty($info)) {
-            $this->error = '请选择订单';
-            return false;
+            return ['code'=>1,'msg'=>'请选择订单'];
         }
 
         if($deliveryType==2){
@@ -249,7 +248,7 @@ class OrderService extends BaseService
         $cacheKey = "caches:kd100:order_admin_{$id}";
         $data = RedisService::get($cacheKey);
         if ($data) {
-            return ['code'=>1,'data'=>$data];
+            return ['code'=>0,'data'=>$data];
         }
         $result = Kd100Service::make()->query($deliveryNo, $mobile, $deliveryCode,$receiverArea);
         RedisService::set($cacheKey.'_result', $result, 300);
@@ -273,8 +272,7 @@ class OrderService extends BaseService
         if ($data && $status==200) {
             RedisService::set($cacheKey, ['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data], 1200);
         }else{
-            $this->error = '获取失败:'.Kd100Service::make()->getError();
-            return false;
+            return ['code'=>1,'msg'=>'获取失败:'.Kd100Service::make()->getError()];
         }
 
         return ['code'=>0,'data'=>['info'=>$courierInfo,'arrivalData'=>$arrivalData,'list'=>$data]];