From 28eb26d68f7a2a4e6b316c3ea9f511aa143db66e Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:18 +0800
Subject: [PATCH] 55测试环境
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 143 ++++++++++++++++++++++++++++-------------------
1 files changed, 84 insertions(+), 59 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index cb215e9..93b135e 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -12,8 +12,10 @@
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.contract.service.ContractOrderService;
import com.xcong.excoin.modules.member.dao.AgentReturnDao;
+import com.xcong.excoin.modules.member.dao.MemberSettingDao;
import com.xcong.excoin.modules.member.entity.AgentReturnEntity;
import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberSettingEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.modules.member.parameter.vo.NeedMoneyMemberVo;
import com.xcong.excoin.modules.member.service.MemberService;
@@ -23,8 +25,11 @@
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CacheSettingUtils;
import com.xcong.excoin.utils.CalculateUtil;
+import com.xcong.excoin.utils.ThreadPoolUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -34,6 +39,7 @@
/**
* @author helius
*/
+@Slf4j
@Service
public class OrderWebsocketServiceImpl {
@@ -63,6 +69,8 @@
@Resource
private MemberAccountFlowEntityDao memberAccountFlowEntityDao;
+ @Resource
+ private MemberSettingDao memberSettingDao;
public void dealOrderFromMq(List<OrderModel> list, Integer type) {
@@ -122,6 +130,7 @@
/**
* 开多止盈
*/
+ @Transactional(rollbackFor = Exception.class)
public void dealForMoreStopPro(List<ContractHoldOrderEntity> orderList, List<OrderModel> list) {
if (CollectionUtils.isNotEmpty(orderList)) {
Map<Long, BigDecimal> modelMap = new HashMap<Long, BigDecimal>();
@@ -167,38 +176,44 @@
.multiply(new BigDecimal(currentFlat))
.multiply(symbolSku).setScale(8, BigDecimal.ROUND_DOWN);
MemberEntity memberEntity = memberService.getById(memberId);
-
+ MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(memberId);
+ log.info("划点前:{}", profitLossPrice);
+ profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.subtract(memberSettingEntity.getClosingSpread().divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN)));
+ log.info("划点后:{}", profitLossPrice);
if (memberEntity.getIsProfit() == 1) {
PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
if (profitLossPrice.compareTo(BigDecimal.ZERO) > 0) {
profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.subtract(tradeSetting.getProfitParam()));
} else {
- profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
+// profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
contractOrderEntity.setClosingPrice(closePrice);
contractOrderEntity.setClosingType(6);
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
totalReturn = needReturn.subtract(contractOrderEntity.getClosingFeeAmount());
- // 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
// 流水记录 TODO 531e
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -236,7 +251,7 @@
System.out.println("执行操作");
String symbol = order.getSymbol();
// 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ BigDecimal prePrice = order.getBondAmount();
Long memberId = order.getMemberId();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -254,24 +269,30 @@
.multiply(new BigDecimal(currentFlat + ""))
.multiply(symbolSku).setScale(8, BigDecimal.ROUND_DOWN);
MemberEntity memberEntity = memberService.getById(memberId);
-
+ MemberSettingEntity memberSettingEntity = memberSettingDao.selectMemberSettingByMemberId(memberId);
+ log.info("划点前:{}", profitLossPrice);
+ profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.subtract(memberSettingEntity.getClosingSpread().divide(BigDecimal.valueOf(100), 4, BigDecimal.ROUND_DOWN)));
+ log.info("划点后:{}", profitLossPrice);
if (memberEntity.getIsProfit() == 1) {
PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
if (profitLossPrice.compareTo(BigDecimal.ZERO) > 0) {
profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.subtract(tradeSetting.getProfitParam()));
} else {
- profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
+// profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
contractOrderEntity.setClosingPrice(closePrice);
contractOrderEntity.setClosingType(7);
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -279,13 +300,13 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -325,7 +346,7 @@
String symbol = order.getSymbol();
Long memberId = order.getMemberId();
// 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ BigDecimal prePrice = order.getBondAmount();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -349,18 +370,21 @@
if (profitLossPrice.compareTo(BigDecimal.ZERO) > 0) {
profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.subtract(tradeSetting.getProfitParam()));
} else {
- profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
+// profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
contractOrderEntity.setClosingPrice(closePrice);
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
contractOrderEntity.setClosingType(8);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -368,12 +392,13 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "开多止损平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -412,7 +437,7 @@
String symbol = order.getSymbol();
Long memberId = order.getMemberId();
// 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ BigDecimal prePrice = order.getBondAmount();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -436,18 +461,22 @@
if (profitLossPrice.compareTo(BigDecimal.ZERO) > 0) {
profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.subtract(tradeSetting.getProfitParam()));
} else {
- profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
+// profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
}
}
//回报率
- BigDecimal returnRate = profitLossPrice.divide((order.getPrePaymentAmount().subtract(contractOrderEntity.getClosingFeeAmount())), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
contractOrderEntity.setClosingFeeAmount(order.getOpeningFeeAmount());
contractOrderEntity.setClosingPrice(closePrice);
contractOrderEntity.setClosingType(9);
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
+
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -455,13 +484,12 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "开空止损平仓");
//返佣
- calYj(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, 2);
-
+ ThreadPoolUtils.calReturnMoney(order.getMemberId(), order.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
}
}
}
@@ -533,6 +561,7 @@
contractHoldOrderEntity.setLeverRatio(coinsCoinsOrder.getLeverRatio());
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
+ contractHoldOrderEntity.setOperateNo(1);
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -540,6 +569,7 @@
contractOrderEntity.setEntrustOpeningPrice(coinsCoinsOrder.getEntrustPrice());
contractOrderEntity.setEntrustTime(coinsCoinsOrder.getCreateTime());
contractOrderEntity.setOpeningTime(new Date());
+
contractOrderEntity.setId(null);
contractOrderService.save(contractOrderEntity);
// 发送爆仓的队列
@@ -556,9 +586,10 @@
// 扣除手续费
BigDecimal totalBalance = openFeePrice.negate();
contractEntrustOrderService.removeById(coinsCoinsOrder.getId());
- memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, null, wallet.getId());
- // TODO 531 待写
- calYj(memId, openFeePrice, contractOrderEntity, 1);
+ memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, coinsCoinsOrder.getBondAmount().negate(), wallet.getId());
+
+ //返佣
+ ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
}
}
}
@@ -569,15 +600,11 @@
* @param
*/
public void dealCoinOut(List<ContractHoldOrderEntity> orderList, List<OrderModel> orderModels) {
- // 需要比较查询到的和消息发来的单的爆仓操作次序号是否相同
- // 构建map
-
if (CollectionUtils.isNotEmpty(orderList)) {
Map<Long, Integer> modelMap = new HashMap<Long, Integer>();
for (OrderModel model : orderModels) {
modelMap.put(model.getOrderId(), model.getOperateNo());
}
- // TradeSetting tradeSetting = tradeMapper.findTradeSetting();
for (ContractHoldOrderEntity coinsOrder : orderList) {
Long orderId = coinsOrder.getId();
Integer operateNo = coinsOrder.getOperateNo();
@@ -589,9 +616,6 @@
}
boolean isDone = false;
Long memId = coinsOrder.getMemberId();
- MemberEntity byId = memberService.getById(memId);
- String symbol = coinsOrder.getSymbol();
- //TradeSymbolSku symbolSku = tradeMapper.findSymbolSkubySymbol(symbol);
BigDecimal nowPrice = coinsOrder.getForceClosingPrice();
// 创建订单(加入历史表的订单)
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(coinsOrder);
@@ -613,31 +637,25 @@
if (isDone) {
//删除次仓订单
contractHoldOrderService.removeById(orderId);
-
- //系统自动平仓（爆仓）
-// Double closingPrice = nowPrice
-// .multiply(new BigDecimal(tradeSetting.getClosingRatio()).divide(new BigDecimal(100), 8, BigDecimal.ROUND_DOWN))
-// .multiply(symbolSku.getLotNumber())// 规格
-// .multiply(new BigDecimal(coinsOrder.getSymbolSkuNumber()))
-// .setScale(8, BigDecimal.ROUND_DOWN).doubleValue();
+ // 订单状态转换
+ if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
+ } else {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
+ }
//更新主表订单状态位为“已平仓”
contractOrderEntity.setId(null);
- contractOrderEntity.setClosingPrice(BigDecimal.ZERO);
- //order.setPayTotalPrice(coinsOrder.getPrePrice()+coinsOrder.getClosingPrice());// 总支付金额(预付款)
-
contractOrderEntity.setClosingPrice(nowPrice);
contractOrderEntity.setClosingTime(new Date());
- contractOrderEntity.setRewardAmount((coinsOrder.getOpeningFeeAmount().multiply(new BigDecimal("2")).subtract(coinsOrder.getPrePaymentAmount())));
- //order.setRewardRatio(-(coinsOrder.getPrePrice() - (2*coinsOrder.getClosingPrice())));
+ contractOrderEntity.setClosingFeeAmount(coinsOrder.getOpeningFeeAmount());
+ contractOrderEntity.setRewardAmount(coinsOrder.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate());
contractOrderService.save(contractOrderEntity);
//更新用户钱包数据
MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
- // Double totalPrice = wallet.getTotalBalance() - coinsOrder.getPrePrice();
// 减去的时候用负数
- BigDecimal totalPrice = coinsOrder.getPrePaymentAmount().negate();
- //Double totalPrice = - coinsOrder.getPrePrice();
+ BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
memberWalletContractService.increaseWalletContractBalanceById(null, totalPrice, null, usdt.getId());
// 流水记录 TODO
MemberAccountFlowEntity record = new MemberAccountFlowEntity();
@@ -647,21 +665,25 @@
record.setBalance(usdt.getAvailableBalance());
record.setMemberId(memId);
record.setSymbol(coinsOrder.getSymbol());
- record.setPrice(coinsOrder.getPrePaymentAmount());
+ record.setPrice(coinsOrder.getBondAmount());
memberAccountFlowEntityDao.insert(record);
}
}
}
}
-
public void calYj(Long mid, BigDecimal money, ContractOrderEntity order, int type) {
+ PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
if (money != null) {
- money = money.multiply(new BigDecimal(0.7868));
+ money = money.multiply(tradeSetting.getFeeSpreadRatio());
}
MemberEntity member = memberService.getById(mid);
String[] referenceIds = member.getRefererIds().split(",");
List<String> ids = Arrays.asList(referenceIds);
+
+ if (MemberEntity.ACCOUNT_TYPE_TEST.equals(member.getAccountType())) {
+ return;
+ }
// 判断该用户是否为代理商
NeedMoneyMemberVo needMoneyMember = memberService.selectFriendRelationUserByMemberId(mid);
@@ -687,24 +709,28 @@
// 存放uid以及对应uid用户的佣金
- Map<String, BigDecimal> map = new HashMap<>();
+ Map<String, Map<String, BigDecimal>> map = new HashMap<>();
Iterator<Map.Entry<Integer, NeedMoneyMemberVo>> it = treeMap.entrySet().iterator();
BigDecimal lastRate = BigDecimal.ZERO;
BigDecimal lastYj = BigDecimal.ZERO;
while (it.hasNext()) {
Map.Entry<Integer, NeedMoneyMemberVo> entry = it.next();
NeedMoneyMemberVo member1 = entry.getValue();
+ Map<String, BigDecimal> returnValue = new HashMap<>();
+ returnValue.put("ratio", member1.getReturnRatio());
+ returnValue.put("lastRate", lastRate);
// 上下级佣金比率相减后乘以手续费 -- 即用户所得佣金
lastYj = (member1.getReturnRatio().subtract(lastRate)).multiply(money);
lastRate = member1.getReturnRatio();
- map.put(member1.getInviteId(), lastYj);
+ returnValue.put("returnMoney", lastYj);
+ map.put(member1.getInviteId(), returnValue);
}
// 输出对应佣金是否正确
- Iterator<Map.Entry<String, BigDecimal>> it1 = map.entrySet().iterator();
+ Iterator<Map.Entry<String, Map<String, BigDecimal>>> it1 = map.entrySet().iterator();
List<AgentReturnEntity> agentList = new ArrayList<AgentReturnEntity>();
while (it1.hasNext()) {
- Map.Entry<String, BigDecimal> entry = it1.next();
+ Map.Entry<String, Map<String, BigDecimal>> entry = it1.next();
// System.out.println(entry.getKey() + "-----" + entry.getValue());
MemberEntity agentMember = memberService.selectMemberInfoByInviteId(entry.getKey());
AgentReturnEntity agent = new AgentReturnEntity();
@@ -715,7 +741,9 @@
agent.setOrderType(order.getOrderType());
agent.setReturnSymbol(order.getSymbol());
agent.setIsReturn(0);
- agent.setReturnAmount(entry.getValue());
+ agent.setReturnAmount(entry.getValue().get("returnMoney"));
+ agent.setChildReturnRatio(entry.getValue().get("lastRate"));
+ agent.setReturnRatio(entry.getValue().get("ratio"));
agent.setClosingType(order.getClosingType());
if (type == 1) {//开仓
agent.setOpeningFeeAmount(order.getOpeningFeeAmount());
@@ -727,8 +755,5 @@
agent.setInviteId(entry.getKey());
agentReturnDao.insert(agent);
}
-
-
}
-
}
--
Gitblit v1.9.1