From 664184af3e070dee665ee736caffa0297804975f Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Tue, 18 Mar 2025 11:46:02 +0800 Subject: [PATCH] perf(mall): 移除会员利润计算中的异步执行 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java index 08eda2d..30d49af 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java @@ -9,12 +9,14 @@ import cc.mrbird.febs.mall.service.IAdminMallMemberService; import cc.mrbird.febs.mall.service.IApiMallMemberService; import cc.mrbird.febs.mall.vo.*; +import cc.mrbird.febs.vip.entity.MallVipBenefitsRecord; +import cc.mrbird.febs.vip.mapper.MallVipBenefitsRecordMapper; +import cc.mrbird.febs.vip.service.IMallVipBenefitsService; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,6 +35,8 @@ private final IAdminMallMemberService mallMemberService; private final IApiMallMemberService apiMallMemberService; + private final IMallVipBenefitsService mallVipBenefitsService; + private final MallVipBenefitsRecordMapper mallVipBenefitsRecordMapper; /** * 平台账单 @@ -104,7 +108,7 @@ @GetMapping("changeIdentityNo/{type}/{id}") public FebsResponse changeIdentityNo(@PathVariable("type") Integer type, @PathVariable("id") Long id) { - mallMemberService.changeIdentity(type, id, 2); + mallMemberService.changeIdentity(type, id, 0); return new FebsResponse().success(); } @@ -395,8 +399,8 @@ registerDto.setAccount(member.getAccount()); registerDto.setRegistType("admin"); registerDto.setPassword("a123456"); + registerDto.setPasswordAgain("a123456"); registerDto.setInviteId(member.getInviteId()); - registerDto.setName(member.getName()); apiMallMemberService.register(registerDto); return new FebsResponse().success(); } @@ -614,4 +618,25 @@ return new FebsResponse().success().message("操作成功"); } + @PostMapping("addMemberCoupon") + @ControllerEndpoint(operation = "会员添加优惠券呢", exceptionMessage = "操作失败") + public FebsResponse addMemberCoupon(@Valid MallMember mallmember) { + return mallMemberService.addMemberCoupon(mallmember); + } + + @GetMapping(value = "/findMemberBenefitsInPage") + public FebsResponse findMemberBenefitsInPage(MallVipBenefitsRecord record, QueryRequest request) { + Map<String, Object> data = getDataTable(mallVipBenefitsService.findVipBenefitsInPage(record, request)); + return new FebsResponse().success().data(data); + } + + @PostMapping(value = "/sendGift/{id}") + public FebsResponse sendGift(@PathVariable("id") Long id) { + MallVipBenefitsRecord record = new MallVipBenefitsRecord(); + record.setId(id); + record.setStatus(1); + mallVipBenefitsRecordMapper.updateById(record); + + return new FebsResponse().success(); + } } -- Gitblit v1.9.1