From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 25 Sep 2025 11:29:00 +0800
Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系

---
 src/main/java/cc/mrbird/febs/mall/controller/member/ViewMallMemberController.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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..345f802 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
@@ -77,7 +77,7 @@
      * @return
      */
     @GetMapping("mallSystemPay/{type}/{id}")
-    @RequiresPermissions("mallSystemPay:update")
+    @RequiresPermissions("wallet:update")
     public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) {
         MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
         model.addAttribute("systemPay", data);
@@ -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