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 | 8 +++++---
1 files changed, 5 insertions(+), 3 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 bfdc95e..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,7 +34,8 @@
@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));
}
@@ -71,7 +72,7 @@
@PostMapping("/batchLoss")
@CloudRequiredPermission("business:membercard:update")
public ApiResponse batchLoss(@RequestBody List<MemberCard> memberCards,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- memberCardService.updateByIdInBatch(memberCards,0);
+ memberCardService.updateByIdInBatch(memberCards,0,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -79,7 +80,7 @@
@PostMapping("/batchUnLoss")
@CloudRequiredPermission("business:membercard:update")
public ApiResponse batchUnLoss(@RequestBody List<MemberCard> memberCards,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- memberCardService.updateByIdInBatch(memberCards,1);
+ memberCardService.updateByIdInBatch(memberCards,1,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -87,6 +88,7 @@
@PostMapping("/refundCard")
@CloudRequiredPermission("business:membercard:update")
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);
}
--
Gitblit v1.9.3