From 19c3da86d8c6adcb91baccac6981c63307e3dba1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 20 Dec 2024 13:01:12 +0800
Subject: [PATCH] fix(mall): 修复会员提现状态更新逻辑
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index 8c4dee9..a37da31 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -9,6 +9,7 @@
import cc.mrbird.febs.mall.mapper.MallSalesmanMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -79,7 +80,7 @@
@GetMapping("mallSystemPay/{type}/{id}")
@RequiresPermissions("mallSystemPay:update")
public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) {
- MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
+ MallMemberVo data = mallMemberService.getMallMemberWalletById(id);
model.addAttribute("systemPay", data);
model.addAttribute("type", type);
return FebsUtil.view("modules/mallMember/mallSystemPay");
@@ -409,8 +410,23 @@
Map<String, Object> data = new HashMap<>();
data.put("id", mallMember.getId());
data.put("level", mallMember.getLevel());
+ data.put("vipLevelTime", DateUtil.formatDate(mallMember.getVipLevelTime()));
model.addAttribute("vipLevelSet", data);
return FebsUtil.view("modules/mallMember/vip-level-setting");
}
+ @GetMapping("addCoupon/{id}")
+ public String addCoupon(@PathVariable long id, Model model) {
+// AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+ model.addAttribute("memberId", id);
+ return FebsUtil.view("modules/mallMember/member-coupon-select");
+ }
+
+
+ @GetMapping("memberBenefitsList")
+ @RequiresPermissions("memberBenefitsList:view")
+ public String memberBenefitsList() {
+ return FebsUtil.view("modules/mallMember/memberBenefitsList");
+ }
+
}
--
Gitblit v1.9.1