From 0b6cb0ac976ca1ddcb1e6f17dfa04bb526585a1e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 29 Jan 2023 09:54:38 +0800
Subject: [PATCH] 1
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberListS.html | 2 +-
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 5 +++++
src/main/java/cc/mrbird/febs/mall/service/impl/BlockSeriveImpl.java | 14 ++++++++++++++
src/main/resources/application-prod.yml | 2 +-
src/main/java/cc/mrbird/febs/mall/controller/BlockController.java | 8 ++++++--
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java | 1 +
src/main/java/cc/mrbird/febs/mall/service/BlockSerive.java | 1 +
7 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
index f03c050..e1d2f29 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
@@ -30,6 +30,7 @@
registration.excludePathPatterns("/api/unipay/singlePayCallBack");
//星级市场
registration.excludePathPatterns("/api/member/memberStarMarket");
+ registration.excludePathPatterns("/api/block/findAddress");
}
@Override
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 108c4f9..f313dcf 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -7,6 +7,11 @@
public enum DataDictionaryEnum {
/**
+ * 充值地址
+ */
+ ADDRESS("ADDRESS_RABBIT","ADDRESS"),
+
+ /**
* 保证金返还比例
*/
RETURN_PERCENT("STAR_RETURN","RETURN_PERCENT"),
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/BlockController.java b/src/main/java/cc/mrbird/febs/mall/controller/BlockController.java
index 3c93eb5..5c0d91f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/BlockController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/BlockController.java
@@ -19,8 +19,6 @@
@RequestMapping(value = "/api/block")
public class BlockController {
-
-
@Autowired
RedisUtils redisUtils;
@Autowired
@@ -35,4 +33,10 @@
return blockSerive.findBlockAddress(symbol, label);
}
+ @ApiOperation(value = "固定充值地址接口", notes = "固定充值地址接口")
+ @GetMapping(value = "/findAddress")
+ public FebsResponse findAddress() {
+ return blockSerive.findAddress();
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/BlockSerive.java b/src/main/java/cc/mrbird/febs/mall/service/BlockSerive.java
index eb4c202..cb4b230 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/BlockSerive.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/BlockSerive.java
@@ -6,4 +6,5 @@
FebsResponse findBlockAddress(String symbol, String lable);
+ FebsResponse findAddress();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/BlockSeriveImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/BlockSeriveImpl.java
index 16370ec..b0f58dd 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/BlockSeriveImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/BlockSeriveImpl.java
@@ -1,10 +1,13 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.chain.service.EthService;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MemberCoinAddressEntity;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MemberCoinAddressDao;
import cc.mrbird.febs.mall.service.BlockSerive;
@@ -29,6 +32,9 @@
@Resource
private AgentProducer agentProducer;
+
+ @Resource
+ private DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
public FebsResponse findBlockAddress(String symbol, String lable) {
@@ -91,4 +97,12 @@
return result;
}
+ @Override
+ public FebsResponse findAddress() {
+ DataDictionaryCustom addressDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.ADDRESS.getType(), DataDictionaryEnum.ADDRESS.getCode());
+ String value = addressDic.getValue();
+ return new FebsResponse().success().data(value);
+ }
+
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 18a5f88..1ec3ba3 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -62,4 +62,4 @@
system:
# chain-listener: true
- chain-listener: true
\ No newline at end of file
+ chain-listener: false
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberListS.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberListS.html
index 8241294..f4e70eb 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberListS.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberListS.html
@@ -94,7 +94,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>-->
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>-->
<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>-->
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>
--
Gitblit v1.9.1