From 7fe6d6283dfda883bb50617b1aaeb83b2046f8df Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Wed, 27 May 2020 16:17:03 +0800
Subject: [PATCH] 卖出接口
---
src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java | 12 ------------
src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java | 5 ++---
src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java b/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
index a1a9da2..8b7b99a 100644
--- a/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
+++ b/src/main/java/com/xcong/excoin/modules/home/controller/MemberQuickBuySaleController.java
@@ -83,16 +83,15 @@
return memberQuickBuySaleService.cancelRecharge(id);
}
- @ApiOperation(value = "sell", notes = "USDT快速充值")
+ @ApiOperation(value = "sell", notes = "USDT快速卖出")
@RequestMapping(value = "/sell", method = RequestMethod.POST)
- public Result sell(MemberQuickBuySaleDto memberQuickBuySaleDto) {
+ public Result sell(@RequestBody @Valid MemberQuickBuySaleDto memberQuickBuySaleDto) {
// 获取当前登录用户
MemberEntity member = LoginUserUtils.getAppLoginUser();
if (MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
return Result.fail("请先实名认证");
}
String tradePasswordWeb = memberQuickBuySaleDto.getTradePassword();
-
// 验证支付密码
String tradePassword = member.getTradePassword();
diff --git a/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java b/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
index 551a71c..829d135 100644
--- a/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/home/service/impl/MemberQuickBuySaleServiceImpl.java
@@ -63,20 +63,10 @@
int ran = (int) (Math.random() * 10000000);
memberQuickBuySaleEntity.setPaymentCode(ran + "");
-
-// int total = paymentMethodList.size();
-// int index = (int) (Math.random() * total);
-// PlatformPaymentMethodEntity paymemtMethod = paymentMethodList.get(index);
-// memberQuickBuySaleEntity.setPaymentName(paymemtMethod.getName());
-// memberQuickBuySaleEntity.setPaymentAccount(paymemtMethod.getAccount());
memberQuickBuySaleDao.insert(memberQuickBuySaleEntity);
MemberQuickBuySaleVo memberQuickBuySaleVo = new MemberQuickBuySaleVo();
memberQuickBuySaleVo.setId(memberQuickBuySaleEntity.getId());
// 返回前台付款方式
-// memberQuickBuySaleVo.setPlatforPaymentMethodList(paymentMethodList);
-// memberQuickBuySaleEntity.setReceiveMethod(payMethodList.get(index));
- // 返回前台付款方式
-// memberChargeUsdt.setReceiveMethod(payMethodList.get(index));
return Result.ok(memberQuickBuySaleVo);
}
@@ -100,7 +90,6 @@
public Result selectById(Long id) {
MemberQuickBuySaleEntity memberQuickBuySaleEntity = memberQuickBuySaleDao.selectById(id);
MemberQuickBuySaleVo memberQuickBuySaleVo = MemberQuickBuySaleEntityMapper.INSTANCE.entityToVo(memberQuickBuySaleEntity);
-
// 收款信息
QueryWrapper<PlatformPaymentMethodEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("status", "1");
@@ -134,7 +123,6 @@
if (extractUsdt.compareTo(walletCoin.getAvailableBalance())==1) {
return Result.fail("您当前可用USDT额度不够");
}
-
// 判断是否存在收款方式
List<MemberPaymentMethodEntity> payMentMethodList = memberPaymentMethodDao.selectByMemberId(member.getId());
diff --git a/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java b/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
new file mode 100644
index 0000000..176f278
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/home/vo/MemberQuickBuySaleDetailVo.java
@@ -0,0 +1,39 @@
+package com.xcong.excoin.modules.home.vo;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.xcong.excoin.modules.platform.entity.PlatformPaymentMethodEntity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value = "会员快捷买入卖出", description = "会员快捷买入卖出类")
+public class MemberQuickBuySaleDetailVo {
+
+ @ApiModelProperty(value = "订单Id")
+ private Long id;
+ @ApiModelProperty(value = "用户id")
+ private Long memberId;
+ @ApiModelProperty(value = "金额(人民币)")
+ private BigDecimal amountCny;
+ @ApiModelProperty(value = "金额(USDT)")
+ private BigDecimal amountUsdt;
+ @ApiModelProperty(value = "付款方式 1-支付宝2-微信3-银行卡")
+ private Integer paymentType;
+ @ApiModelProperty(value = "支付码")
+ private String paymentCode;
+ @ApiModelProperty(value = "单价")
+ private BigDecimal unitPrice;
+ @ApiModelProperty(value = "订单状态 1-新建2-已付款3-已审核4-撤单5-系统取消")
+ private int orderStatus;
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+ @ApiModelProperty(value = "订单类型 B买入 S卖出")
+ private String orderType;
+ @ApiModelProperty(value = "剩余时间")
+ private Long timeLeft;
+ @ApiModelProperty(value = "平台收款方式")
+ private List<PlatformPaymentMethodEntity> platforPaymentMethodList;
+}
--
Gitblit v1.9.1