From abc52f888ba1cd2ea6cacde104970e4421c64199 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 06 Mar 2023 17:07:23 +0800
Subject: [PATCH] 签到，积分设置
---
src/main/java/cc/mrbird/febs/mall/dto/HlmScoreSetDto.java | 26 +++++
src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java | 20 +++-
src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java | 2
src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html | 100 ++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 31 ++++++
src/main/java/cc/mrbird/febs/mall/service/ICommonService.java | 7 +
src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java | 2
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 18 +++
src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java | 2
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 15 +++
src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java | 8
src/main/resources/application-dev.yml | 12 +-
src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java | 9 +
13 files changed, 234 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
index 2c105ef..d811523 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -6,6 +6,21 @@
@Getter
public enum DataDictionaryEnum {
+ /**
+ * 签到设置-签到积分
+ */
+ SIGN_SCORE("SIGN_SET","SIGN_SCORE"),
+ /**
+ * 积分设置-积分抵扣现金比例，%
+ * 设置50，即商品价格1000，积分可抵扣的最大金额为500
+ */
+ SCORE_PERCENT("SCORE_SET","SCORE_PERCENT"),
+ /**
+ * 积分设置-积分兑换现金比例
+ * 设置1，则1积分等于1元，设置2，则2积分等于1元
+ */
+ SCORE_CHANGE("SCORE_SET","SCORE_CHANGE"),
+
//积分池设置{"everydayRatio":10,"dividEquallyRatio":1}每日订单的百分之几，增加到积分池;每日平分百分比
SCORE_POOR_RADIO("SCORE_POOR", "SCORE_POOR_RADIO"),
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
index 61acaa9..9d9eaa5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.mall.dto.CashOutSettingDto;
+import cc.mrbird.febs.mall.dto.HlmScoreSetDto;
import cc.mrbird.febs.mall.dto.ScorePoorDto;
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.service.ISystemService;
@@ -46,4 +47,21 @@
commonService.addDataDic(DataDictionaryEnum.SCORE_POOR_RADIO.getType(), DataDictionaryEnum.SCORE_POOR_RADIO.getCode(), scorePoorDto, "积分池设置");
return new FebsResponse().success();
}
+
+ @PostMapping(value = "/hlmScoreSet")
+ public FebsResponse hlmScoreSet(HlmScoreSetDto hlmScoreSetDto) {
+ commonService.updateDataDic(
+ DataDictionaryEnum.SIGN_SCORE.getType(),
+ DataDictionaryEnum.SIGN_SCORE.getCode(),
+ hlmScoreSetDto.getSignScore());
+ commonService.updateDataDic(
+ DataDictionaryEnum.SCORE_PERCENT.getType(),
+ DataDictionaryEnum.SCORE_PERCENT.getCode(),
+ hlmScoreSetDto.getScorePercent());
+ commonService.updateDataDic(
+ DataDictionaryEnum.SCORE_CHANGE.getType(),
+ DataDictionaryEnum.SCORE_CHANGE.getCode(),
+ hlmScoreSetDto.getScoreChange());
+ return new FebsResponse().success();
+ }
}
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 aa09f98..c4d2ba5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -8,6 +8,7 @@
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.dto.CashOutSettingDto;
+import cc.mrbird.febs.mall.dto.HlmScoreSetDto;
import cc.mrbird.febs.mall.dto.ScorePoorDto;
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
@@ -16,6 +17,7 @@
import cc.mrbird.febs.monitor.service.ILoginLogService;
import cc.mrbird.febs.system.service.IUserService;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
@@ -47,6 +49,35 @@
return FebsUtil.view("modules/system/profitSetting");
}
+ @GetMapping("hlmScoreSet")
+ @RequiresPermissions("hlmScoreSet:view")
+ public String hlmScoreSet(Model model) {
+ HlmScoreSetDto hlmScoreSetDto = new HlmScoreSetDto();
+ DataDictionaryCustom signScoreDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SIGN_SCORE.getType(),
+ DataDictionaryEnum.SIGN_SCORE.getCode());
+ if (signScoreDic != null) {
+ String signScore = ObjectUtil.isEmpty(signScoreDic.getValue()) ? "0" : signScoreDic.getValue();
+ hlmScoreSetDto.setSignScore(signScore);
+ }
+ DataDictionaryCustom scorePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_PERCENT.getType(),
+ DataDictionaryEnum.SCORE_PERCENT.getCode());
+ if (scorePercentDic != null) {
+ String scorePercent = ObjectUtil.isEmpty(scorePercentDic.getValue()) ? "0" : scorePercentDic.getValue();
+ hlmScoreSetDto.setScorePercent(scorePercent);
+ }
+ DataDictionaryCustom scoreChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SCORE_CHANGE.getType(),
+ DataDictionaryEnum.SCORE_CHANGE.getCode());
+ if (scoreChangeDic != null) {
+ String scoreChange = ObjectUtil.isEmpty(scoreChangeDic.getValue()) ? "0" : scoreChangeDic.getValue();
+ hlmScoreSetDto.setScoreChange(scoreChange);
+ }
+ model.addAttribute("hlmScoreSet", hlmScoreSetDto);
+ return FebsUtil.view("modules/system/hlmScoreSet");
+ }
+
@GetMapping("cashOutSetting")
@RequiresPermissions("cashOutSetting:update")
public String cashOutSetting(Model model) {
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/HlmScoreSetDto.java b/src/main/java/cc/mrbird/febs/mall/dto/HlmScoreSetDto.java
new file mode 100644
index 0000000..b4e8dc1
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/HlmScoreSetDto.java
@@ -0,0 +1,26 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@ApiModel(value = "HlmScoreSetDto", description = "积分设置")
+public class HlmScoreSetDto {
+ /**
+ * 签到设置-签到积分
+ */
+ private String signScore;
+ /**
+ * 积分设置-积分抵扣现金比例，%
+ * 设置50，即商品价格1000，积分可抵扣的最大金额为500
+ */
+ private String scorePercent;
+ /**
+ * 积分设置-积分兑换现金比例
+ * 设置1，则1积分等于1元，设置2，则2积分等于1元
+ */
+ private String scoreChange;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/ICommonService.java b/src/main/java/cc/mrbird/febs/mall/service/ICommonService.java
index 74df42d..114ceb9 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/ICommonService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/ICommonService.java
@@ -19,4 +19,11 @@
void addDataDic(String type, String key, Object value, String description);
+ /**
+ * 更新Dic设置
+ * @param type
+ * @param code
+ * @param value
+ */
+ void updateDataDic(String type, String code, String value);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
index 6f2fe47..ad5ce73 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
@@ -73,4 +73,13 @@
dic.setDescription(description);
dataDictionaryCustomMapper.insert(dic);
}
+
+ @Override
+ public void updateDataDic(String type, String code, String value) {
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(type, code);
+ if (dic != null) {
+ dic.setValue(value);
+ dataDictionaryCustomMapper.updateById(dic);
+ }
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
index aec9654..742daaf 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
@@ -6,5 +6,5 @@
**/
public class ExchangeConstants {
- public static final String EXCHANGE_DEFAULT = "exchange_default";
+ public static final String EXCHANGE_DEFAULT = "hlm_exchange_default";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
index 47cee57..6e7dfd5 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
@@ -6,8 +6,8 @@
**/
public class QueueConstants {
- public static final String QUEUE_DEFAULT = "queue_default";
- public static final String AGENT_AUTO_LEVEL_UP = "queue_agent_auto_level_up";
- public static final String AGENT_RETURN_MONEY = "queue_agent_return_money";
- public static final String ORDER_RETURN_MONEY = "queue_order_return_money";
+ public static final String QUEUE_DEFAULT = "hlm_queue_default";
+ public static final String AGENT_AUTO_LEVEL_UP = "hlm_queue_agent_auto_level_up";
+ public static final String AGENT_RETURN_MONEY = "hlm_queue_agent_return_money";
+ public static final String ORDER_RETURN_MONEY = "hlm_queue_order_return_money";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
index f9d7c1f..f2048db 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
@@ -6,5 +6,5 @@
**/
public class RouteKeyConstants {
- public static final String ROUTE_KEY_DEFAULT = "route_key_default";
+ public static final String ROUTE_KEY_DEFAULT = "hlm_route_key_default";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
index 46c50a1..27a395d 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/consumer/AgentConsumer.java
@@ -34,7 +34,7 @@
log.info("消费者:{}", new String(message.getBody()));
}
- @RabbitListener(queues = "queue_order_delay")
+ @RabbitListener(queues = "hlm_queue_order_delay")
public void orderCancelDelay(String id) {
try {
orderInfoService.autoCancelOrder(Long.parseLong(id));
diff --git a/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java b/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
index 90122ca..0b64030 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
@@ -5,14 +5,24 @@
@Getter
public enum RabbitQueueEnum {
- DEFAULT("exchange_default", "route_key_default", "queue_default"),
+ DEFAULT("hlm_exchange_default",
+ "hlm_route_key_default",
+ "hlm_queue_default"),
- ORDER_CANCEL_DELAY_TTL("exchange_order_delay_ttl", "route_key_order_delay_ttl", "queue_order_delay_ttl"),
- ORDER_CANCEL_DELAY("exchange_order_delay", "route_key_order_delay", "queue_order_delay"),
+ ORDER_CANCEL_DELAY_TTL("hlm_exchange_order_delay_ttl",
+ "hlm_route_key_order_delay_ttl",
+ "hlm_queue_order_delay_ttl"),
+ ORDER_CANCEL_DELAY("hlm_exchange_order_delay",
+ "hlm_route_key_order_delay",
+ "hlm_queue_order_delay"),
- AGENT_REUTRN_MONEY("exchange_agent_return_money", "route_key_agent_return_money", "queue_agent_return_money"),
+ AGENT_REUTRN_MONEY("hlm_exchange_agent_return_money",
+ "hlm_route_key_agent_return_money",
+ "hlm_queue_agent_return_money"),
- ORDER_RETURN_MONEY("exchange_order_return_money", "route_key_order_return_money", "queue_order_return_money");
+ ORDER_RETURN_MONEY("hlm_exchange_order_return_money",
+ "hlm_route_key_order_return_money",
+ "hlm_queue_order_return_money");
private String exchange;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 90f5b47..b0ccf0a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -26,13 +26,13 @@
redis:
# Redis数据库索引（默认为 0）
- database: 1
+ database: 8
# Redis服务器地址
- host: 120.27.238.55
+ host: 121.37.162.173
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: xcong123
+ password: d32ncxe@i3#!dV
lettuce:
pool:
# 连接池中的最小空闲连接
@@ -46,10 +46,10 @@
# 连接超时时间（毫秒）
timeout: 5000
rabbitmq:
- host: 120.27.238.55
+ host: 121.37.162.173
port: 5672
- username: ct_rabbit
- password: 123456
+ username: hibit
+ password: hibit123
publisher-confirm-type: correlated
pay:
diff --git a/src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html b/src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html
new file mode 100644
index 0000000..cacfb1e
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/system/hlmScoreSet.html
@@ -0,0 +1,100 @@
+<div class="layui-fluid layui-anim febs-anim" id="hlm-score-set" lay-title="积分设置">
+ <div class="layui-row layui-col-space8 febs-container">
+ <form class="layui-form" action="" lay-filter="hlm-score-set-form">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">签到积分：</label>
+ <div class="layui-input-block">
+ <input type="text" name="signScore" lay-verify="required|integer" placeholder="请输入数字" autocomplete="off" class="layui-input" >
+ <div class="layui-word-aux">每次签到赠送积分数量，填写整数，如【35】</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">抵扣现金(%)：</label>
+ <div class="layui-input-block">
+ <input type="text" name="scorePercent" lay-verify="required|integer" placeholder="请输入数字" autocomplete="off" class="layui-input" >
+ <div class="layui-word-aux">设置50，即商品价格1000，积分可抵扣的最大金额为1000*50%=500，填写整数，如【50】</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">积分兑换现金：</label>
+ <div class="layui-input-block">
+ <input type="text" name="scoreChange" lay-verify="required|integer" placeholder="请输入数字" autocomplete="off" class="layui-input" >
+ <div class="layui-word-aux">设置1，则1积分等于1元，设置2，则2积分等于1元，填写整数，如【1】</div>
+ </div>
+
+ </div>
+ </div>
+
+ <div class="layui-card-footer">
+ <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="hlm-score-set-submit" id="submit">保存</button>
+ </div>
+ </div>
+ </form>
+ </div>
+</div>
+<style>
+ .layui-form-label {
+ width: 120px;
+ }
+
+ .layui-form-item .layui-input-block {
+ margin-left: 150px;
+ }
+
+ .layui-table-form .layui-form-item {
+ margin-bottom: 20px !important;
+ }
+</style>
+<script data-th-inline="javascript" type="text/javascript">
+ layui.use(['dropdown', 'jquery', 'febs', 'form', 'eleTree'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ form = layui.form,
+ hlmScoreSet = [[${hlmScoreSet}]],
+ $view = $('#hlm-score-set');
+
+ form.verify({
+ integer: [
+ /^[1-9]\d*$/
+ , '只能输入正整数'
+ ]
+ });
+
+ initHlmScoreSetValue();
+
+ form.render();
+
+ function initHlmScoreSetValue() {
+ form.val("hlm-score-set-form", {
+ "signScore": hlmScoreSet.signScore,
+ "scorePercent": hlmScoreSet.scorePercent,
+ "scoreChange": hlmScoreSet.scoreChange
+ });
+ }
+
+ form.on('submit(hlm-score-set-submit)', function (data) {
+ // let signScore = data.field.signScore;
+ // if(0 >= signScore){
+ // febs.alert.warn('【签到积分】请输入大于零');
+ // return false;
+ // }
+ // let scorePercent = data.field.scorePercent;
+ // if(0 >= scorePercent){
+ // febs.alert.warn('【抵扣现金(%)】请输入大于零');
+ // return false;
+ // }
+ // let scoreChange = data.field.scoreChange;
+ // if("0" >= scoreChange){
+ // febs.alert.warn('【兑换现金(%)】请输入大于零');
+ // return false;
+ // }
+ febs.post(ctx + 'admin/system/hlmScoreSet', data.field, function (res) {
+ febs.alert.success('设置成功');
+ return ;
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
--
Gitblit v1.9.1