From 356bc128124c878eb00c0b00e87aad432b9580ad Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 09:59:39 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/yunding/vo/YdProductVo.java | 2 +-
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
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 02c54a4..f78552d 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
@@ -109,8 +109,6 @@
if(ydProductVo.getTotalT().compareTo(BigDecimal.ZERO) < 1) {
ydProductVo.setStatus(2);
- } else {
- ydProductVo.setStatus(1);
}
}
}
@@ -180,7 +178,7 @@
*/
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
-// Long memberId = 28L;
+
String tradePassword = payProductDto.getTradePassword();
if(StrUtil.isEmpty(tradePassword)){
return Result.fail("请输入交易密码");
@@ -205,6 +203,10 @@
if(ObjectUtil.isEmpty(ydProductEntity)){
return Result.fail("请重新选择产品");
}
+
+ if (quantity.compareTo(BigDecimal.valueOf(ydProductEntity.getLimitedNum())) < 1) {
+ return Result.fail("产品限购" + ydProductEntity.getLimitedNum());
+ }
BigDecimal salePrice = ydProductEntity.getSalePrice();
//剩余产品数量
BigDecimal surplusT = ydProductEntity.getSurplusT();
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/vo/YdProductVo.java b/src/main/java/com/xcong/excoin/modules/yunding/vo/YdProductVo.java
index b77d9c9..17bedc5 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/vo/YdProductVo.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/vo/YdProductVo.java
@@ -126,6 +126,6 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endTime;
- @ApiModelProperty("状态 1-在售 2-售罄")
+ @ApiModelProperty("状态 1-在售 2-售罄 3-未开售")
private Integer status;
}
--
Gitblit v1.9.1