Qsnh · Qsnh · Feb 1, 2020 · Jan 31, 2020 · Feb 1, 2020 · Feb 1, 2020
diff --git a/app/Constant/ApiV2Constant.php b/app/Constant/ApiV2Constant.php
@@ -171,5 +171,22 @@ class ApiV2Constant
     ];
     const MODEL_ORDER_FIELD = [
         'user_id', 'charge', 'order_id', 'payment_method', 'status_text', 'payment_text', 'continue_pay',
+        'goods', 'created_at',
+    ];
+    /**
+     * @OpenApi\Annotations\Schemas(
+     *     @OA\Schema(
+     *         schema="OrderGoods",
+     *         type="object",
+     *         title="订单商品",
+     *         @OA\Property(property="num",type="integer",description="订购数量"),
+     *         @OA\Property(property="goods_text",type="integer",description="商品名"),
+     *         @OA\Property(property="charge",type="string",description="价格"),
+     *         @OA\Property(property="goods_type",type="string",description="商品类型"),
+     *     ),
+     * )
+     */
+    const MODEL_ORDER_GOODS_FIELD = [
+        'num', 'goods_text', 'charge', 'goods_type',
     ];
 }
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -16,12 +16,12 @@
 use App\Constant\ApiV2Constant;
 use App\Constant\BackendApiConstant;
 use Illuminate\Auth\AuthenticationException;
-use App\Http\Controllers\Frontend\Traits\JsonResponseTrait;
+use App\Http\Controllers\Api\V2\Traits\ResponseTrait;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 
 class Handler extends ExceptionHandler
 {
-    use JsonResponseTrait;
+    use ResponseTrait;
 
     /**
      * A list of the exception types that are not reported.
@@ -44,11 +44,9 @@ class Handler extends ExceptionHandler
     ];
 
     /**
-     * Report or log an exception.
-     *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param \Exception $exception
+     * @param Exception $exception
+     * @return mixed|void
+     * @throws Exception
      */
     public function report(Exception $exception)
     {
@@ -80,10 +78,7 @@ public function render($request, Exception $exception)
                 if (Str::contains($request->getUri(), '/api/v2')) {
                     $code = ApiV2Constant::ERROR_CODE;
                     $exception instanceof AuthenticationException && $code = ApiV2Constant::ERROR_NO_AUTH_CODE;
-                    return response()->json([
-                        'code' => $code,
-                        'message' => __('error'),
-                    ]);
+                    return $this->error(__('error'), $code);
                 }
             }
         }

diff --git a/app/Exceptions/ServiceException.php b/app/Exceptions/ServiceException.php
@@ -11,17 +11,17 @@
 
 namespace App\Exceptions;
 
