From 535c81a311bcd54b7ef5aa3f02b3cddc19b854d1 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 15 May 2025 16:06:14 +0800
Subject: [PATCH] feat(mall): 新增订单项的积分金额和积分价格字段- 在 MallOrderInfoMapper.xml 中添加了 item_score_amount 和 item_score_price 字段的映射 - 在 MallOrderItem 实体类中添加了 itemScorePrice 字段 - 更新了 selectNewApiOrderListInPage 查询,加入了积分金额和积分价格的计算

---
 src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
index 9d9aa36..0057351 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java
@@ -403,16 +403,29 @@
     }
 
     @GetMapping("vipLevelSetting/{id}")
+    @RequiresPermissions("updateMemberLevel:update")
     public String vipLevelSetting(@PathVariable(value = "id") String id, Model model) {
         MallMember mallMember = mallMemberMapper.selectById(id);
 
         Map<String, Object> data = new HashMap<>();
         data.put("id", mallMember.getId());
-        data.put("level", mallMember.getLevel());
+        data.put("director", mallMember.getDirector());
         model.addAttribute("vipLevelSet", data);
         return FebsUtil.view("modules/mallMember/vip-level-setting");
     }
 
+    @GetMapping("saleLevelSetting/{id}")
+    @RequiresPermissions("updateSaleLevel:update")
+    public String updateSaleLevel(@PathVariable(value = "id") String id, Model model) {
+        MallMember mallMember = mallMemberMapper.selectById(id);
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("id", mallMember.getId());
+        data.put("storeMaster", mallMember.getStoreMaster());
+        model.addAttribute("saleLevelSet", data);
+        return FebsUtil.view("modules/mallMember/sale-level-setting");
+    }
+
     @GetMapping("addCoupon/{id}")
     public String addCoupon(@PathVariable long id, Model model) {
 //        AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);

--
Gitblit v1.9.1