modify

Helius

2021-03-30 286c795c60057af1fa7439e49c0135ae0110d251

modify

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

@@ -175,7 +175,11 @@
            BigDecimal totalBondAmount = BigDecimal.ZERO;

            BigDecimal totalProfitOrLoss = BigDecimal.ZERO;

            for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {

                totalBondAmount = totalBondAmount.add(holdOrderEntity.getBondAmount());

                if (holdOrderEntity.getId().equals(contractHoldOrderEntity.getId())) {

                    totalBondAmount = totalBondAmount.add(holdOrderEntity.getHoldBond());

                } else {

                    totalBondAmount = totalBondAmount.add(holdOrderEntity.getBondAmount());

                }

                totalProfitOrLoss =  totalProfitOrLoss.add(calProfitOrLoss(holdOrderEntity, memberEntity));

            }




 src/test/java/com/xcong/excoin/WholeTest.java

@@ -200,8 +200,8 @@

    @Test
    public void wholeForceNewTest() {
        MemberEntity memberEntity = memberDao.selectById(19L);
        ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(285L);
        MemberEntity memberEntity = memberDao.selectById(15L);
        ContractHoldOrderEntity holdOrder = contractHoldOrderDao.selectById(300L);

        System.out.println(CalculateUtil.calForcePriceForWhole(memberEntity, holdOrder));
    }