From b7791ef47bc81b42c41b90720608850d38f6a6b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Jul 2020 10:41:08 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 f810784..af2b247 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
@@ -551,6 +551,7 @@
                 contractHoldOrderEntity.setLeverRatio(coinsCoinsOrder.getLeverRatio());
                 contractHoldOrderEntity.setOpeningPrice(entrustPrice);
                 contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
+                contractHoldOrderEntity.setOperateNo(1);
                 contractHoldOrderService.save(contractHoldOrderEntity);
 
                 // 需要一个历史插入
@@ -662,13 +663,18 @@
     }
 
     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);
 

--
Gitblit v1.9.1