From a834ccd8dfef154b3164b83104a6cbd4837f81b3 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 23 Jun 2026 09:43:07 +0800
Subject: [PATCH] feat(system): 添加国家运费配置功能
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 3bf4415..abcc4d2 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;
/**
* 平台账单
@@ -393,10 +397,7 @@
public FebsResponse memberAdd(MallMember member) {
RegisterDto registerDto = new RegisterDto();
registerDto.setAccount(member.getAccount());
- registerDto.setRegistType("admin");
registerDto.setPassword("a123456");
- registerDto.setInviteId(member.getInviteId());
- registerDto.setName(member.getName());
apiMallMemberService.register(registerDto);
return new FebsResponse().success();
}
@@ -619,4 +620,20 @@
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