From 0abd80878ee9045d5317a2dbeff6c20d2dfdabc0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 15:07:32 +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 | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 64 insertions(+), 7 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 8fddea0..5fbb658 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
@@ -65,6 +65,8 @@
private MemberDao memberDao;
@Autowired
private YunDingProducter yunDingProducter;
+ @Autowired
+ private RedisUtils redisUtils;
@Override
public Result findAllInfo() {
@@ -107,10 +109,8 @@
for(YdProductVo ydProductVo : records){
ydProductVo.setProfitT(prifitT);
- if(ydProductVo.getTotalT().compareTo(BigDecimal.ZERO) < 1) {
+ if(ydProductVo.getSurplusT().compareTo(BigDecimal.ZERO) < 1) {
ydProductVo.setStatus(2);
- } else {
- ydProductVo.setStatus(1);
}
}
}
@@ -180,7 +180,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 +205,40 @@
if(ObjectUtil.isEmpty(ydProductEntity)){
return Result.fail("请重新选择产品");
}
+
+ Integer status = ydProductEntity.getStatus();
+ if(YdProductEntity.STATUE_WORK != status){
+ if(YdProductEntity.STATUE_END == status){
+ return Result.fail("产品已售罄");
+ }
+ if(YdProductEntity.STATUE_READY == status){
+ 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();
+ }
+ }
+ int quantityInt = quantity.intValue();
+ if(quantityOwn + quantityInt > limitedNum){
+ return Result.fail("产品限购"+limitedNum);
+ }
+
+// if (quantity.compareTo(BigDecimal.valueOf(ydProductEntity.getLimitedNum())) < 1) {
+// return Result.fail("产品限购" + ydProductEntity.getLimitedNum());
+// }
BigDecimal salePrice = ydProductEntity.getSalePrice();
//剩余产品数量
BigDecimal surplusT = ydProductEntity.getSurplusT();
@@ -230,6 +264,7 @@
ydOrderEntity.setTotalProfit(BigDecimal.ZERO);
ydOrderEntity.setTodayProfit(BigDecimal.ZERO);
ydOrderEntity.setState(YdOrderEntity.ORDER_STATE_READY);
+ ydOrderEntity.setType(YdOrderEntity.PRODUCT_ORDER);
Date date = DateUtil.date();
ydOrderEntity.setBuyTime(date);
//上架天数
@@ -285,6 +320,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){
@@ -298,6 +334,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){
@@ -310,10 +347,11 @@
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)){
- 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;
}
@@ -537,15 +575,34 @@
//更新用户的代理级别
ydOrderDao.updateAgentLevel(memberId,Integer.parseInt(id.toString()));
+ YdOrderEntity orderEntity = new YdOrderEntity();
+ orderEntity.setType(YdOrderEntity.AGENT_ORDER);
+ orderEntity.setMemberId(memberId);
+ orderEntity.setProductId(id);
+ orderEntity.setAmount(salePrice);
+ ydOrderDao.insert(orderEntity);
+
LogRecordUtils.insertMemberAccountMoneyChangeWithId(memberId, "购买代理", salePrice,
"USDT", 1, 8, memberId);
memberEntity.setAgentLevel(id.intValue());
LoginUserUtils.resetAppLoginUser(memberEntity);
yunDingProducter.sendYunDingAutoAgent(memberId);
+ yunDingProducter.sendYunDingUsdtProfit(orderEntity.getId());
return Result.ok("购买成功");
}
+ @Override
+ public Result getXchPrice() {
+ log.info("获取XCH当前价");
+ BigDecimal xchNewPrices = BigDecimal.ZERO;
+ String xchNewPrice = redisUtils.getString("XCH_NEW_PRICE");
+ if(StrUtil.isNotEmpty(xchNewPrice)){
+ xchNewPrices = new BigDecimal(xchNewPrice);
+ }
+ return Result.ok(xchNewPrices);
+ }
+
/**
* 去加减币币账户余额,减少产品的剩余数目
--
Gitblit v1.9.1