commit

app/admin/controller/order/StoreOrder.php

@@ -639,6 +639,7 @@ class StoreOrder extends AuthController
         if (!$oid || !($order = StoreOrderModel::get($oid)))
             return $this->failed('订单不存在!');
         if ($order['delivery_type'] != 'express' || !$order['delivery_id']) return $this->failed('该订单不存在快递单号!');
+        if ($order['delivery_name'] == '顺丰速运') $order['delivery_id'] = $order['delivery_id'].':'.$order['user_phone'];
         $cacheName = $order['order_id'] . $order['delivery_id'];
         $result = CacheService::get($cacheName, null);
         if ($result === null) {

app/api/controller/order/StoreOrderController.php

@@ -468,8 +468,11 @@ class StoreOrderController
     {
         if (!$uni || !($order = StoreOrder::getUserOrderDetail($request->uid(), $uni))) return app('json')->fail('查询订单不存在!');
         if ($order['delivery_type'] != 'express' || !$order['delivery_id']) return app('json')->fail('该订单不存在快递单号!');
+        if ($order['delivery_name'] == '顺丰速运') $order['delivery_id'] = $order['delivery_id'].':'.$order['user_phone'];
+
         $cacheName = $uni . $order['delivery_id'];
         $result = CacheService::get($cacheName, null);
+        $result = ExpressService::query($order['delivery_id']);
         if ($result === NULL) {
             $result = ExpressService::query($order['delivery_id']);
             if (is_array($result) &&

app/api/controller/user/UserController.php

@@ -632,7 +632,7 @@ class UserController
         if ($apply) return app('json')->fail('已提交申请，请耐心等待审核');
         if ($data['type'] == 2){
             $user = User::where('proxy_area', 'like', '%'.$data['address'].'%')->where('status', '>=', 0)->find();
-            if ($user) return app('json')->fail('该地址已被申请');
+            if ($user) return app('json')->fail('该区域已有代理，请重新选择区域代理');
             if (!$data['address']) return app('json')->fail('填写申请地址');
         }
         $user = User::where('uid', $request->uid())->find();