From f3948fa31158c7b7dea3b038e01c43ce54c55a1c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 11:09:57 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index b547a9d..9ff4d66 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -195,24 +195,24 @@
                         memberWalletContractDao.increaseWalletContractBalanceById(returnMoney, returnMoney, null, traderWallet.getId());
                         insertReturnProfitDetail(traderInfoEntity.getMemberId(), memberEntity.getId(), returnMoney, holdOrderEntity.getOrderNo());
                         //增加返佣提醒
-                        String orderNo = holdOrderEntity.getOrderNo();
-                        LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
-                                NoticeConstant.RETURN_MONEY_TITLE,
-                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
-                                        orderNo,
-                                		holdOrderEntity.getSymbol(),
-                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
-                        //带单返利的记录要在资产页面的其他记录
-                        LogRecordUtils.insertMemberAccountMoneyChange(
-                        		traderInfoEntity.getMemberId(),
-                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
-                                        orderNo,
-                                		holdOrderEntity.getSymbol(),
-                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()), 
-                        		returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP),
-                        		MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
-                        		MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
-                        		MemberAccountMoneyChange.TYPE_WALLET_AGENT);
+//                        String orderNo = holdOrderEntity.getOrderNo();
+//                        LogRecordUtils.insertFollowerNotice(traderInfoEntity.getMemberId(),
+//                                NoticeConstant.RETURN_MONEY_TITLE,
+//                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
+//                                        orderNo,
+//                                		holdOrderEntity.getSymbol(),
+//                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()));
+//                        //带单返利的记录要在资产页面的其他记录
+//                        LogRecordUtils.insertMemberAccountMoneyChange(
+//                        		traderInfoEntity.getMemberId(),
+//                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT_MAMC,
+//                                        orderNo,
+//                                		holdOrderEntity.getSymbol(),
+//                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()),
+//                        		returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP),
+//                        		MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
+//                        		MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,
+//                        		MemberAccountMoneyChange.TYPE_WALLET_AGENT);
                     }
                 }
             }
@@ -536,7 +536,7 @@
                     continue;
                 }
 
-//                holdOrderEntity.setForceClosingPrice(getForceSetPrice(wholePriceData, holdOrderEntity, holdOrderDataModel.getSymbol()));
+                holdOrderEntity.setStopLossPrice(CalculateUtil.calWholePriceTwo(memberEntity, holdOrderEntity, 2));
                 contractHoldOrderDao.deleteById(holdOrderDataModel.getId());
 
                 ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);

--
Gitblit v1.9.1