From 41c04c7de3211a2ee53f7e6e53653f8843c52e83 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 28 Aug 2024 10:50:39 +0800
Subject: [PATCH] 新增功能操作按钮，和更新了数据库数据
---
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 2 ++
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 2 ++
src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java | 4 ++++
src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java | 3 +++
src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java | 2 ++
src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html | 12 +++++++++++-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 6 ++++++
7 files changed, 30 insertions(+), 1 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 801fe20..b81a47a 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,8 @@
public enum DataDictionaryEnum {
//FDH兑换标识 1-允许 0-拒绝
COIN_CHANGE("COIN_CHANGE","COIN_CHANGE"),
+ //FDH互转标识 1-允许 0-拒绝
+ COIN_INSIDE_CHANGE("COIN_INSIDE_CHANGE","COIN_INSIDE_CHANGE"),
//卡牌互转标识 1-允许 0-拒绝
CARD_CHANGE("CARD_CHANGE","CARD_CHANGE"),
//充值金额
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
index a64a5d2..7ba1dce 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
@@ -255,6 +255,10 @@
DataDictionaryEnum.COIN_CHANGE.getType(),
DataDictionaryEnum.COIN_CHANGE.getCode(),
gfaBasicSetDto.getChangeType());
+ commonService.updateDataDic(
+ DataDictionaryEnum.COIN_INSIDE_CHANGE.getType(),
+ DataDictionaryEnum.COIN_INSIDE_CHANGE.getCode(),
+ gfaBasicSetDto.getAroundInsideType());
return new FebsResponse().success();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
index d983177..c328779 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
@@ -202,6 +202,9 @@
gfaBasicSetDto.setChangeType(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.COIN_CHANGE.getType(),
DataDictionaryEnum.COIN_CHANGE.getCode()).getValue());
+ gfaBasicSetDto.setAroundInsideType(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.COIN_INSIDE_CHANGE.getType(),
+ DataDictionaryEnum.COIN_INSIDE_CHANGE.getCode()).getValue());
model.addAttribute("gfaBasicSet", gfaBasicSetDto);
return FebsUtil.view("modules/news/gfaBasicSet");
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java
index 56cc183..de72334 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java
@@ -36,4 +36,6 @@
//@ApiModelProperty(value = "FDH兑换标识 1-允许 0-拒绝")
private String changeType;
+ private String aroundInsideType;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index c1d40f8..75620a3 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -374,6 +374,12 @@
DataDictionaryEnum.COIN_CHANGE.getCode()
);
mallMemberVo.setChangeType(Integer.parseInt(StrUtil.isEmpty(coinChangeDic.getValue()) ? "1" : coinChangeDic.getValue()));
+
+ DataDictionaryCustom coinInsideChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.COIN_INSIDE_CHANGE.getType(),
+ DataDictionaryEnum.COIN_INSIDE_CHANGE.getCode()
+ );
+ mallMemberVo.setAroundCoinType(Integer.parseInt(StrUtil.isEmpty(coinInsideChangeDic.getValue()) ? "1" : coinInsideChangeDic.getValue()));
return new FebsResponse().success().data(mallMemberVo);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 78116b8..aa87340 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -126,6 +126,8 @@
private BigDecimal usdtPrice;
@ApiModelProperty(value = "卡牌互转标识 1-允许 0-拒绝")
private Integer aroundType;
+ @ApiModelProperty(value = "FDH互转标识 1-允许 0-拒绝")
+ private Integer aroundCoinType;
@ApiModelProperty(value = "FDH兑换标识 1-允许 0-拒绝")
private Integer changeType;
diff --git a/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html b/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
index e47475f..e1bbb58 100644
--- a/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
+++ b/src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
@@ -116,7 +116,7 @@
<blockquote class="layui-elem-quote blue-border">转账设置</blockquote>
<div class="layui-form-item">
<div class="layui-col-lg6">
- <label class="layui-form-label febs-form-item-require">互转设置：</label>
+ <label class="layui-form-label febs-form-item-require">卡牌互转：</label>
<div class="layui-input-block">
<input type="text" name="aroundType" class="layui-input" >
<div class="layui-form-mid layui-word-aux">0-不允许 1-允许</div>
@@ -126,6 +126,15 @@
<label class="layui-form-label febs-form-item-require">FDH兑换：</label>
<div class="layui-input-block">
<input type="text" name="changeType" class="layui-input" >
+ <div class="layui-form-mid layui-word-aux">0-不允许 1-允许</div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label febs-form-item-require">FDH互转：</label>
+ <div class="layui-input-block">
+ <input type="text" name="aroundInsideType" class="layui-input" >
<div class="layui-form-mid layui-word-aux">0-不允许 1-允许</div>
</div>
</div>
@@ -188,6 +197,7 @@
"frozenFcmCnt": gfaBasicSet.frozenFcmCnt,
"minuteCnt": gfaBasicSet.minuteCnt,
"aroundType": gfaBasicSet.aroundType,
+ "aroundInsideType": gfaBasicSet.aroundInsideType,
"changeType": gfaBasicSet.changeType,
"endTime": gfaBasicSet.endTime
});
--
Gitblit v1.9.1