From 8bb4b36a259aa2eeca225ebd44af6c2500708ffd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 20 Feb 2024 14:36:24 +0800
Subject: [PATCH] Merge branch 'blnka-vip' into blnka
---
src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java | 3 +++
1 files changed, 3 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..8cc41bc 100644
--- a/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java
+++ b/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java
@@ -166,6 +166,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