-use App\Http\Controllers\Frontend\Traits\JsonResponseTrait;
+use App\Http\Controllers\Api\V2\Traits\ResponseTrait;
 
 class ServiceException extends \Exception
 {
-    use JsonResponseTrait;
+    use ResponseTrait;
 
     public function render()
     {
         $message = $this->getMessage();
         if (request()->wantsJson()) {
-            return $this->jsonError($message);
+            return $this->error($message);
         }
         flash($message);
 

diff --git a/app/Exceptions/SystemException.php b/app/Exceptions/SystemException.php
@@ -11,10 +11,17 @@
 
 namespace App\Exceptions;
 
+use App\Http\Controllers\Api\V2\Traits\ResponseTrait;
+
 class SystemException extends \Exception
 {
+    use ResponseTrait;
+
     public function render()
     {
+        if (request()->wantsJson()) {
+            return $this->error(__('error'));
+        }
         abort(500, $this->getMessage());
     }
 }
diff --git a/app/Http/Controllers/Api/V2/CaptchaController.php b/app/Http/Controllers/Api/V2/CaptchaController.php
@@ -83,7 +83,8 @@ public function imageCaptcha(Captcha $captcha)
      *     tags={"其它&quo
AE88
t;},
      *     @OA\RequestBody(description="",@OA\JsonContent(
      *         @OA\Property(property="mobile",description="手机号",type="string"),
-     *         @OA\Property(property="mobile_code",description="手机验证码",type="string"),
+     *         @OA\Property(property="image_captcha",description="图形验证码",type="string"),
+     *         @OA\Property(property="image_key",description="图形验证码key",type="string"),
      *         @OA\Property(property="scene",description="scene[login:登录,register:注册,password_reset:密码重置]",type="string"),
      *     )),
      *     @OA\Response(

diff --git a/app/Http/Controllers/Api/V2/MemberController.php b/app/Http/Controllers/Api/V2/MemberController.php
@@ -77,6 +77,8 @@
  *         @OA\Property(property="payment_text",type="string",description="支付渠道"),
  *         @OA\Property(property="payment_method",type="string",description="支付渠道的支付方式"),
  *         @OA\Property(property="continue_pay",type="integer",description="是否可以继续支付"),
+ *         @OA\Property(property="created_at",type="string",description="时间"),
+ *         @OA\Property(property="goods",type="array",description="订单商品",@OA\Items(ref="#/components/schemas/OrderGoods")),
  *     ),
  *     @OA\Schema(
  *         schema="UserInviteBalanceRecord",
@@ -440,6 +442,9 @@ public function orders(Request $request)
             'list' => $list,
         ] = $this->orderService->userOrdersPaginate($page, $pageSize);
         $list = arr2_clear($list, ApiV2Constant::MODEL_ORDER_FIELD);
+        foreach ($list as $key => $val) {
+            $list[$key]['goods'] = arr2_clear($val['goods'], ApiV2Constant::MODEL_ORDER_GOODS_FIELD);
+        }
         $orders = $this->paginator($list, $total, $page, $pageSize);
 
         return $this->data($orders);

diff --git a/app/Http/Controllers/Backend/Api/V1/MemberController.php b/app/Http/Controllers/Backend/Api/V1/MemberController.php
@@ -12,7 +12,9 @@
 namespace App\Http\Controllers\Backend\Api\V1;
 
 use App\User;
+use Illuminate\Support\Arr;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use App\Http\Requests\Backend\MemberRequest;
 use App\Events\UserInviteBalanceWithdrawHandledEvent;
 use App\Services\Member\Models\UserInviteBalanceWithdrawOrder;
@@ -49,13 +51,15 @@ public function store(MemberRequest $request)
         return $this->success();
     }
 
+    // 用户提现订单
     public function inviteBalanceWithdrawOrders(Request $request)
     {
         $orders = UserInviteBalanceWithdrawOrder::latest()->paginate($request->input('size', 12));
         $users = \App\Services\Member\Models\User::whereIn('id', $orders->pluck('user_id'))->get()->keyBy('id');
         return $this->successData(compact('orders', 'users'));
     }
 
+    // 用户提现订单处理
     public function inviteBalanceWithdrawOrderHandle(Request $request)
     {
         $ids = $request->input('ids');
@@ -68,4 +72,19 @@ public function inviteBalanceWithdrawOrderHandle(Request $request)
         event(new UserInviteBalanceWithdrawHandledEvent($ids, $status));
         return $this->success();
     }
+
+    // 用户编辑
+    public function update(Request $request, $id)
+    {
+        $user = User::findOrFail($id);
+        $data = $request->all();
+        $data = Arr::only($data, [
+            'avatar', 'nick_name', 'mobile', 'password',
+            'is_lock', 'is_active', 'role_id', 'role_expired_at',
+            'invite_user_id', 'invite_balance', 'invite_user_expired_at',
+        ]);
+        ($data['password'] ?? '') && $data['password'] = Hash::make($data['password']);
+        $user->fill($data)->save();
+        return $this->success();
+    }
 }
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
@@ -11,9 +11,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Controllers\Frontend\Traits\JsonResponseTrait;
+use App\Http\Controllers\Api\V2\Traits\ResponseTrait;
 
 class BaseController extends Controller
 {
-    use JsonResponseTrait;
+    use ResponseTrait;
 }
