From cead7b98d5cebc0825b919799e23732877361de0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 六月 2025 18:39:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerBirthdayController.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerBirthdayController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerBirthdayController.java
index 8693080..a02a102 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerBirthdayController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerBirthdayController.java
@@ -2,11 +2,14 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.member.domain.dto.MerBirthdayEditDto;
+import com.ruoyi.member.domain.vo.MerBirthdayEditInfoVo;
import com.ruoyi.member.domain.vo.MerBirthdayGetVo;
import com.ruoyi.member.service.birthday.BirthdayCardService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.log4j.Log4j2;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -24,6 +27,7 @@
@Api(value = "商户端生日卡相关接口", tags = "商户端生日卡相关接口", description = "商户端生日卡相关接口")
@RestController
@RequestMapping("/mer/birthday")
+@Log4j2
public class MerBirthdayController {
@@ -47,4 +51,31 @@
MerBirthdayGetVo birthdayGetVo = birthdayCardService.getMerShopBirthdayCard(merBaseDto.getShopId());
return R.ok(birthdayGetVo);
}
+
+ @RequestMapping(value = "/getMerShopBCEditInfo", method = RequestMethod.POST)
+ @ApiOperation(value = "商户获取生日卡编辑信息")
+ public R<MerBirthdayEditInfoVo> getMerShopBCEditInfo(@RequestBody MerBaseDto merBaseDto) {
+ Long userId = SecurityUtils.getUserId();
+ merBaseDto.setUserId(userId);
+ MerBirthdayEditInfoVo shopBCEditInfo = birthdayCardService.getMerShopBCEditInfo(merBaseDto.getShopId());
+ return R.ok(shopBCEditInfo);
+ }
+
+ @RequestMapping(value = "/editMerBirthdayCard", method = RequestMethod.POST)
+ @ApiOperation(value = "商户编辑生日卡")
+ public R editMerBirthdayCard(@RequestBody MerBirthdayEditDto merBirthdayEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ merBirthdayEditDto.setUserId(userId);
+ birthdayCardService.editMerBirthdayCard(merBirthdayEditDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/toggleMerBirthdayCard", method = RequestMethod.POST)
+ @ApiOperation(value = "商户开关生日卡")
+ public R toggleMerBirthdayCard(@RequestBody MerBirthdayEditDto merBirthdayEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ merBirthdayEditDto.setUserId(userId);
+ birthdayCardService.toggleMerBirthdayCard(merBirthdayEditDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1