From 29af83696fe9d9f50c49cbf2ac1e16a3327a78ea Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 10:00:33 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 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 a8155ed..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
@@ -32,6 +32,7 @@
import com.xcong.excoin.modules.yunding.vo.*;
import com.xcong.excoin.rabbit.producer.YunDingProducter;
import com.xcong.excoin.utils.LogRecordUtils;
+import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -108,8 +109,6 @@
if(ydProductVo.getTotalT().compareTo(BigDecimal.ZERO) < 1) {
ydProductVo.setStatus(2);
- } else {
- ydProductVo.setStatus(1);
}
}
}
@@ -179,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("请输入交易密码");
@@ -203,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();
//剩余产品数量
@@ -229,6 +232,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);
//上架天数
@@ -470,7 +474,6 @@
log.info("购买代理级别");
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
-
/**
* 获取代理级别（Level字段越小，级别越高）
* 不能向下购买代理级别
@@ -537,10 +540,19 @@
//更新用户的代理级别
ydOrderDao.updateAgentLevel(memberId,Integer.parseInt(id.toString()));
+ YdOrderEntity orderEntity = new YdOrderEntity();
+ orderEntity.setType(YdOrderEntity.AGENT_ORDER);
+ orderEntity.setMemberId(memberId);
+ 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("购买成功");
}
--
Gitblit v1.9.1