update

app/Http/Controllers/Api/V1/CommonController.php

@@ -21,12 +21,27 @@ class CommonController extends Controller
         $req = request()->post();
         $this->validate(request(), [
             'wechat_code' => 'required',
+            'phone|手机号' => 'max:20',
+            'verify_code|验证码' => 'integer',
             'nickname|昵称' => 'max:50',
             'avatar|头像' => 'url',
             'latitude|纬度' => 'numeric',
             'longitude|纬度' => 'numeric',
         ]);
 
+        if (!empty($req['phone'])) {
+            if (empty($req['verify_code'])) {
+                return out(null, 10003, '验证码不能为空');
+            }
+            $verify_code = Cache::get($req['phone'].'-1');
+            if($verify_code != $req['verify_code']){
+                if (env('APP_ENV') == 'online' || $req['verify_code'] != '111111') {
+                    return out(null, 10004, '验证码错误');
+                }
+            }
+            Cache::delete($req['phone'].'-1');
+        }
+
         $app = Factory::miniProgram(config('config.wechat_small_program'));
         $data = $app->auth->session($req['wechat_code']);
         if (empty($data['openid'])){
@@ -42,6 +57,7 @@ class CommonController extends Controller
                 'avatar' => $req['avatar'] ?? '',
                 'latitude' => $req['latitude'] ?? 0,
                 'longitude' => $req['longitude'] ?? 0,
+                'phone' => $req['phone'] ?? '',
                 'session_key' => $session_key
             ]);
         }
@@ -50,13 +66,16 @@ class CommonController extends Controller
                 return out(null, 10002, '该账号已被冻结');
             }
 
-            User::where('id', $user['id'])->update([
+            $update = [
                 'nickname' => $req['nickname'] ?? '',
                 'avatar' => $req['avatar'] ?? '',
                 'latitude' => $req['latitude'] ?? 0,
                 'longitude' => $req['longitude'] ?? 0,
+                'phone' => $req['phone'] ?? '',
                 'session_key' => $session_key
-            ]);
+            ];
+            $update = array_filter($update);
+            User::where('id', $user['id'])->update($update);
         }
 
         $token = aes_encrypt(['id' => $user['id'], 'time' => time()]);

app/Http/Controllers/Api/V1/OrderController.php

@@ -44,6 +44,10 @@ class OrderController extends AuthController
         ]);
         $user = $this->user;
 
+        if (sha1(md5($req['pay_password'])) !== $user['pay_password']) {
+            return out(null, 10001, '密码错误');
+        }
+
         $discount_amount = 0;
         if (!empty($req['user_coupon_id'])) {
             //计算优惠金额
@@ -167,6 +171,10 @@ class OrderController extends AuthController
         ]);
         $user = $this->user;
 
+        if (sha1(md5($req['pay_password'])) !== $user['pay_password']) {
+            return out(null, 10001, '密码错误');
+        }
+
         $product_type = $req['product_type'];
 
         if ($req['product_type'] == 4) {
@@ -314,6 +322,10 @@ class OrderController extends AuthController
         ]);
         $user = $this->user;
 
+        if (sha1(md5($req['pay_password'])) !== $user['pay_password']) {
+            return out(null, 10001, '密码错误');
+        }
+
         $discount_amount = 0;
         if (!empty($req['user_coupon_id'])) {
             //计算优惠金额

app/Http/Controllers/Api/V1/OrganizationController.php

@@ -23,7 +23,7 @@ class OrganizationController extends AuthController
 
         $distance_field = get_user_distance_field($user);
 
-        $data = Organization::select(['id', 'type', 'name', 'province_id', 'city_id', 'area_id', 'address', 'latitude', 'longitude', DB::raw($distance_field)])->orderBy('distance', 'asc')->paginate();
+        $data = Organization::with('docter')->select(['id', 'type', 'name', 'province_id', 'city_id', 'area_id', 'address', 'latitude', 'longitude', DB::raw($distance_field)])->orderBy('distance', 'asc')->paginate();
 
         return out($data);
     }