From 0dda2d310ef745ce29a1e5ff7fac0da6f5948012 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 18:50:19 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 196 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 169 insertions(+), 27 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 f6ca013..c92ab72 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.coin.dao.MemberAccountFlowEntityDao;
import com.xcong.excoin.modules.coin.entity.MemberAccountFlowEntity;
+import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
@@ -12,8 +13,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,6 +26,7 @@
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CacheSettingUtils;
import com.xcong.excoin.utils.CalculateUtil;
+import com.xcong.excoin.utils.CoinTypeConvert;
import com.xcong.excoin.utils.ThreadPoolUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
@@ -67,6 +71,10 @@
@Resource
private MemberAccountFlowEntityDao memberAccountFlowEntityDao;
+ @Resource
+ private MemberSettingDao memberSettingDao;
+ @Resource
+ private ContractHoldOrderDao contractHoldOrderDao;
public void dealOrderFromMq(List<OrderModel> list, Integer type) {
@@ -172,33 +180,38 @@
.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.getOpeningFeeAmount())), 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);
- contractEntrustOrderService.removeById(order.getId());
+ 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, "止盈平仓");
@@ -260,22 +273,26 @@
.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.getOpeningFeeAmount())), 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);
@@ -287,8 +304,8 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
@@ -357,18 +374,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.getOpeningFeeAmount())), 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);
//总退回金额=保证金+收益-手续费
@@ -376,7 +396,8 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "开多止损平仓");
@@ -420,7 +441,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) {
@@ -444,18 +465,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);
//总退回金额=保证金+收益-手续费
@@ -463,7 +488,7 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "开空止损平仓");
@@ -498,6 +523,12 @@
if (CollectionUtils.isNotEmpty(orderList)) {
ContractHoldOrderEntity contractHoldOrderEntity = null;
for (ContractEntrustOrderEntity coinsCoinsOrder : orderList) {
+ // 全仓委托
+ if (coinsCoinsOrder.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ALL) {
+ wholeEntrustOrder(coinsCoinsOrder);
+ continue;
+ }
+
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(coinsCoinsOrder.getMemberId(), "USDT");
if (wallet == null) {
continue;
@@ -540,6 +571,7 @@
contractHoldOrderEntity.setLeverRatio(coinsCoinsOrder.getLeverRatio());
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
+ contractHoldOrderEntity.setOperateNo(1);
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -547,6 +579,7 @@
contractOrderEntity.setEntrustOpeningPrice(coinsCoinsOrder.getEntrustPrice());
contractOrderEntity.setEntrustTime(coinsCoinsOrder.getCreateTime());
contractOrderEntity.setOpeningTime(new Date());
+
contractOrderEntity.setId(null);
contractOrderService.save(contractOrderEntity);
// 发送爆仓的队列
@@ -563,12 +596,105 @@
// 扣除手续费
BigDecimal totalBalance = openFeePrice.negate();
contractEntrustOrderService.removeById(coinsCoinsOrder.getId());
- memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(null, totalBalance, coinsCoinsOrder.getBondAmount().negate(), wallet.getId());
//返佣
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
}
}
+ }
+
+ private void wholeEntrustOrder(ContractEntrustOrderEntity entrustOrder) {
+ log.info("全仓委托逻辑处理:{}", entrustOrder.getOrderNo());
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(entrustOrder.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrder.getSymbol()));
+
+ PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
+ MemberEntity member = memberService.getById(entrustOrder.getMemberId());
+
+ // 手续费
+ BigDecimal openFeePrice = CalculateUtil.getOpenFeePrice(entrustOrder.getEntrustPrice(), entrustOrder.getSymbolSku(), entrustOrder.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
+
+ ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(entrustOrder.getMemberId(), entrustOrder.getEntrustType(), entrustOrder.getSymbol());
+ // 判断持仓是否存在，若不存在则创建新的持仓订单
+ if (wholeHoldOrder == null) {
+ log.info("持仓不存在");
+ ContractHoldOrderEntity holdOrderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToHoldOrder(entrustOrder);
+
+ int type = entrustOrder.getEntrustType();
+ if (type == 1) {
+ // 开多
+ holdOrderEntity.setOpeningType(ContractHoldOrderEntity.OPENING_TYPE_MORE);
+ } else {
+ // 开空
+ holdOrderEntity.setOpeningType(ContractHoldOrderEntity.OPENING_TYPE_LESS);
+ }
+
+ holdOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
+ holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCnt());
+ holdOrderEntity.setOpeningFeeAmount(openFeePrice);
+ holdOrderEntity.setOpeningPrice(entrustOrder.getEntrustPrice());
+ holdOrderEntity.setMarkPrice(entrustOrder.getEntrustPrice());
+ holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N);
+ holdOrderEntity.setOperateNo(1);
+ // 设置合约类型
+ holdOrderEntity.setContractType(ContractOrderEntity.CONTRACTTYPE_NORMAL);
+
+ ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
+ contractOrderEntity.setOpeningTime(new Date());
+ contractHoldOrderDao.insert(holdOrderEntity);
+
+ boolean isSuccess = contractOrderService.save(contractOrderEntity);
+
+ if (isSuccess) {
+ contractEntrustOrderService.removeById(entrustOrder.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(null, openFeePrice.negate(), entrustOrder.getBondAmount().negate(), wallet.getId());
+
+ // 发送强平价
+ ThreadPoolUtils.sendWholeForceClosingPrice(entrustOrder.getSymbol(), member);
+
+ //返佣
+ ThreadPoolUtils.calReturnMoney(member.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
+ }
+
+ return;
+ }
+
+ log.info("持仓存在");
+ ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(wholeHoldOrder);
+ contractOrderEntity.setBondAmount(entrustOrder.getBondAmount().add(openFeePrice));
+ contractOrderEntity.setOpeningPrice(entrustOrder.getEntrustPrice());
+ contractOrderEntity.setSymbolCnt(entrustOrder.getSymbolCnt());
+ contractOrderEntity.setOpeningTime(new Date());
+ contractOrderEntity.setMarkPrice(entrustOrder.getEntrustPrice());
+ contractOrderEntity.setOpeningFeeAmount(openFeePrice);
+ contractOrderService.save(contractOrderEntity);
+
+ BigDecimal totalPrice = entrustOrder.getEntrustPrice().multiply(BigDecimal.valueOf(entrustOrder.getSymbolCnt()));
+ BigDecimal newOpenPrice = totalPrice.add(wholeHoldOrder.getOpeningPrice().multiply(BigDecimal.valueOf(wholeHoldOrder.getSymbolCnt()))).divide(BigDecimal.valueOf(entrustOrder.getSymbolCnt() + wholeHoldOrder.getSymbolCntSale()), 8, BigDecimal.ROUND_DOWN);
+ // 保证金
+ BigDecimal bondAmount = entrustOrder.getBondAmount();
+ // 手续费
+ BigDecimal fee = CalculateUtil.getOpenFeePrice(entrustOrder.getEntrustPrice(), entrustOrder.getSymbolSku(), entrustOrder.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
+ // 预付款
+ BigDecimal prePaymentAmount = wholeHoldOrder.getPrePaymentAmount().add(entrustOrder.getEntrustAmount());
+
+ wholeHoldOrder.setSymbolCnt(wholeHoldOrder.getSymbolCnt() + entrustOrder.getSymbolCnt());
+ wholeHoldOrder.setSymbolCntSale(wholeHoldOrder.getSymbolCntSale() + entrustOrder.getSymbolCnt());
+ wholeHoldOrder.setOpeningFeeAmount(wholeHoldOrder.getOpeningFeeAmount().add(fee));
+ wholeHoldOrder.setOpeningPrice(newOpenPrice);
+ wholeHoldOrder.setBondAmount(wholeHoldOrder.getBondAmount().add(bondAmount));
+ wholeHoldOrder.setPrePaymentAmount(prePaymentAmount);
+ wholeHoldOrder.setOperateNo(wholeHoldOrder.getOperateNo() + 1);
+ contractHoldOrderService.updateById(wholeHoldOrder);
+
+ contractEntrustOrderService.removeById(entrustOrder.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(null, openFeePrice.negate(), entrustOrder.getBondAmount().negate(), wallet.getId());
+
+ // 发送强平价
+ ThreadPoolUtils.sendWholeForceClosingPrice(entrustOrder.getSymbol(), member);
+
+ //返佣
+ ThreadPoolUtils.calReturnMoney(member.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
}
/**
@@ -614,13 +740,18 @@
if (isDone) {
//删除次仓订单
contractHoldOrderService.removeById(orderId);
-
+ // 订单状态转换
+ 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);
contractOrderEntity.setClosingPrice(nowPrice);
contractOrderEntity.setClosingTime(new Date());
- contractOrderEntity.setRewardAmount(coinsOrder.getPrePaymentAmount().negate());
+ contractOrderEntity.setClosingFeeAmount(coinsOrder.getOpeningFeeAmount());
+ contractOrderEntity.setRewardAmount(coinsOrder.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate());
contractOrderService.save(contractOrderEntity);
//更新用户钱包数据
@@ -628,7 +759,7 @@
// 减去的时候用负数
BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
- memberWalletContractService.increaseWalletContractBalanceById(null, totalPrice, totalPrice, usdt.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(null, totalPrice, null, usdt.getId());
// 流水记录 TODO
MemberAccountFlowEntity record = new MemberAccountFlowEntity();
record.setCreateTime(new Date());
@@ -645,12 +776,17 @@
}
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);
@@ -676,24 +812,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();
@@ -704,7 +844,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());
--
Gitblit v1.9.1