From 48b4e46f22ec83843cb8a3087b8ec9511a7ea8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 10:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java
index ec5ba78..a3d91f6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCardCloudController.java
@@ -34,14 +34,15 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("business:membercard:create")
-    public ApiResponse create(@RequestBody MemberCard memberCard) {
+    public ApiResponse create(@RequestBody MemberCard memberCard,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        memberCard.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(memberCardService.create(memberCard));
     }
 
     @ApiOperation("鏍规嵁ID鍒犻櫎")
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:membercard:delete")
-    public ApiResponse deleteById(@PathVariable Integer id) {
+    public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         memberCardService.deleteById(id);
         return ApiResponse.success(null);
     }
@@ -49,10 +50,10 @@
     @ApiOperation("鎵归噺鍒犻櫎")
     @GetMapping("/delete/batch")
     @CloudRequiredPermission("business:membercard:delete")
-    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+    public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         String [] idArray = ids.split(",");
         List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
+        for (String id : idArray ){
             idList.add(Integer.valueOf(id));
         }
         memberCardService.deleteByIdInBatch(idList);
@@ -62,7 +63,7 @@
     @ApiOperation("鏍规嵁ID淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:membercard:update")
-    public ApiResponse updateById(@RequestBody MemberCard memberCard) {
+    public ApiResponse updateById(@RequestBody MemberCard memberCard,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         memberCardService.updateById(memberCard);
         return ApiResponse.success(null);
     }
@@ -70,23 +71,24 @@
     @ApiOperation("鎸傚け鎿嶄綔")
     @PostMapping("/batchLoss")
     @CloudRequiredPermission("business:membercard:update")
-    public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards) {
-        memberCardService.updateByIdInBatch(memberCards,0);
+    public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("瑙ｆ寕鎿嶄綔")
     @PostMapping("/batchUnLoss")
     @CloudRequiredPermission("business:membercard:update")
-    public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards) {
-        memberCardService.updateByIdInBatch(memberCards,1);
+    public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
     @ApiOperation("閫�鍗℃搷浣�")
     @PostMapping("/refundCard")
     @CloudRequiredPermission("business:membercard:update")
-    public ApiResponse refundCard(@RequestBody MemberCard memberCard) {
+    public ApiResponse refundCard(@RequestBody MemberCard memberCard,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        memberCard.setLoginUserInfo(this.getLoginUser(token));
         memberCardService.updateRefundCard(memberCard);
         return ApiResponse.success(null);
     }
@@ -94,21 +96,21 @@
     @ApiOperation("鍒嗛〉鏌ヨ")
     @PostMapping("/page")
     @CloudRequiredPermission("business:membercard:query")
-    public ApiResponse<PageData<MemberCard>> findPage (@RequestBody PageWrap<MemberCard> pageWrap) {
+    public ApiResponse<PageData<MemberCard>> findPage (@RequestBody PageWrap<MemberCard> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(memberCardService.findPage(pageWrap));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:membercard:exportExcel")
-    public void exportExcel (@RequestBody PageWrap<MemberCard> pageWrap, HttpServletResponse response) {
+    public void exportExcel (@RequestBody PageWrap<MemberCard> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         ExcelExporter.build(MemberCard.class).export(memberCardService.findPage(pageWrap).getRecords(), "鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛�", response);
     }
 
     @ApiOperation("鏍规嵁ID鏌ヨ")
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:membercard:query")
-    public ApiResponse findById(@PathVariable Integer id) {
+    public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(memberCardService.findById(id));
     }
 
@@ -116,7 +118,7 @@
     @ApiOperation("鏍规嵁鏉′欢鏌ヨ鍙敤鍗″彿")
     @PostMapping("/queryCard")
     //@CloudRequiredPermission("business:membercard:query")
-    public ApiResponse<List<MemberCard>> queryCard () {
+    public ApiResponse<List<MemberCard>> queryCard (@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         MemberCard card = new MemberCard();
         return ApiResponse.success(memberCardService.findList(card));
     }

--
Gitblit v1.9.3