diff --git a/app/Http/Controllers/Frontend/AjaxController.php b/app/Http/Controllers/Frontend/AjaxController.php
@@ -71,7 +71,7 @@ public function courseCommentHandler(CourseOrVideoCommentCreateRequest $request,
         $comment = $this->courseCommentService->create($course['id'], $content);
         $user = $this->userService->find(Auth::id(), ['role']);
 
-        return $this->jsonSuccess([
+        return $this->data([
             'content' => $comment['render_content'],
             'created_at' => Carbon::parse($comment['created_at'])->diffForHumans(),
             'user' => [
@@ -97,7 +97,7 @@ public function videoCommentHandler(CourseOrVideoCommentCreateRequest $request,
         $comment = $this->videoCommentService->create($video['id'], $content);
         $user = $this->userService->find(Auth::id(), ['role']);
 
-        return $this->jsonSuccess([
+        return $this->data([
             'content' => $comment['render_content'],
             'created_at' => Carbon::parse($comment['created_at'])->diffForHumans(),
             'user' => [
@@ -116,19 +116,19 @@ public function promoCodeCheck(Request $request)
     {
         $promoCode = $request->input('promo_code');
         if (!$promoCode) {
-            return $this->jsonError(__('error'));
+            return $this->error(__('error'));
         }
         $code = $this->promoCodeService->findCode($promoCode);
         if (!$code) {
-            return $this->jsonError(__('promo code not exists'));
+            return $this->error(__('promo code not exists'));
         }
         if ($code['expired_at'] && Carbon::now()->gt($code['expired_at'])) {
-            return $this->jsonError(__('promo code has expired'));
+            return $this->error(__('promo code has expired'));
         }
         if (!$this->businessState->promoCodeCanUse($code)) {
-            return $this->jsonError(__('user cant use this promo code'));
+            return $this->error(__('user cant use this promo code'));
         }
-        return $this->jsonSuccess([
+        return $this->data([
             'id' => $code['id'],
             'discount' => $code['invited_user_reward'],
         ]);

diff --git a/app/Http/Controllers/Frontend/SmsController.php b/app/Http/Controllers/Frontend/SmsController.php
@@ -74,6 +74,6 @@ protected function sendHandler($mobile, $sessionKey, $templateId)
 
         $this->smsService->sendCode($mobile, $code, $templateId);
 
-        return $this->jsonSuccess();
+        return $this->success();
     }
 }
diff --git a/app/Http/Controllers/Frontend/Traits/JsonResponseTrait.php b/app/Http/Controllers/Frontend/Traits/JsonResponseTrait.php
diff --git a/app/Http/Controllers/Frontend/UploadController.php b/app/Http/Controllers/Frontend/UploadController.php
@@ -19,6 +19,6 @@ public function imageHandler(UploadImageRequest $request)
     {
         [$path, $url] = $request->filldata();
 
-        return $this->jsonSuccess(compact('path', 'url'));
+        return $this->data(compact('path', 'url'));
     }
 }
diff --git a/app/Http/Requests/ApiV2/SmsRequest.php b/app/Http/Requests/ApiV2/SmsRequest.php
@@ -20,7 +20,6 @@ public function rules()
         ];
         return [
             'mobile' => 'required',
-            'mobile_code' => 'required',
             'image_captcha' => 'required',
             'image_key' => 'required',
             'scene' => 'in:' . implode(',', $scenes),
@@ -31,7 +30,6 @@ public function messages()
     {
         return [
             'mobile.required' => __('mobile.required'),
-            'mobile_code.required' => __('mobile_code.required'),
             'image_captcha.required' => __('image_captcha.required'),
             'image_key.required' => __('image_key.required'),
             'scene.in' => __('sms_scene_error'),

diff --git a/app/Meedu/ServiceProxy/ServiceProxy.php b/app/Meedu/ServiceProxy/ServiceProxy.php
@@ -176,11 +176,11 @@ protected function limitHandler($name, $args)
             return;
         }
         /**
-         * @var LimiterInfo
+         * @var $limiterInfo LimiterInfo
          */
         $limiterInfo = call_user_func_array($this->limit[$name], $args);
         /**
-         * @var RateLimiter
+         * @var $rateLimiter RateLimiter
          */
         $rateLimiter = app()->make(RateLimiter::class);
         if ($rateLimiter->tooManyAttempts($limiterInfo->getName(), $limiterInfo->getMaxTimes())) {

diff --git a/phpunit.xml b/phpunit.xml
@@ -31,6 +31,7 @@
             <exclude>
                 <directory suffix=".php">./app/Models</directory>
                 <directory suffix=".php">./app/Services/*/Models</directory>
+                <directory suffix=".php">./app/Http/Controllers/Backend/Api/V1</directory>
                 <file>./app/User.php</file>
             </exclude>
         </whitelist>