From c428522a1d47199b30acf4522a33c88f54180fdd Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 30 Mar 2021 21:52:45 +0800
Subject: [PATCH] 20210329 返利记录的修改
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
index f51d58b..a081a3e 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/FollowOrderOperationServiceImpl.java
@@ -7,9 +7,11 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
+import com.xcong.excoin.common.enumerates.MemberWalletCoinEnum;
import com.xcong.excoin.common.enumerates.RabbitPriceTypeEnum;
import com.xcong.excoin.common.response.Result;
import com.xcong.excoin.common.system.service.CommonService;
+import com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange;
import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
@@ -18,10 +20,7 @@
import com.xcong.excoin.modules.contract.mapper.ContractHoldOrderEntityMapper;
import com.xcong.excoin.modules.contract.service.RabbitOrderService;
import com.xcong.excoin.modules.documentary.common.NoticeConstant;
-import com.xcong.excoin.modules.documentary.dao.FollowFollowerOrderRelationDao;
-import com.xcong.excoin.modules.documentary.dao.FollowFollowerProfitDao;
-import com.xcong.excoin.modules.documentary.dao.FollowFollowerSettingDao;
-import com.xcong.excoin.modules.documentary.dao.FollowTraderInfoDao;
+import com.xcong.excoin.modules.documentary.dao.*;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerOrderRelationEntity;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerProfitEntity;
import com.xcong.excoin.modules.documentary.entity.FollowFollowerSettingEntity;
@@ -88,6 +87,8 @@
@Autowired
private FollowProducer followProducer;
+ @Autowired
+ private FollowTraderProfitDetailDao followTraderProfitDetailDao;
@Override
@@ -263,11 +264,48 @@
public void closingFollowOrders(String orderNo) {
List<FollowFollowerOrderRelationEntity> orderRelations = followFollowerOrderRelationDao.selectFollowHoldOrderByTradeOrderNo(orderNo);
if (CollUtil.isNotEmpty(orderRelations)) {
+ List<Long> orderIds = new ArrayList<>();
for (FollowFollowerOrderRelationEntity orderRelation : orderRelations) {
List<Long> ids= new ArrayList<>();
ids.add(orderRelation.getOrderId());
+ orderIds.add(orderRelation.getOrderId());
rabbitOrderService.cancelHoldOrder(ids);
}
+ if(CollUtil.isNotEmpty(orderIds)){
+ //获取对应的平仓记录单号
+ List<String> orderNosList = new ArrayList<>();
+
+ for(Long orderId : orderIds) {
+ String orderNos = contractOrderDao.selectOrderNoByOrderIds(orderId);
+ ContractOrderEntity contractOrderEntity = contractOrderDao.selectById(orderId);
+ orderNosList.add(orderNos);
+ }
+ //获取总返佣
+ BigDecimal totalAmount = followTraderProfitDetailDao.selectFollowHoldOrderByFollowOrderNo(orderNosList);
+ totalAmount = (totalAmount == null?BigDecimal.ZERO:totalAmount.setScale(2, BigDecimal.ROUND_DOWN));
+ if(totalAmount.compareTo(BigDecimal.ZERO) > 0){
+ //增加返佣提醒
+ String symbol = contractOrderDao.selectById(orderIds.get(0)).getSymbol();
+ String orderNoTrader = orderRelations.get(0).getTradeOrderNo();
+ Long traderMemberId = orderRelations.get(0).getTradeMemberId();
+ LogRecordUtils.insertFollowerNotice(traderMemberId,
+ NoticeConstant.RETURN_MONEY_TITLE,
+ StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
+ orderNoTrader,
+ symbol,
+ totalAmount));
+ //带单返利的记录要在资产页面的其他记录
+ LogRecordUtils.insertMemberAccountMoneyChange(
+ traderMemberId,
+ StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT_MAMC,
+ orderNoTrader,
+ symbol),
+ totalAmount,
+ MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
+ MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
+ MemberAccountMoneyChange.TYPE_WALLET_AGENT);
+ }
+ }
}
}
}
--
Gitblit v1.9.1