From 71a5b265af7b8046cbfd65986d4d0adf785d8cbc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 13 May 2021 18:56:13 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 15 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 95b4b13..8fddea0 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
@@ -30,7 +30,11 @@
import com.xcong.excoin.modules.yunding.entity.YdProductEntity;
import com.xcong.excoin.modules.yunding.service.YunDingService;
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;
import org.springframework.transaction.annotation.Transactional;
@@ -59,6 +63,8 @@
private YdBasicLevelSettingDao ydBasicLevelSettingDao;
@Resource
private MemberDao memberDao;
+ @Autowired
+ private YunDingProducter yunDingProducter;
@Override
public Result findAllInfo() {
@@ -100,6 +106,12 @@
}
for(YdProductVo ydProductVo : records){
ydProductVo.setProfitT(prifitT);
+
+ if(ydProductVo.getTotalT().compareTo(BigDecimal.ZERO) < 1) {
+ ydProductVo.setStatus(2);
+ } else {
+ ydProductVo.setStatus(1);
+ }
}
}
@@ -135,6 +147,12 @@
Integer proCycle = ydProductVo.getProCycle();
Date endTime = DateUtil.offsetDay(workTime, proCycle);
ydProductVo.setEndTime(endTime);
+
+ if (ydProductVo.getTotalT().compareTo(BigDecimal.ZERO) < 1) {
+ ydProductVo.setStatus(2);
+ } else {
+ ydProductVo.setStatus(1);
+ }
return Result.ok(ydProductVo);
}
@@ -224,6 +242,12 @@
ydOrderEntity.setEndTime(endTime);
ydOrderEntity.setReturnState(YdOrderEntity.RETURN_STATE_READY);
ydOrderDao.insert(ydOrderEntity);
+ //生成流水记录
+ LogRecordUtils.insertMemberAccountMoneyChangeWithId(memberId, "购买产品", multiplyUsdt,
+ "USDT", 1, 3, ydOrderEntity.getId());
+
+ yunDingProducter.sendYunDingUsdtProfit(ydOrderEntity.getId());
+ yunDingProducter.sendYunDingAutoAgent(ydOrderEntity.getMemberId());
return Result.ok("支付成功");
}
@@ -330,6 +354,7 @@
log.info("转换成USDT");
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
+// Long memberId = 442L;
ChangeVo changeVo = new ChangeVo();
BigDecimal currentPrice = BigDecimal.ZERO;
Wrapper<YdBasicSettingEntity> queryWrapper = new QueryWrapper<>();
@@ -360,9 +385,12 @@
@Override
@Transactional
public Result insureChangeUsdt(InsureChangeUsdtDto insureChangeUsdtdto) {
- log.info("转换成USDT");
+ log.info("确认转换成USDT");
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
+
+// Long memberId = 442L;
+// MemberEntity memberEntity = memberDao.selectById(memberId);
/**
* 验证入参
*
@@ -386,10 +414,7 @@
if(BigDecimal.ZERO.compareTo(xchNum) >= 0){
return Result.fail("请输入正确的数量");
}
- BigDecimal currentPrice = insureChangeUsdtdto.getCurrentPrice();
- if(BigDecimal.ZERO.compareTo(currentPrice) >= 0){
- return Result.fail("XCH价格异常，请重试");
- }
+
MemberWalletCoinEntity xch = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, "XCH");
BigDecimal totalBalance = xch.getTotalBalance();
BigDecimal subtractTotalBalance = totalBalance.subtract(xchNum);
@@ -407,12 +432,24 @@
xch.setAvailableBalance(subtractAvailableBalance);
memberWalletCoinDao.updateById(xch);
+ BigDecimal currentPrice = BigDecimal.ZERO;
+ //获取当前价
+ Wrapper<YdBasicSettingEntity> queryWrapper = new QueryWrapper<>();
+ List<YdBasicSettingEntity> ydBasicSettingEntities = ydBasicSettingDao.selectList(queryWrapper);
+ if(CollUtil.isNotEmpty(ydBasicSettingEntities)){
+ YdBasicSettingEntity ydBasicSettingEntity = ydBasicSettingEntities.get(0);
+ currentPrice = ydBasicSettingEntity.getCurrentPrice();
+ }
//USDT账户增加
BigDecimal multiply = xchNum.multiply(currentPrice);
MemberWalletCoinEntity usdt = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, "USDT");
usdt.setTotalBalance(usdt.getTotalBalance().add(multiply));
usdt.setAvailableBalance(usdt.getAvailableBalance().add(multiply));
memberWalletCoinDao.updateById(usdt);
+
+ //生成流水记录
+ LogRecordUtils.insertMemberAccountMoneyChangeWithId(memberId, "XCH兑换"+multiply+"USDT", xchNum,
+ "USDT", 1, 7, memberId);
return Result.ok("操作成功");
}
@@ -434,9 +471,6 @@
log.info("购买代理级别");
MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
Long memberId = memberEntity.getId();
-// Long memberId = 442L;
-// MemberEntity memberEntity = memberDao.selectById(memberId);
-
/**
* 获取代理级别（Level字段越小，级别越高）
* 不能向下购买代理级别
@@ -467,17 +501,29 @@
Integer levelTo = ydBasicLevelSettingEntityTo.getLevel();
//获取当前代理级别
Integer agentLevel = memberEntity.getAgentLevel();
- long agentId = Long.parseLong(agentLevel.toString());
+
+ BigDecimal salePrice = ydBasicLevelSettingEntityTo.getSalePrice();
Integer levelNow = 0;
- YdBasicLevelSettingEntity ydBasicLevelSettingEntityNow = ydBasicLevelSettingDao.selectById(agentId);
- if(ObjectUtil.isNotEmpty(ydBasicLevelSettingEntityNow)){
- levelNow = ydBasicLevelSettingEntityNow.getLevel();
- if(levelTo >= levelNow){
- return Result.fail("无法购买");
+ if (agentLevel != null) {
+ long agentId = Long.parseLong(agentLevel.toString());
+ YdBasicLevelSettingEntity ydBasicLevelSettingEntityNow = ydBasicLevelSettingDao.selectById(agentId);
+ if(ObjectUtil.isNotEmpty(ydBasicLevelSettingEntityNow)){
+ levelNow = ydBasicLevelSettingEntityNow.getLevel();
+ if(levelTo.equals(levelNow)){
+ return Result.fail("不能重复购买当前代理");
+ }
+
+ if (levelNow < levelTo) {
+ return Result.fail("不能购买低于当前代理");
+ }
+ }
+
+ //用户如果已经有等级则减少差价
+ if(levelNow != 0){
+ salePrice = salePrice.subtract(ydBasicLevelSettingEntityNow.getSalePrice());
}
}
- BigDecimal salePrice = ydBasicLevelSettingEntityTo.getSalePrice();
//获取用户当前USDT余额
MemberWalletCoinEntity usdt = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, "USDT");
BigDecimal availableBalance = usdt.getAvailableBalance();
@@ -490,6 +536,13 @@
memberWalletCoinDao.updateById(usdt);
//更新用户的代理级别
ydOrderDao.updateAgentLevel(memberId,Integer.parseInt(id.toString()));
+
+ LogRecordUtils.insertMemberAccountMoneyChangeWithId(memberId, "购买代理", salePrice,
+ "USDT", 1, 8, memberId);
+
+ memberEntity.setAgentLevel(id.intValue());
+ LoginUserUtils.resetAppLoginUser(memberEntity);
+ yunDingProducter.sendYunDingAutoAgent(memberId);
return Result.ok("购买成功");
}
--
Gitblit v1.9.1