fix: 修复API接口错误并优化代码

修复`HfSettleAccountController`中参数错误返回格式，优化`RequestLoggingMiddleware`中图片路径过滤逻辑，调整`OrderDivideRecordController`中日志记录顺序，并移除`StoreAdminUsersController`中冗余的用户类型检查

app/Http/Controllers/Api/HfSettleAccountController.php

@@ -160,7 +160,8 @@ public function myCard(Request $request)
             $member_id = $userObj->member_id;
             $member_id = $userObj->member_id;
         }
         }
         if (!$member_id) {
         if (!$member_id) {
-            return $this->JsonResponse('', '参数错误', 201);
+            return $this->JsonResponse([]);
+            //return $this->JsonResponse('', '参数错误', 201);
         }
         }
 
 
         $account_params = [];
         $account_params = [];

app/Http/Controllers/Api/OrderDivideRecordController.php

@@ -128,7 +128,7 @@ public function manualDivide(Request $request)
     public function updateOrderStatusToDiv(Request $request)
     public function updateOrderStatusToDiv(Request $request)
     {
     {
         //查询完成冻结的订单,分账
         //查询完成冻结的订单,分账
-        $orderList = DB::getList('SELECT id,order_sn,user_id,order_amount,start_freeze_time
+        $orderList = DB::select('SELECT id,order_sn,user_id,order_amount,start_freeze_time
                             FROM li_order_info
                             FROM li_order_info
                             WHERE deleted_at IS NULL
                             WHERE deleted_at IS NULL
                             AND pay_status = 1
                             AND pay_status = 1
@@ -189,12 +189,18 @@ public static function pointUnfreezeEnd(Request $request)
                 ->get();
                 ->get();
 
 
             if ($records->isEmpty()) {
             if ($records->isEmpty()) {
-                Log::add('point_unfreeze_end', [
-                    'msg' => '没有找到可完成的解冻积分记录'
-                ]);
+                // Log::add('point_unfreeze_end', [
+                //     'msg' => '没有找到可完成的解冻积分记录'
+                // ]);
                 return true;
                 return true;
             }
             }
 
 
+            
+            Log::add('point_unfreeze_end', [
+                'count' => count($records),
+                'msg' => '成功完成积分解冻'
+            ]);
+
             foreach ($records as $record) {
             foreach ($records as $record) {
                 // 更新积分记录状态为已完成
                 // 更新积分记录状态为已完成
                 DB::table('user_point_change_rec')
                 DB::table('user_point_change_rec')
@@ -212,10 +218,6 @@ public static function pointUnfreezeEnd(Request $request)
             }
             }
 
 
             DB::commit();
             DB::commit();
-            Log::add('point_unfreeze_end', [
-                'count' => count($records),
-                'msg' => '成功完成积分解冻'
-            ]);
             return true;
             return true;
         } catch (\Exception $e) {
         } catch (\Exception $e) {
             DB::rollBack();
             DB::rollBack();

app/Http/Controllers/Api/StoreAdminUsersController.php

@@ -28,11 +28,11 @@ class StoreAdminUsersController extends BaseController
      */
      */
     public function login(Request $request)
     public function login(Request $request)
     {
     {
-        $user_type = $request->user_type ?? ''; //用户类型,1:商家端,2:核销员端,3:员工端
+        $user_type = $request->user_type ?? ''; //用户类型,1:商家端,2:核销员端,3:员工端【反正都是一个表单，去掉算了】
         $username = $request->username ?? '';
         $username = $request->username ?? '';
         $password = $request->password ?? '';
         $password = $request->password ?? '';
 
 
-        $user = StoreAdminUsers::where(['username' => $username, 'role_id' => $user_type])->first();
+        $user = StoreAdminUsers::where(['username' => $username])->first();
 
 
         if (!$user) {
         if (!$user) {
             return $this->JsonResponse('', '用户不存在', 201);
             return $this->JsonResponse('', '用户不存在', 201);
@@ -124,12 +124,12 @@ public function info(Request $request)
             'openid' => $muser->openid ?? '',
             'openid' => $muser->openid ?? '',
             'avatar' => $muser->avatar ? env('IMAGE_URL') . $muser->avatar : env('NO_AVATAR_IMAGE_URL'),
             'avatar' => $muser->avatar ? env('IMAGE_URL') . $muser->avatar : env('NO_AVATAR_IMAGE_URL'),
             'merchant_id' => $muser->merchant_id,
             'merchant_id' => $muser->merchant_id,
-            'phone' => '',//前端未展示
+            'phone' => $muser->username,//商家用户表都没有手机号字段
             'buycode' => $muser->merchant ? $muser->merchant->buycode : '', // 增加空值判断
             'buycode' => $muser->merchant ? $muser->merchant->buycode : '', // 增加空值判断
             'total_revenue' => $total_revenue,
             'total_revenue' => $total_revenue,
             'balance' => $balance,
             'balance' => $balance,
             'cashout' => $cashout,
             'cashout' => $cashout,
-            'store_name' => $muser->store ? $muser->store->title : '', // 增加空值判断
+            'store_name' => $muser->store ? $muser->store->title : $muser->merchant->name, // 增加空值判断
             'merchant_name' => $muser->merchant ? $muser->merchant->name : '', // 增加空值判断
             'merchant_name' => $muser->merchant ? $muser->merchant->name : '', // 增加空值判断
         ];
         ];
 
 

app/Http/Middleware/RequestLoggingMiddleware.php

@@ -14,7 +14,8 @@ class RequestLoggingMiddleware
      */
      */
     private $filteredRoutes = [
     private $filteredRoutes = [
         'auto-to-commentstatus',
         'auto-to-commentstatus',
-        'simulate-login'
+        'simulate-login',
+        'uploads/*' // 新增图片路径过滤
     ];
     ];
 
 
     /**
     /**
@@ -28,7 +29,7 @@ public function handle(Request $request, Closure $next)
     {
     {
         // 检查请求的路径是否在过滤列表中
         // 检查请求的路径是否在过滤列表中
         foreach ($this->filteredRoutes as $route) {
         foreach ($this->filteredRoutes as $route) {
-            if ($request->is($route)) {
+            if ($request->is($route) || str_contains($request->path(), '.jpg')) {
                 return $next($request);
                 return $next($request);
             }
             }
         }
         }

routes/api.php

@@ -22,8 +22,8 @@
 Route::namespace('App\Http\Controllers\Api')->middleware('acceptJson')->group(function () {
 Route::namespace('App\Http\Controllers\Api')->middleware('acceptJson')->group(function () {
 
 
     //轮训接口
     //轮训接口
-    Route::post('updateOrderStatusToDiv','OrderDivideRecordController@updateOrderStatusToDiv');  //分佣订单解冻轮训
-    Route::post('pointUnfreezeEnd','OrderDivideRecordController@pointUnfreezeEnd');  //订单积分解冻轮训
+    Route::get('updateOrderStatusToDiv','OrderDivideRecordController@updateOrderStatusToDiv');  //分佣订单解冻轮训
+    Route::get('pointUnfreezeEnd','OrderDivideRecordController@pointUnfreezeEnd');  //订单积分解冻轮训
 
 
 
 
     //调试路由
     //调试路由
@@ -33,8 +33,6 @@
 
 
     Route::get('refreshTokenLYK', 'OrderController@refreshTokenLYK');  //手动刷新token
     Route::get('refreshTokenLYK', 'OrderController@refreshTokenLYK');  //手动刷新token
 
 
-
-
     Route::post('get-openid', 'LoginController@getOpenid');  //获取openid
     Route::post('get-openid', 'LoginController@getOpenid');  //获取openid
 
 
     Route::post('login', 'LoginController@login')->name('login');  //用户端授权登录
     Route::post('login', 'LoginController@login')->name('login');  //用户端授权登录