Merge branch 'whole' of https://gitee.com/chonggaoxiao/new_excoin into whole

Helius

2020-08-19 11d8692e517431030ba0ce36b437601cf83cdec3

 src/main/java/com/xcong/excoin/utils/CalculateUtil.java

@@ -142,6 +142,7 @@


            for (ContractHoldOrderEntity updateHoldOrder : holdOrderEntities) {

                updateHoldOrder.setForceClosingPrice(forceSetPrice);

                updateHoldOrder.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);

                holdOrderDao.updateById(updateHoldOrder);



                if (forceSetPrice.compareTo(BigDecimal.ZERO) >= 0) {