From a7fb817bd2eca82189dc322f6fd7d107deac29ba Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 11 May 2021 17:42:01 +0800
Subject: [PATCH] 20210510 云顶
---
src/main/java/com/xcong/excoin/modules/yunding/controller/YunDingController.java | 4 ++++
src/main/java/com/xcong/excoin/modules/yunding/dto/PayProductDto.java | 7 +++++++
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 27 +++++++++++++++++++++++++++
3 files changed, 38 insertions(+), 0 deletions(-)
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 9c5568f..3e01097 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
@@ -6,6 +6,7 @@
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 io.swagger.annotations.*;
@@ -28,6 +29,9 @@
* 全网数据
*/
@ApiOperation(value = "全网数据")
+ @ApiResponses({
+ @ApiResponse(code = 0, message = "success", response = YdBasicSettingVo.class)
+ })
@GetMapping(value = "/findAllInfo")
public Result findAllInfo() {
return yunDingService.findAllInfo();
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/dto/PayProductDto.java b/src/main/java/com/xcong/excoin/modules/yunding/dto/PayProductDto.java
index 28b7e00..1eed644 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/dto/PayProductDto.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/dto/PayProductDto.java
@@ -23,4 +23,11 @@
@ApiModelProperty(value = "购买数量", example = "2")
private BigDecimal quantity;
+ /**
+ * 资金交易密码
+ */
+ @NotNull
+ @ApiModelProperty(value = "交易密码", example = "2")
+ private String tradePassword;
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
index 1836528..918e357 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
@@ -5,6 +5,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -83,6 +84,20 @@
//MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Page<YdProductVo> page = new Page<>(ydProductListDto.getPageNum(), ydProductListDto.getPageSize());
IPage<YdProductVo> list = ydProductDao.getProductList(page, ydProductListDto);
+ List<YdProductVo> records = list.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ //预计收益
+ BigDecimal prifitT = BigDecimal.ZERO;
+ Wrapper<YdBasicSettingEntity> queryWrapper = new QueryWrapper<>();
+ List<YdBasicSettingEntity> ydBasicSettingEntities = ydBasicSettingDao.selectList(queryWrapper);
+ if(CollUtil.isNotEmpty(ydBasicSettingEntities)){
+ prifitT = ydBasicSettingEntities.get(0).getPrifitT();
+ }
+ for(YdProductVo ydProductVo : records){
+ ydProductVo.setProfitT(prifitT);
+ }
+ }
+
return Result.ok(list);
}
@@ -143,6 +158,18 @@
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
// Long memberId = 28L;
+ String tradePassword = payProductDto.getTradePassword();
+ if(StrUtil.isEmpty(tradePassword)){
+ return Result.fail("请输入交易密码");
+ }
+ String tradePasswordOwn = memberEntity.getTradePassword();
+ if(StrUtil.isEmpty(tradePasswordOwn)){
+ return Result.fail("请设置交易密码");
+ }
+ String tradePasswords = SecureUtil.md5(tradePassword);
+ if(!StrUtil.equals(tradePasswordOwn,tradePasswords)){
+ return Result.fail("请输入正确的交易密码");
+ }
BigDecimal quantity = payProductDto.getQuantity();
if(ObjectUtil.isEmpty(quantity)){
return Result.fail("请输入购买数量");
--
Gitblit v1.9.1