From a53fb5c597c986a45bdb9e84018e86838a7f4e88 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 12 May 2021 14:51:10 +0800
Subject: [PATCH] 20210512 云顶
---
src/main/java/com/xcong/excoin/modules/yunding/vo/changeVo.java | 23 +++++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java | 16 ++++++++++++----
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 1 +
src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java | 2 +-
src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicSettingEntity.java | 4 ++++
5 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java b/src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java
index 720342a..6a0672d 100644
--- a/src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java
+++ b/src/main/java/com/xcong/excoin/common/enumerates/CoinTypeEnum.java
@@ -6,5 +6,5 @@
* @author wzy
*/
public enum CoinTypeEnum {
- USDT, BTC, ETH, LTC, EOS, XRP, BCH, ETC
+ USDT, XCH,BTC, ETH, LTC, EOS, XRP, BCH, ETC
}
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 34ce5af..aaa5738 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
@@ -925,6 +925,7 @@
}
@Override
+ @Transactional
public Result memberSubmitCoinApply(@Valid MemberSubmitCoinApplyDto memberSubmitCoinApplyDto) {
//获取用户ID
Long memberId = LoginUserUtils.getAppLoginUser().getId();
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java b/src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java
index a3a1d29..f620c0b 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java
@@ -5,10 +5,7 @@
import com.xcong.excoin.modules.yunding.dto.YdOrderListDto;
import com.xcong.excoin.modules.yunding.dto.YdProductListDto;
import com.xcong.excoin.modules.yunding.service.YunDingService;
-import com.xcong.excoin.modules.yunding.vo.OrderAllInfoVo;
-import com.xcong.excoin.modules.yunding.vo.YdBasicSettingVo;
-import com.xcong.excoin.modules.yunding.vo.YdOrderVo;
-import com.xcong.excoin.modules.yunding.vo.YdProductVo;
+import com.xcong.excoin.modules.yunding.vo.*;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -114,6 +111,17 @@
return yunDingService.findOrderAllInfo();
}
+ /**
+ * 转换成USDT
+ */
+// @ApiOperation(value = "转换成USDT")
+// @ApiResponses({
+// @ApiResponse(code = 0, message = "success", response = changeVo.class)
+// })
+// @GetMapping(value = "/findOrderAllInfo")
+// public Result findOrderAllInfo() {
+// return yunDingService.findOrderAllInfo();
+// }
}
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicSettingEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicSettingEntity.java
index 7e294f3..5b50120 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicSettingEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicSettingEntity.java
@@ -38,5 +38,9 @@
* 当前价格
*/
private BigDecimal currentPrice;
+ /**
+ * XCH兑换USDT手续费
+ */
+ private BigDecimal changeXch;
}
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/vo/changeVo.java b/src/main/java/com/xcong/excoin/modules/yunding/vo/changeVo.java
new file mode 100644
index 0000000..d3f588a
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/yunding/vo/changeVo.java
@@ -0,0 +1,23 @@
+package com.xcong.excoin.modules.yunding.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "changeVo", description = "详情")
+public class changeVo {
+
+ @ApiModelProperty("xch余额")
+ private BigDecimal xchAvailableBalance;
+
+ @ApiModelProperty("XCH兑换USDT手续费")
+ private BigDecimal changeXch;
+
+ @ApiModelProperty("当前价格")
+ private BigDecimal xchUsdt;
+
+
+}
--
Gitblit v1.9.1