Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-06-02 756a9478ec9aed062d5bc8b8a26aba805767e89d

 src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java

@@ -30,12 +30,14 @@
import java.math.RoundingMode;
import java.util.*;

/**
 * @author helius
 */
@Service
public class OrderWebsocketServiceImpl {

    @Resource
    ContractHoldOrderService contractHoldOrderService;


    @Resource
    ContractOrderService contractOrderService;
@@ -43,10 +45,8 @@
    @Resource
    ContractEntrustOrderService contractEntrustOrderService;


    @Resource
    MemberWalletContractService memberWalletContractService;


    @Resource
    CacheSettingUtils cacheSettingUtils;
@@ -62,7 +62,6 @@

    @Resource
    private MemberAccountFlowEntityDao memberAccountFlowEntityDao;



    public void dealOrderFromMq(List<OrderModel> list, Integer type) {
@@ -93,6 +92,8 @@
                        break;
                    case 12:
                        this.dealForLessLoss(coinsCoinsOrders,list);
                        break;
                    default:
                        break;
                }

@@ -528,7 +529,7 @@
                        .setScale(8, BigDecimal.ROUND_DOWN);
                contractHoldOrderEntity.setOpeningFeeAmount(openFeePrice);
                contractHoldOrderEntity.setVersion(1);
                BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(coinsCoinsOrder.getBondAmount(), entrustPrice, symbolCnt, lotNumber, type, memberEntity);
                BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(coinsCoinsOrder.getBondAmount().subtract(openFeePrice), entrustPrice, symbolCnt, lotNumber, type, memberEntity);

                contractHoldOrderEntity.setForceClosingPrice(forceSetPrice);
                contractHoldOrderEntity.setLeverRatio(coinsCoinsOrder.getLeverRatio());
@@ -653,8 +654,6 @@
                    record.setSymbol(coinsOrder.getSymbol());
                    record.setPrice(coinsOrder.getPrePaymentAmount());
                    memberAccountFlowEntityDao.insert(record);


                }
            }
        }