From a1560583ab4dba589acb64238970fdebdea20233 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 10:36:16 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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..0e979f0 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("请输入交易密码");
@@ -204,6 +202,10 @@
YdProductEntity ydProductEntity = ydProductDao.selectById(id);
if(ObjectUtil.isEmpty(ydProductEntity)){
return Result.fail("请重新选择产品");
+ }
+
+ if (quantity.compareTo(BigDecimal.valueOf(ydProductEntity.getLimitedNum())) < 1) {
+ return Result.fail("产品限购" + ydProductEntity.getLimitedNum());
}
BigDecimal salePrice = ydProductEntity.getSalePrice();
//剩余产品数量
@@ -286,6 +288,7 @@
BigDecimal totalProfitAll = BigDecimal.ZERO;
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("member_id",memberId);
+ objectQueryWrapper.eq("type",YdOrderEntity.PRODUCT_ORDER);
List<YdOrderEntity> ydOrderEntities = ydOrderDao.selectList(objectQueryWrapper);
if(CollUtil.isNotEmpty(ydOrderEntities)){
for(YdOrderEntity order : ydOrderEntities){
@@ -299,6 +302,7 @@
QueryWrapper<YdOrderEntity> powerNowQuery = new QueryWrapper<>();
powerNowQuery.eq("member_id",memberId);
powerNowQuery.eq("state",YdOrderEntity.ORDER_STATE_WORK);
+ powerNowQuery.eq("type",YdOrderEntity.PRODUCT_ORDER);
List<YdOrderEntity> PowerNowQuery = ydOrderDao.selectList(powerNowQuery);
if(CollUtil.isNotEmpty(PowerNowQuery)){
for(YdOrderEntity order : PowerNowQuery){
@@ -311,6 +315,7 @@
int powerReady = 0;
QueryWrapper<YdOrderEntity> powerReradyQuery = new QueryWrapper<>();
powerReradyQuery.eq("member_id",memberId);
+ powerReradyQuery.eq("type",YdOrderEntity.PRODUCT_ORDER);
powerReradyQuery.eq("state",YdOrderEntity.ORDER_STATE_READY);
List<YdOrderEntity> PowerReradyQuery = ydOrderDao.selectList(powerReradyQuery);
if(CollUtil.isNotEmpty(PowerReradyQuery)){
--
Gitblit v1.9.1