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/vip/controller/ViewVipConfigController.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java b/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java
index 793ded0..fdcf2d5 100644
--- a/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java
+++ b/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java
@@ -76,6 +76,10 @@
         List<Long> goodsIds = new ArrayList<>();
         List<Long> couponIds = new ArrayList<>();
         vipBenefits.getDetails().forEach(item -> {
+            if (StrUtil.isBlank(item.getContent())) {
+                return;
+            }
+
             if (item.getIsClick() == 2) {
                 return;
             }
@@ -103,6 +107,10 @@
         Map<Long, MallGoodsCoupon> couponMap = coupons.stream().collect(Collectors.toMap(MallGoodsCoupon::getId, MallGoodsCoupon -> MallGoodsCoupon));
 
         vipBenefits.getDetails().forEach(item -> {
+            if (StrUtil.isBlank(item.getContent())) {
+                return;
+            }
+
             if (item.getIsClick() == 2) {
                 return;
             }
@@ -166,6 +174,9 @@
             List<VipSettingUnAliveSettingBo> items = JSONObject.parseArray(couponData.getValue(), VipSettingUnAliveSettingBo.class);
             setting.setItems(items);
         }
+
+        DataDictionaryCustom rule = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.VIP_SCORE_RULE.getType(), DataDictionaryEnum.VIP_SCORE_RULE.getCode());
+        setting.setRule(rule.getValue());
         model.addAttribute("vipSetting", setting);
         return FebsUtil.view("modules/vip/vip-setting");
     }

--
Gitblit v1.9.1