From 0a616f122f8420accd4d3bb163160ba1c2fe2720 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 10:54:49 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 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 0e979f0..625964e 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
@@ -204,6 +204,24 @@
return Result.fail("请重新选择产品");
}
+ //限购总量
+ Integer limitedNum = ydProductEntity.getLimitedNum();
+ //获取目前待生效，已生效的总T数
+ int quantityOwn = 0;
+ QueryWrapper<YdOrderEntity> powerReradyQuery = new QueryWrapper<>();
+ powerReradyQuery.eq("member_id",memberId);
+ powerReradyQuery.eq("product_id",payProductDto.getId());
+ powerReradyQuery.eq("type",YdOrderEntity.PRODUCT_ORDER);
+ powerReradyQuery.ne("state",YdOrderEntity.ORDER_STATE_END);
+ List<YdOrderEntity> powerReradyQuerys = ydOrderDao.selectList(powerReradyQuery);
+ if(CollUtil.isNotEmpty(powerReradyQuerys)){
+ for(YdOrderEntity ydOrderEntity : powerReradyQuerys){
+ quantityOwn = quantityOwn + ydOrderEntity.getQuantity();
+ }
+ }
+ if(quantityOwn >= limitedNum){
+ return Result.fail("产品限购"+limitedNum);
+ }
if (quantity.compareTo(BigDecimal.valueOf(ydProductEntity.getLimitedNum())) < 1) {
return Result.fail("产品限购" + ydProductEntity.getLimitedNum());
}
@@ -317,9 +335,9 @@
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)){
- for(YdOrderEntity order : PowerReradyQuery){
+ List<YdOrderEntity> powerReradyQuerys = ydOrderDao.selectList(powerReradyQuery);
+ if(CollUtil.isNotEmpty(powerReradyQuerys)){
+ for(YdOrderEntity order : powerReradyQuerys){
int quantity = order.getQuantity();
powerReady = powerReady + quantity;
}
@@ -546,6 +564,7 @@
YdOrderEntity orderEntity = new YdOrderEntity();
orderEntity.setType(YdOrderEntity.AGENT_ORDER);
orderEntity.setMemberId(memberId);
+ orderEntity.setProductId(id);
orderEntity.setAmount(salePrice);
ydOrderDao.insert(orderEntity);
--
Gitblit v1.9.1