From 03c9bbd8d9d283a617fb81521ec89cb1c17cc3cb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 09 Apr 2021 16:48:09 +0800
Subject: [PATCH] 20210409 获取提币手续费
---
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 4 ++--
src/main/java/com/xcong/excoin/modules/platform/dao/PlatformFeeSettingDao.java | 2 +-
src/main/resources/mapper/platform/PlatformFeeSettingDao.xml | 3 +++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 7 ++++---
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java | 2 +-
5 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 0ae5d27..6ae9c43 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -372,11 +372,12 @@
@ApiOperation(value = "提币币种可用资金", notes = "提币币种可用资金")
@ApiResponses({@ApiResponse( code = 200, message = "success", response = MemberAvivableCoinInfoVo.class)})
@ApiImplicitParams({
- @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query")
+ @ApiImplicitParam(name = "symbol", value = "币种", required = true, dataType = "String", paramType="query"),
+ @ApiImplicitParam(name = "label", value = "label", required=false, dataType = "String", paramType="query")
})
@GetMapping(value = "/memberAvivableCoinInfo")
- public Result memberAvivableCoinInfo(String symbol) {
- return memberService.memberAvivableCoinInfo(symbol);
+ public Result memberAvivableCoinInfo(String symbol,String label) {
+ return memberService.memberAvivableCoinInfo(symbol,label);
}
/**
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
index 986270b..cafd678 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
@@ -61,7 +61,7 @@
public Result memberCoinInfoList();
- public Result memberAvivableCoinInfo(String symbol);
+ public Result memberAvivableCoinInfo(String symbol,String label);
public NeedMoneyMemberVo selectFriendRelationUserByMemberId(Long memberId);
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index 9a7fbbb..a02656c 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -872,7 +872,7 @@
}
@Override
- public Result memberAvivableCoinInfo(String symbol) {
+ public Result memberAvivableCoinInfo(String symbol,String lable) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);
@@ -883,7 +883,7 @@
List<MemberAvivableCoinInfoVo> arrayList = new ArrayList<>();
- List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol);
+ List<PlatformFeeSettingEntity> feeSettingByTypeAndSymbolLable = platformFeeSettingDao.getFeeSettingsByTypeAndSymbol(2, symbol,lable);
if (CollUtil.isEmpty(feeSettingByTypeAndSymbolLable)) {
return Result.fail(MessageSourceUtils.getString("member_service_0087"));
}
diff --git a/src/main/java/com/xcong/excoin/modules/platform/dao/PlatformFeeSettingDao.java b/src/main/java/com/xcong/excoin/modules/platform/dao/PlatformFeeSettingDao.java
index 03ea822..02378f0 100644
--- a/src/main/java/com/xcong/excoin/modules/platform/dao/PlatformFeeSettingDao.java
+++ b/src/main/java/com/xcong/excoin/modules/platform/dao/PlatformFeeSettingDao.java
@@ -13,6 +13,6 @@
PlatformFeeSettingEntity getFeeSettingByTypeAndSymbol(@Param("type")Integer type,@Param("symbol")String symbol);
- List<PlatformFeeSettingEntity> getFeeSettingsByTypeAndSymbol(@Param("type")int i,@Param("symbol")String symbol);
+ List<PlatformFeeSettingEntity> getFeeSettingsByTypeAndSymbol(@Param("type")int i,@Param("symbol")String symbol,@Param("lable")String lable);
}
diff --git a/src/main/resources/mapper/platform/PlatformFeeSettingDao.xml b/src/main/resources/mapper/platform/PlatformFeeSettingDao.xml
index 8e31d89..9cc461e 100644
--- a/src/main/resources/mapper/platform/PlatformFeeSettingDao.xml
+++ b/src/main/resources/mapper/platform/PlatformFeeSettingDao.xml
@@ -30,6 +30,9 @@
<if test="symbol != null and symbol != ''">
and symbol = #{symbol}
</if>
+ <if test="lable != null and lable != ''">
+ and lable = #{lable}
+ </if>
</where>
</select>
--
Gitblit v1.9.1