From 565fe22d91f929fd701f61ba35e58b1e4dfd8cce Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 07 Apr 2023 17:08:56 +0800
Subject: [PATCH] 在mq之前，先更新订单状态
---
src/main/resources/templates/febs/views/modules/system/poorSet.html | 34 -----------------
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 28 ++++++++++++++
src/main/java/cc/mrbird/febs/mall/vo/AdminPoolSetVo.java | 25 ++++++++++++
3 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
index fac74ac..ecadc2c 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -15,6 +15,7 @@
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.vo.AdminPerkSetVo;
+import cc.mrbird.febs.mall.vo.AdminPoolSetVo;
import cc.mrbird.febs.monitor.service.ILoginLogService;
import cc.mrbird.febs.system.service.IUserService;
import cn.hutool.core.date.DateUtil;
@@ -161,4 +162,31 @@
model.addAttribute("adminPerkSet", adminPerkSetVo);
return FebsUtil.view("modules/system/perkSet");
}
+
+ @GetMapping("poolSet")
+ @RequiresPermissions("poolSet:view")
+ public String poolSet(Model model) {
+ AdminPoolSetVo adminPoolSetVo = new AdminPoolSetVo();
+ DataDictionaryCustom poolCashDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ PerkEnum.POOL_CASH.getType(),
+ PerkEnum.POOL_CASH.getCode());
+ if (poolCashDic != null) {
+ adminPoolSetVo.setPoolCash(poolCashDic.getValue());
+ }
+ DataDictionaryCustom poolScoreDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ PerkEnum.POOL_SCORE.getType(),
+ PerkEnum.POOL_SCORE.getCode());
+ if (poolScoreDic != null) {
+ adminPoolSetVo.setPoolScore(poolScoreDic.getValue());
+ }
+ DataDictionaryCustom poolScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ PerkEnum.POOL_SCORE_PRICE.getType(),
+ PerkEnum.POOL_SCORE_PRICE.getCode());
+ if (poolScorePriceDic != null) {
+ adminPoolSetVo.setPoolScorePrice(poolScorePriceDic.getValue());
+ }
+
+ model.addAttribute("adminPoolSet", adminPoolSetVo);
+ return FebsUtil.view("modules/system/poolSet");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminPoolSetVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminPoolSetVo.java
new file mode 100644
index 0000000..288ff10
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminPoolSetVo.java
@@ -0,0 +1,25 @@
+package cc.mrbird.febs.mall.vo;
+
+import lombok.Data;
+
+@Data
+public class AdminPoolSetVo {
+
+ /**
+ * 积分池现金
+ * POOL_CASH
+ */
+ private String poolCash;
+
+ /**
+ * 积分池积分
+ * POOL_SCORE
+ */
+ private String poolScore;
+
+ /**
+ * 积分池积分价格 = 积分池现金 / 积分池积分
+ * POOL_SCORE_PRICE
+ */
+ private String poolScorePrice;
+}
diff --git a/src/main/resources/templates/febs/views/modules/system/poorSet.html b/src/main/resources/templates/febs/views/modules/system/poorSet.html
index f3c0bac..d4c754b 100644
--- a/src/main/resources/templates/febs/views/modules/system/poorSet.html
+++ b/src/main/resources/templates/febs/views/modules/system/poorSet.html
@@ -33,40 +33,6 @@
</div>
</div>
</div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label febs-form-item-require">直推：</label>
- <div class="layui-form-mid layui-word-aux">获得【现金】比例：</div>
- <div class="layui-input-inline">
- <input type="text" name="directCashPerkPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-form-mid layui-word-aux">%，获得【积分】比例：</div>
- <div class="layui-input-inline">
- <input type="text" name="directScorePerkPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-form-mid layui-word-aux">%。</div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label febs-form-item-require">合伙人：</label>
- <div class="layui-form-mid layui-word-aux">获得【现金】比例：</div>
- <div class="layui-input-inline">
- <input type="text" name="partnerCashPerkPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-form-mid layui-word-aux">%。</div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label febs-form-item-require">董事：</label>
- <div class="layui-form-mid layui-word-aux">获得【现金】比例：</div>
- <div class="layui-input-inline">
- <input type="text" name="directorCashPerkPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-form-mid layui-word-aux">%。</div>
- </div>
- </div>
</div>
<div class="layui-card-footer">
--
Gitblit v1.9.1