From a421b06527fce5ebf1a5bb00e51a9bfc4df2626e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 26 Jan 2024 22:57:20 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 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 51a0f72..793ded0 100644
--- a/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java
+++ b/src/main/java/cc/mrbird/febs/vip/controller/ViewVipConfigController.java
@@ -1,14 +1,26 @@
package cc.mrbird.febs.vip.controller;
import cc.mrbird.febs.common.entity.FebsConstant;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallGoodsCoupon;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallGoodsCouponMapper;
import cc.mrbird.febs.mall.service.IApiMallGoodsService;
+import cc.mrbird.febs.vip.VipSettingUnAliveSettingBo;
import cc.mrbird.febs.vip.entity.MallVipBenefits;
+import cc.mrbird.febs.vip.entity.MallVipConfig;
+import cc.mrbird.febs.vip.entity.MallVipConfigBenefits;
import cc.mrbird.febs.vip.service.IMallVipBenefitsService;
+import cc.mrbird.febs.vip.service.IMallVipConfigBenefitsService;
+import cc.mrbird.febs.vip.service.IMallVipConfigService;
+import cc.mrbird.febs.vip.vo.VipSettingVo;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -29,6 +41,9 @@
private final IMallVipBenefitsService mallVipBenefitsService;
private final IApiMallGoodsService apiMallGoodsService;
private final MallGoodsCouponMapper mallGoodsCouponMapper;
+ private final IMallVipConfigService mallVipConfigService;
+ private final IMallVipConfigBenefitsService mallVipConfigBenefitsService;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@GetMapping(value = "/benefitsList")
public String benefitsList() {
@@ -120,8 +135,38 @@
return FebsUtil.view("modules/vip/vipConfig-add");
}
- @GetMapping(value = "/levelEdit")
- public String levelEdit() {
- return FebsUtil.view("modules/vip/vipLevel-list");
+ @GetMapping(value = "/levelEdit/{id}")
+ public String levelEdit(@PathVariable("id") Long id, Model model) {
+ MallVipConfig vipConfig = mallVipConfigService.getById(id);
+ if (vipConfig.getType() == 1) {
+ MallGoods goods = apiMallGoodsService.getById(vipConfig.getTargetId());
+ vipConfig.setTargetId(goods.getId());
+ vipConfig.setTargetName(goods.getGoodsName());
+ }
+
+ LambdaQueryWrapper<MallVipConfigBenefits> configBenefitsQuery = new LambdaQueryWrapper<>();
+ configBenefitsQuery.eq(MallVipConfigBenefits::getConfigId, vipConfig.getId());
+ List<MallVipConfigBenefits> list = mallVipConfigBenefitsService.list(configBenefitsQuery);
+
+ List<Long> benefitsIds = list.stream().map(MallVipConfigBenefits::getBenefitsId).collect(Collectors.toList());
+ vipConfig.setBenefitsIdList(benefitsIds);
+
+ model.addAttribute("configData", vipConfig);
+ return FebsUtil.view("modules/vip/vipConfig-edit");
+ }
+
+ @GetMapping(value = "/vipSetting")
+ public String vipSetting(Model model) {
+ DataDictionaryCustom data = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.VIP_DATE.getType(), DataDictionaryEnum.VIP_DATE.getCode());
+ VipSettingVo setting = new VipSettingVo();
+ setting.setVipDate(data.getValue());
+
+ DataDictionaryCustom couponData = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNALIVE_COUPON.getType(), DataDictionaryEnum.UNALIVE_COUPON.getCode());
+ if (couponData != null && StrUtil.isNotBlank(couponData.getValue())) {
+ List<VipSettingUnAliveSettingBo> items = JSONObject.parseArray(couponData.getValue(), VipSettingUnAliveSettingBo.class);
+ setting.setItems(items);
+ }
+ model.addAttribute("vipSetting", setting);
+ return FebsUtil.view("modules/vip/vip-setting");
}
}
--
Gitblit v1.9.1