核销入process

app/admin/controller/finance/MemberAccountController.php

@@ -17,6 +17,7 @@ class MemberAccountController
         // $classify = $request->get('classify', 'CASH');
         $days = $request->get('member_addtimes', []);
         $level = $request->get('level', '');
+        $memberId = $request->get('member_id');
         $accountType = $request->get('account_type', 'CASH');
         $premisesId = intval($request->get('premises_id', ''));
         if (!empty($days)) {
@@ -50,22 +51,24 @@ class MemberAccountController
         ])->join('member_account as ma', function ($join) use ($accountType) {
             $join->on('member.member_id', '=', 'ma.join_account_member_id')->where('ma.member_account_classify', '=', $accountType);
         })->leftJoin('member_role', 'member_role.member_role_id', 'member.join_member_role_id')
-            ->when(!empty($level), function ($query) use ($level,$levelIds) {
-            if ($level == '00') {
-                $query->where('join_member_role_id', '')->orWhere('join_member_role_id', NULL);
-            } else if ($level == 'VIP') {
-                $query->where('member.member_is_vip', 'Y');
-            } else if (!empty($levelIds)) {
-                $query->whereIn('member_role.member_role_id', $levelIds);
-            } else {
-                $query->where('join_member_role_id', $level);
-            }
+            ->when(!empty($level), function ($query) use ($level, $levelIds) {
+                if ($level == '00') {
+                    $query->where('join_member_role_id', '')->orWhere('join_member_role_id', NULL);
+                } else if ($level == 'VIP') {
+                    $query->where('member.member_is_vip', 'Y');
+                } else if (!empty($levelIds)) {
+                    $query->whereIn('member_role.member_role_id', $levelIds);
+                } else {
+                    $query->where('join_member_role_id', $level);
+                }
 
-        })->when(!empty($days), function ($query) use ($days) {
-            $query->whereBetween('member.member_addtimes', $days);
-        })->when(!empty($premisesId), function ($query) use ($premisesId) {
-            $query->whereJsonContains('member.member_extend_json->belong->premises', $premisesId);
-        });
+            })->when(!empty($memberId), function ($query) use ($memberId) {
+                $query->where('member.member_id', $memberId);
+            })->when(!empty($days), function ($query) use ($days) {
+                $query->whereBetween('member.member_addtimes', $days);
+            })->when(!empty($premisesId), function ($query) use ($premisesId) {
+                $query->whereJsonContains('member.member_extend_json->belong->premises', $premisesId);
+            })->where('member.member_mobile', '<>', '0000');
 
         $total = $rows->count('member_id');
         $statistics['surplus'] = $rows->sum('ma.member_account_surplus');

app/admin/controller/member/QuotaController.php

@@ -14,6 +14,7 @@ use app\model\RulePricing;
 use app\model\SysSerial;
 use app\model\SysUser;
 use support\Db;
+use support\Log;
 use support\Redis;
 use support\exception\BusinessException;
 use support\Request;
@@ -51,7 +52,7 @@ class QuotaController extends Curd
         if (!empty($memberId)) {
             if (is_array($memberId)) {
                 $memberIds = $memberId;
-            }else{
+            } else {
                 $memberIds = [$memberId];
             }
         }
@@ -324,11 +325,11 @@ class QuotaController extends Curd
 
             _syslog("核销", "核销成功");
 
+            Log::error("核销成功", $request->all());
             return json_success("核销成功");
         } catch (\Exception $e) {
-            dump($e->getMessage());
             _syslog("核销", "核销失败");
-
+            Log::error("核销失败", ['msg' => $e->getMessage(), 'params' => $request->all()]);
             return json_fail("核销失败");
         }
     }