卡券

app/admin/controller/coupon/CardController.php

@@ -8,6 +8,7 @@ use app\controller\Curd;
 use app\model\Card;
 use app\model\CardIssue;
 use app\model\CardMain;
+use app\model\Member;
 use app\model\MemberRole;
 use app\model\SysCategory;
 use app\model\SysUser;
@@ -19,6 +20,7 @@ use support\Log;
 use support\Model;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 
 class CardController extends Curd
 {
@@ -37,6 +39,7 @@ class CardController extends Curd
     public function select(Request $request): Response
     {
         $cardMainName = $request->get('card_main_name');
+        $cardMainAmount = $request->get('card_main_amount');
         $cardIssueName = $request->get('card_issue_name');
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $order = $request->get('order', 'desc');
@@ -46,8 +49,15 @@ class CardController extends Curd
             $where['card_addtimes'][0] = strtotime($where['card_addtimes'][0]);
             $where['card_addtimes'][1] = strtotime($where['card_addtimes'][1]);
         }
+        $cardMainIds = [];
         if (!empty($cardMainName)) {
             $cardMainIds = CardMain::where('card_main_name', 'like', '%' . $cardMainName . '%')->pluck('card_main_id')->toArray();
+        }
+        if (!empty($cardMainAmount)) {
+            $mainIds = CardMain::where('card_main_amount', $cardMainAmount)->pluck('card_main_id')->toArray();
+            $cardMainIds = array_intersect($cardMainIds, $mainIds);
+        }
+        if (!empty($cardMainName) || !empty($cardMainAmount)) {
             $where['join_card_main_id'] = ['in', $cardMainIds];
         }
         if (!empty($cardIssueName)) {
@@ -144,6 +154,145 @@ class CardController extends Curd
         return $items;
     }
 
+    /**
+     * @Desc 储值卡统计
+     * @Author Gorden
+     * @Date 2024/11/22 13:06
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function statistics(Request $request)
+    {
+        $cardStatus = $request->get('card_status');
+        $isIssue = $request->get('is_issue');
+        $issueName = $request->get('card_issue_name');
+        $mainName = $request->get('card_main_name');
+        $addtimes = $request->get('card_addtimes');
+        $amount = $request->get('card_main_amount');
+        $deptId = $request->get('join_card_dept_id');
+        $cardId = $request->get('card_id');
+        $memberId = $request->get('join_card_member_id');
+
+        $cardMainIds = [];
+        if (!empty($mainName)) {
+            $cardMainIds = CardMain::where('card_main_name', 'like', '%' . $mainName . '%')->pluck('card_main_id')->toArray();
+        }
+        if (!empty($amount)) {
+            $mainIds = CardMain::where('card_main_amount', $amount)->pluck('card_main_id')->toArray();
+            $cardMainIds = array_intersect($cardMainIds, $mainIds);
+        }
+        $cardIssueIds = [];
+        if (!empty($issueName)) {
+            $cardIssueIds = CardIssue::where('card_issue_name', 'like', '%' . $issueName . '%')->pluck('card_issue_id')->toArray();
+        }
+
+        $cardModel = Card::with([
+            'member' => function ($query) {
+                $query->select('member_id', 'member_mobile');
+            },
+            'cert' => function ($query) {
+                $query->select('join_cert_member_id', 'member_cert_name');
+            },
+            'dept',
+            'user',
+            'main' => function ($query) {
+                $query->select('card_main_id', 'card_main_name', 'card_main_amount', 'card_main_valid_mode');
+            },
+            'issue' => function ($query) {
+                $query->select('card_issue_id', 'card_issue_name');
+            }
+        ])->when(!empty($cardId), function ($query) use ($cardId) {
+            $query->where('card_id', $cardId);
+        })->when(!empty($deptId), function ($query) use ($deptId) {
+            $query->where('join_card_dept_id', $deptId);
+        })->when(!empty($memberId), function ($query) use ($memberId) {
+            $query->where('join_card_member_id', $memberId);
+        })->when(!empty($isIssue), function ($query) use ($isIssue) {
+            $query->where('is_issue', $isIssue);
+        })->when(!empty($cardStatus), function ($query) use ($cardStatus) {
+            $query->where('card_status', $cardStatus);
+        })->when(!empty($addtimes), function ($query) use ($addtimes) {
+            $addtimes[0] = strtotime($addtimes[0]);
+            $addtimes[1] = strtotime($addtimes[1]);
+            $query->whereBetween('card_addtimes', $addtimes);
+        })->when(!empty($mainName) && !empty($amount), function ($query) use ($cardMainIds) {
+            $query->whereIn('join_card_main_id', $cardMainIds);
+        })->when(!empty($issueName), function ($query) use ($cardIssueIds) {
+            $query->whereIn('join_card_issue_id', $cardIssueIds);
+        });
+
+
+        $totalList = CardMain::when(!empty($mainName), function ($query) use ($mainName) {
+            $query->where('card_main_name', 'like', '%' . $mainName . '%');
+        })->when(!empty($amount), function ($query) use ($amount) {
+            $query->where('card_main_amount', $amount);
+        })->select('card_main_id', 'card_main_amount')
+            ->get()
+            ->toArray();
+        $statistics = [
+            'total' => ['total' => 0, 'amount' => 0],
+            'is_issue' => ['total' => 0, 'amount' => 0],
+            'init' => ['total' => 0, 'amount' => 0],
+            'waiting' => ['total' => 0, 'amount' => 0],
+            'pending' => ['total' => 0, 'amount' => 0],
+            'used' => ['total' => 0, 'amount' => 0],
+            'done' => ['total' => 0, 'amount' => 0],
+            'expired' => ['total' => 0, 'amount' => 0],
+            'paused' => ['total' => 0, 'amount' => 0]
+        ];
+        foreach ($totalList as $total) {
+            // 发行统计
+            $issueModel = clone $cardModel;
+            $isIssueTotal = $issueModel->where('is_issue', 'Y')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['is_issue']['total'] += $isIssueTotal;
+            $statistics['is_issue']['amount'] = sprintf('%.2f', $isIssueTotal * $total['card_main_amount'] + $statistics['is_issue']['amount']);
+            // 待分配统计
+            $initModel = clone $cardModel;
+            $initTotal = $initModel->where('card_status', 'INIT')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['init']['total'] += $initTotal;
+            $statistics['init']['amount'] = sprintf('%.2f', $initTotal * $total['card_main_amount'] + $statistics['init']['amount']);
+            // 已分配，待售统计
+            $waitingModel = clone $cardModel;
+            $waitingTotal = $waitingModel->where('card_status', 'WAITING')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['waiting']['total'] += $waitingTotal;
+            $statistics['waiting']['amount'] = sprintf('%.2f', $waitingTotal * $total['card_main_amount'] + $statistics['waiting']['amount']);
+            // 已售，待激活统计
+            $pendingModel = clone $cardModel;
+            $pendingTotal = $pendingModel->where('card_status', 'PENDING')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['pending']['total'] += $pendingTotal;
+            $statistics['pending']['amount'] = sprintf('%.2f', $pendingTotal * $total['card_main_amount'] + $statistics['pending']['amount']);
+            // 已激活统计
+            $usedModel = clone $cardModel;
+            $usedTotal = $usedModel->where('card_status', 'USED')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['used']['total'] += $usedTotal;
+            $statistics['used']['amount'] = sprintf('%.2f', $usedTotal * $total['card_main_amount'] + $statistics['used']['amount']);
+            // 使用完成统计
+            $doneModel = clone $cardModel;
+            $doneTotal = $doneModel->where('card_status', 'DONE')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['done']['total'] += $doneTotal;
+            $statistics['done']['amount'] = sprintf('%.2f', $doneTotal * $total['card_main_amount'] + $statistics['done']['amount']);
+            // 过期统计
+            $expiredModel = clone $cardModel;
+            $doneTotal = $expiredModel->where('card_status', 'EXPIRED')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['expired']['total'] += $doneTotal;
+            $statistics['expired']['amount'] = sprintf('%.2f', $doneTotal * $total['card_main_amount'] + $statistics['expired']['amount']);
+            // 冻结统计
+            $pausedModel = clone $cardModel;
+            $pausedTotal = $pausedModel->where('card_status', 'PAUSED')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['paused']['total'] += $pausedTotal;
+            $statistics['paused']['amount'] = sprintf('%.2f', $pausedTotal * $total['card_main_amount'] + $statistics['paused']['total']);
+        }
+        $statistics['total']['total'] = $statistics['init']['total'] + $statistics['waiting']['total']
+            + $statistics['pending']['total'] + $statistics['used']['total'] + $statistics['done']['total']
+            + $statistics['expired']['total'] + $statistics['paused']['total'];
+        $statistics['total']['amount'] = sprintf('%.2f', $statistics['init']['amount']
+            + $statistics['waiting']['amount'] + $statistics['pending']['amount'] + $statistics['used']['amount']
+            + $statistics['expired']['amount'] + $statistics['done']['amount'] + $statistics['paused']['amount']);
+
+        return json_success('success', $statistics);
+    }
+
     public function info(Request $request): Response
     {
         $cardId = $request->get('card_id');
@@ -202,6 +351,63 @@ class CardController extends Curd
         if (!empty($info['issue']) && !empty($info['issue']['card_issue_creator_user_id'])) {
             $info['issue_username'] = SysUser::where('user_id', $info['issue']['card_issue_creator_user_id'])->value('user_name');
         }
+        if (!empty($info['card_extend_json'])) {
+            $cardExtendJson = json_decode($info['card_extend_json'], true);
+            if (!empty($info['card_assign_datetime'])) {
+                $info['info_assign']['datetime'] = $info['card_assign_datetime'];
+                if (!empty($cardExtendJson['assign_user_id'])) {
+                    $info['info_assign']['username'] = SysUser::where('user_id', $cardExtendJson['assign_user_id'])->value('user_name');
+                }
+            }
+            if (!empty($cardExtendJson['buy_datetime'])) {
+                $info['info_buy']['datetime'] = $cardExtendJson['buy_datetime'];
+                if (!empty($cardExtendJson['buy_user_id'])) {
+                    $info['info_buy']['username'] = SysUser::where('user_id', $cardExtendJson['buy_user_id'])->value('user_name');
+                }
+                if (!empty($cardExtendJson['buy_member'])) {
+                    $member = Member::with([
+                        'cert' => function ($query) {
+                            $query->select('join_cert_member_id', 'member_cert_name');
+                        }
+                    ])->where('member_id', $cardExtendJson['buy_member'])
+                        ->first();
+                    $mobile = $member->member_mobile ?? '';
+                    $certName = !empty($member->cert) ? $member->cert->member_cert_name : '';
+                    $info['info_buy']['member_name'] = MemberService::getMemberCertName($mobile, $certName, '');
+                }
+                if (!empty($cardExtendJson['buy_order_id'])) {
+                    $info['info_buy']['order_id'] = $cardExtendJson['buy_order_id'];
+                }
+            }
+            if (!empty($cardExtendJson['used_datetime'])) {
+                $info['info_used']['datetime'] = $cardExtendJson['used_datetime'];
+                $info['info_used']['username'] = '会员';
+                if (!empty($cardExtendJson['used_user_id'])) {
+                    $info['info_used']['username'] = SysUser::where('user_id', $cardExtendJson['used_user_id'])->value('user_name');
+                }
+            }
+            if (!empty($cardExtendJson['done_time'])) {
+                $info['info_done']['datetime'] = $cardExtendJson['done_time'];
+                if (!empty($cardExtendJson['done_user_id'])) {
+                    $info['info_done']['username'] = SysUser::where('user_id', $cardExtendJson['done_user_id'])->value('user_name');
+                }
+            }
+            if (!empty($cardExtendJson['expired_datetime'])) {
+                $info['info_expired']['datetime'] = $cardExtendJson['expired_datetime'];
+            }
+            if (!empty($cardExtendJson['paused_datetime'])) {
+                $info['info_paused']['datetime'] = $cardExtendJson['paused_datetime'];
+                if (!empty($cardExtendJson['paused_user_id'])) {
+                    $info['info_paused']['username'] = SysUser::where('user_id', $cardExtendJson['paused_user_id'])->value('user_name');
+                }
+            }
+            if (!empty($cardExtendJson['issue_datetime'])) {
+                $info['info_issue']['datetime'] = $cardExtendJson['issue_datetime'];
+                if (!empty($cardExtendJson['issue_user_id'])) {
+                    $info['info_issue']['username'] = SysUser::where('user_id', $cardExtendJson['issue_user_id'])->value('user_name');
+                }
+            }
+        }
 
         return json_success('', $info);
     }
@@ -236,7 +442,7 @@ class CardController extends Curd
         if ($model->join_card_dept_id != $data['join_card_dept_id'] && empty($model->join_card_member_id)) {
             $data['card_assign_datetime'] = date('Y-m-d H:i:s');
         }
-        if (!empty($data['join_card_dept_id']) && $model->card_status == 'INIT'){
+        if (!empty($data['join_card_dept_id']) && $model->card_status == 'INIT') {
             $data['card_status'] = 'WAITING';
         }
 
@@ -303,6 +509,7 @@ class CardController extends Curd
                     if (!empty($card)) {
                         $cardExtendJson = json_decode($card->card_extend_json, true);
                         $cardExtendJson['issue_datetime'] = date('Y-m-d H:i:s');
+                        $cardExtendJson['issue_user_id'] = JwtToken::getCurrentId();
                         $card->card_extend_json = json_encode($cardExtendJson);
                         $card->is_issue = 'Y';
                         $card->save();
@@ -321,6 +528,7 @@ class CardController extends Curd
                     foreach ($cards as $cardItem) {
                         $cardExtendJson = json_decode($cardItem['card_extend_json'], true);
                         $cardExtendJson['issue_datetime'] = date('Y-m-d H:i:s');
+                        $cardExtendJson['issue_user_id'] = JwtToken::getCurrentId();
                         Card::where('card_id', $cardItem['card_id'])->update([
                             'is_issue' => 'Y',
                             'card_extend_json' => json_encode($cardExtendJson)
@@ -363,17 +571,53 @@ class CardController extends Curd
             $allocation = $params['allocation'];
             // 1.按卡号分配
             if ($allocation == 'CARDID' && !empty($params['card_id'])) {
-                Card::whereIn('card_id', $params['card_id'])->where('join_card_dept_id', 0)->update([
-                    'join_card_dept_id' => $params['join_card_dept_id'],
-                    'card_status'=>'WAITING',
-                    'card_assign_datetime' => date('Y-m-d H:i:s')
-                ]);
+                foreach ($params['card_id'] as $card_id) {
+                    $card = Card::where('card_id', $card_id)->select('card_id', 'card_extend_json')->first();
+                    if (!empty($card)) {
+                        $cardExtendJson = json_decode($card->card_extend_json, true);
+                        $cardExtendJson['assign_user_id'] = JwtToken::getCurrentId();
+                        $card->card_status = 'WAITING';
+                        $card->card_assign_datetime = date('Y-m-d H:i:s');
+                        $card->join_card_dept_id = $params['join_card_dept_id'];
+                        $card->card_extend_json = json_encode($cardExtendJson);
+                        $card->save();
+                    } else {
+                        throw new BusinessException($card_id . "不存在");
+                    }
+                }
+
+//                Card::whereIn('card_id', $params['card_id'])->where('join_card_dept_id', 0)->update([
+//                    'join_card_dept_id' => $params['join_card_dept_id'],
+//                    'card_status' => 'WAITING',
+//                    'card_assign_datetime' => date('Y-m-d H:i:s')
+//                ]);
             } elseif ($allocation == 'ISSUE' && !empty($params['card_issue_id'])) {
-                Card::where('join_card_issue_id', $params['card_issue_id'])->where('join_card_dept_id', 0)->update([
-                    'join_card_dept_id' => $params['join_card_dept_id'],
-                    'card_status'=>'WAITING',
-                    'card_assign_datetime' => date('Y-m-d H:i:s')
-                ]);
+                $cards = Card::where('join_card_issue_id', $params['card_issue_id'])
+                    ->where('card_status', 'INIT')
+                    ->select('card_id', 'card_extend_json')
+                    ->get()
+                    ->toArray();
+                if (!empty($cards)) {
+                    foreach ($cards as $cardItem) {
+                        $cardExtendJson = json_decode($cardItem['card_extend_json'], true);
+                        $cardExtendJson['assign_user_id'] = JwtToken::getCurrentId();
+
+                        Card::where('card_id', $cardItem['card_id'])->update([
+                            'card_status' => 'WAITING',
+                            'card_assign_datetime' => date('Y-m-d H:i:s'),
+                            'join_card_dept_id' => $params['join_card_dept_id'],
+                            'card_extend_json' => json_encode($cardExtendJson)
+                        ]);
+                    }
+                } else {
+                    throw new BusinessException("批次不存在");
+                }
+
+//                Card::where('join_card_issue_id', $params['card_issue_id'])->where('join_card_dept_id', 0)->update([
+//                    'join_card_dept_id' => $params['join_card_dept_id'],
+//                    'card_status' => 'WAITING',
+//                    'card_assign_datetime' => date('Y-m-d H:i:s')
+//                ]);
             }
 
             _syslog("储值卡", '分配成功');
@@ -477,4 +721,82 @@ class CardController extends Curd
 
         return json_success("success", $data);
     }
+
+    /**
+     * @Desc 激活记录
+     * @Author Gorden
+     * @Date 2024/11/27 16:04
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function usedList(Request $request)
+    {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 10);
+        $mainId = $request->get('main_id');
+        if (!$mainId) {
+            return json_fail("参数异常");
+        }
+
+        $cards = Card::leftJoin("member", 'member.member_id', '=', 'card.join_card_member_id')
+            ->leftJoin('member_cert', 'member_cert.join_cert_member_id', '=', 'card.join_card_member_id')
+            ->leftJoin('sys_dept', 'sys_dept.dept_id', '=', 'card.join_card_dept_id')
+            ->where('join_card_main_id', $mainId)
+            ->whereRaw("CAST(UNIX_TIMESTAMP(JSON_UNQUOTE(JSON_EXTRACT(card_extend_json,'$.used_datetime'))) as SIGNED) > 0");
+        $total = $cards->count();
+        $rows = $cards->selectRaw("CAST(UNIX_TIMESTAMP(JSON_UNQUOTE(JSON_EXTRACT(card_extend_json,'$.used_datetime'))) as SIGNED) as used_time,
+            member_mobile,member_cert_name,dept_name,card_id,card_status,card_addtimes")
+            ->orderByDesc('used_time')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        foreach ($rows as &$row) {
+            $mobile = $row['member_mobile'] ?? '';
+            $certName = $row['member_cert_name'] ?? '';
+            $row['member_name'] = MemberService::getMemberCertName($mobile, $certName, '');
+            $row['used_time'] = date('Y-m-d H:i:s', $row['used_time']);
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    /**
+     * @Desc 发行记录
+     * @Author Gorden
+     * @Date 2024/11/27 16:05
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function issueList(Request $request)
+    {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 10);
+        $mainId = $request->get('main_id');
+        if (!$mainId) {
+            return json_fail("参数异常");
+        }
+
+        $cards = Card::leftJoin("member", 'member.member_id', '=', 'card.join_card_member_id')
+            ->leftJoin('member_cert', 'member_cert.join_cert_member_id', '=', 'card.join_card_member_id')
+            ->leftJoin('sys_dept', 'sys_dept.dept_id', '=', 'card.join_card_dept_id')
+            ->where('join_card_main_id', $mainId)
+            ->whereRaw("CAST(UNIX_TIMESTAMP(JSON_UNQUOTE(JSON_EXTRACT(card_extend_json,'$.issue_datetime'))) as SIGNED) > 0");
+        $total = $cards->count();
+        $rows = $cards->selectRaw("CAST(UNIX_TIMESTAMP(JSON_UNQUOTE(JSON_EXTRACT(card_extend_json,'$.issue_datetime'))) as SIGNED) as issue_time,
+            member_mobile,member_cert_name,dept_name,card_id,card_status,card_addtimes")
+            ->orderByDesc('issue_time')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        foreach ($rows as &$row) {
+            $mobile = $row['member_mobile'] ?? '';
+            $certName = $row['member_cert_name'] ?? '';
+            $row['member_name'] = MemberService::getMemberCertName($mobile, $certName, '');
+            $row['issue_time'] = date('Y-m-d H:i:s', $row['issue_time']);
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
 }

app/admin/controller/coupon/CardMainController.php

@@ -359,6 +359,7 @@ class CardMainController extends Curd
         $categoryId = $request->get('join_card_main_category_id');
         $name = $request->get('card_main_name');
         $addtimes = $request->get('card_main_addtimes');
+        $amount = $request->get('card_main_amount');
 
         $cardMain = CardMain::when(!empty($classify), function ($query) use ($classify) {
             $query->where('card_main_classify', $classify);
@@ -366,13 +367,13 @@ class CardMainController extends Curd
             $query->where('join_card_main_category_id', $categoryId);
         })->when(!empty($name), function ($query) use ($name) {
             $query->where('card_main_name', 'like', '%' . $name . '%');
+        })->when(!empty($amount), function ($query) use ($amount) {
+            $query->where('card_main_amount',  $amount);
         })->when(!empty($addtimes), function ($query) use ($addtimes) {
             $addtimes[0] = strtotime($addtimes[0]);
             $addtimes[1] = strtotime($addtimes[1]);
             $query->whereBetween('card_main_addtimes', $addtimes);
         });
-
-        $statistics = [];
         $totalModel = clone $cardMain;
         $totalList = $totalModel->select('card_main_id', 'card_main_amount')->get()->toArray();
         $statistics = [
@@ -383,6 +384,7 @@ class CardMainController extends Curd
             'pending' => ['total' => 0, 'amount' => 0],
             'used' => ['total' => 0, 'amount' => 0],
             'done' => ['total' => 0, 'amount' => 0],
+            'expired' => ['total' => 0, 'amount' => 0],
             'paused' => ['total' => 0, 'amount' => 0]
         ];
         foreach ($totalList as $total) {
@@ -410,6 +412,10 @@ class CardMainController extends Curd
             $doneTotal = Card::where('card_status', 'DONE')->where('join_card_main_id', $total['card_main_id'])->count();
             $statistics['done']['total'] += $doneTotal;
             $statistics['done']['amount'] = sprintf('%.2f', $doneTotal * $total['card_main_amount'] + $statistics['done']['amount']);
+            // 过期统计
+            $doneTotal = Card::where('card_status', 'EXPIRED')->where('join_card_main_id', $total['card_main_id'])->count();
+            $statistics['expired']['total'] += $doneTotal;
+            $statistics['expired']['amount'] = sprintf('%.2f', $doneTotal * $total['card_main_amount'] + $statistics['expired']['amount']);
             // 冻结统计
             $pausedTotal = Card::where('card_status', 'PAUSED')->where('join_card_main_id', $total['card_main_id'])->count();
             $statistics['paused']['total'] += $pausedTotal;
@@ -417,10 +423,10 @@ class CardMainController extends Curd
         }
         $statistics['total']['total'] = $statistics['init']['total'] + $statistics['waiting']['total']
             + $statistics['pending']['total'] + $statistics['used']['total'] + $statistics['done']['total']
-            + $statistics['paused']['total'];
+            + $statistics['expired']['total'] + $statistics['paused']['total'];
         $statistics['total']['amount'] = sprintf('%.2f', $statistics['init']['amount']
             + $statistics['waiting']['amount'] + $statistics['pending']['amount'] + $statistics['used']['amount']
-            + $statistics['done']['amount'] + $statistics['paused']['amount']);
+            + $statistics['expired']['amount'] + $statistics['done']['amount'] + $statistics['paused']['amount']);
 
         return json_success('success', $statistics);
     }

app/admin/controller/member/AccountController.php

@@ -153,6 +153,7 @@ class AccountController extends Curd
                 if ($status == 'DISABLED') {
                     $card->card_status = 'PAUSED';
                     $cardExtendJson['paused_datetime'] = date('Y-m-d H:i:s');
+                    $cardExtendJson['paused_user_id'] = JwtToken::getCurrentId();
                     $card->card_extend_json = json_encode($cardExtendJson);
                 } elseif ($status == 'ACTIVED') {
                     $card->card_status = 'USED';
@@ -253,6 +254,7 @@ class AccountController extends Curd
                 $cardExtendJson = json_decode($card->card_extend_json, true);
             }
             $cardExtendJson['used_datetime'] = date('Y-m-d H:i:s');
+            $cardExtendJson['used_user_id'] = JwtToken::getCurrentId();
             $card->card_extend_json = json_encode($cardExtendJson);
             $card->save();
 

app/admin/controller/order/WholeController.php

@@ -1080,8 +1080,8 @@ class WholeController extends Curd
                 } else {
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
-                if ($account->member_account_surplus == 0){
-                    MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+                if ($account->member_account_surplus == 0) {
+                    MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
                 $account->member_account_update_user_id = JwtToken::getCurrentId();
@@ -1697,9 +1697,9 @@ class WholeController extends Curd
                     } else {
                         $account->member_account_surplus = $account->member_account_surplus - $item['amount'];
                     }
-                    dump($account->member_account_classify.':'.$account->member_account_surplus);
-                    if ($account->member_account_surplus <= 0){
-                        MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+                    dump($account->member_account_classify . ':' . $account->member_account_surplus);
+                    if ($account->member_account_surplus <= 0) {
+                        MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
                     }
                     $account->member_account_update_user_id = JwtToken::getCurrentId();
                     $account->member_account_updatetimes = time();
@@ -2266,8 +2266,8 @@ class WholeController extends Curd
                 } else {
                     $account->member_account_surplus = $account->member_account_surplus - $params['order_amount_pay'];
                 }
-                if ($account->member_account_surplus == 0){
-                    MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+                if ($account->member_account_surplus == 0) {
+                    MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
                 }
                 $account->member_account_expend = $account->member_account_expend + $params['order_amount_pay'];
                 $account->member_account_update_user_id = JwtToken::getCurrentId();
@@ -3689,26 +3689,30 @@ class WholeController extends Curd
 
             // 卡发货
             if (!empty($params['card_id'])) {
-                $card = Card::where('card_id', $params['card_id'])->first();
-                if (empty($card)) {
+                $cards = Card::whereIn('card_id', $params['card_id'])->get()->toArray();
+                if (empty($cards)) {
                     throw new BusinessException("储值卡不存在");
                 }
-                if ($card->card_status != 'WAITING' || $card->is_issue != 'Y') {
-                    throw new BusinessException("储值卡状态异常");
-                }
-                $order = Order::where('order_id', $request->post('order_id'))->first();
-                $card->card_status = 'PENDING';
-                // 售卖时间
-                $cardExtendJson = [];
-                if (!empty($card->card_extend_json)) {
-                    $cardExtendJson = json_decode($card->card_extend_json, true);
+                foreach ($cards as $item) {
+                    $card = Card::where('card_id', $item['card_id'])->first();
+                    if ($card->card_status != 'WAITING' || $card->is_issue != 'Y') {
+                        throw new BusinessException("储值卡状态异常");
+                    }
+                    $order = Order::where('order_id', $request->post('order_id'))->first();
+                    $card->card_status = 'PENDING';
+                    // 售卖时间
+                    $cardExtendJson = [];
+                    if (!empty($card->card_extend_json)) {
+                        $cardExtendJson = json_decode($card->card_extend_json, true);
+                    }
+                    //{"buy_member": "", "buy_datetime": "", "buy_order_id": ""}
+                    $cardExtendJson['buy_member'] = $order->join_order_member_id ?? '';
+                    $cardExtendJson['buy_datetime'] = date('Y-m-d H:i:s');
+                    $cardExtendJson['buy_order_id'] = $order->order_id ?? '';
+                    $cardExtendJson['buy_user_id'] = JwtToken::getCurrentId();
+                    $card->card_extend_json = json_encode($cardExtendJson);
+                    $card->save();
                 }
-                //{"buy_member": "", "buy_datetime": "", "buy_order_id": ""}
-                $cardExtendJson['buy_member'] = $order->join_order_member_id ?? '';
-                $cardExtendJson['buy_datetime'] = date('Y-m-d H:i:s');
-                $cardExtendJson['buy_order_id'] = $order->order_id ?? '';
-                $card->card_extend_json = json_encode($cardExtendJson);
-                $card->save();
             }
 
             // 入配送记录表            
@@ -3748,8 +3752,8 @@ class WholeController extends Curd
             $model->order_express_remark = $params['order_express_remark'] ?? null;
             $model->order_express_addtimes = $params['order_express_addtimes'] ?? time();
             $expressExtendJson['delivery_time'] = date('Y-m-d H:i:s');
-            if (!empty($params['card_id'])){
-                $expressExtendJson['card_id'] = $params['card_id'];
+            if (!empty($params['card_id'])) {
+                $expressExtendJson['card_id'] = implode(',', $params['card_id']);
             }
             $model->order_express_extend_json = json_encode($expressExtendJson);
             $model->save();
@@ -3767,7 +3771,7 @@ class WholeController extends Curd
 
             _syslog("订单", "发货成功");
             return json_success('发货成功');
-        }catch (BusinessException $e){
+        } catch (BusinessException $e) {
             Db::rollBack();
             _syslog("订单", "发货失败");
             return json_fail('发货失败');
@@ -5230,8 +5234,8 @@ class WholeController extends Curd
             } else {
                 $account->member_account_surplus = $account->member_account_surplus - $amount;
             }
-            if ($account->member_account_surplus == 0){
-                MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+            if ($account->member_account_surplus == 0) {
+                MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
             }
             $account->member_account_update_user_id = JwtToken::getCurrentId();
             $account->member_account_updatetimes = time();
@@ -5630,8 +5634,8 @@ class WholeController extends Curd
                 $account->member_account_surplus = $account->member_account_surplus - $amount;
             }
 
-            if ($account->member_account_surplus == 0){
-                MemberService::accountToDone($account->member_account_id,$account->member_account_surplus,$account->member_account_added);
+            if ($account->member_account_surplus == 0) {
+                MemberService::accountToDone($account->member_account_id, $account->member_account_surplus, $account->member_account_added);
             }
 
             $account->save();

route/admin.php

@@ -1109,6 +1109,9 @@ Route::group('/admin', function () {
         ]);
         Route::group('', function () {
             Route::get('/list', [\app\admin\controller\coupon\CardController::class, 'select']);
+            Route::get('/usedList', [\app\admin\controller\coupon\CardController::class, 'usedList']);
+            Route::get('/issueList', [\app\admin\controller\coupon\CardController::class, 'issueList']);
+            Route::get('/statistics', [\app\admin\controller\coupon\CardController::class, 'statistics']);
             Route::get('/info', [\app\admin\controller\coupon\CardController::class, 'info']);
             Route::get('/export', [\app\admin\controller\coupon\CardController::class, 'exportCard']);
             Route::get('/getCardIdsByMainId', [\app\admin\controller\coupon\CardController::class, 'getCardIdsByMainId']);