modify

Helius

2020-08-29 bc4d530071edfb7f1bcff970b7039a1447859c1d

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

@@ -101,32 +101,37 @@
        if (CollUtil.isNotEmpty(holdOrderEntities)) {

            int maxCnt = 0;

            int subCnt = 0;

            int index = 0;

            BigDecimal openPrice = BigDecimal.ZERO;

            int type = 1;

            BigDecimal feeAmount = BigDecimal.ZERO;

            BigDecimal sku = BigDecimal.ZERO;



            for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {

                if (maxCnt == 0) {

                    maxCnt = holdOrderEntity.getSymbolCntSale();

                    subCnt = holdOrderEntity.getSymbolCntSale();

                    type = holdOrderEntity.getOpeningType();

                    openPrice = holdOrderEntity.getOpeningPrice();

                }



                if (holdOrderEntity.getSymbolCntSale() >= maxCnt) {

                    int temp = maxCnt;

                    maxCnt = holdOrderEntity.getSymbolCntSale();

                    subCnt = holdOrderEntity.getSymbolCntSale() - temp;

                    openPrice = holdOrderEntity.getOpeningPrice();

                    type = holdOrderEntity.getOpeningType();

                    index++;

                    log.info("--{}, {}, {}, {}, {}", maxCnt, subCnt, openPrice, type, index);

                }



                if (index == 0) {

                    index ++;

                    maxCnt = holdOrderEntity.getSymbolCntSale();

                    subCnt = holdOrderEntity.getSymbolCntSale();

                    type = holdOrderEntity.getOpeningType();

                    openPrice = holdOrderEntity.getOpeningPrice();

                    log.info("---{}, {}, {}, {}, {}", maxCnt, subCnt, type, openPrice, index);

                }

                feeAmount = feeAmount.add(holdOrderEntity.getOpeningFeeAmount());

                sku = holdOrderEntity.getSymbolSku();

            }

            BigDecimal forceSetPrice = BigDecimal.ZERO;

            if (subCnt != 0) {

                log.info("{}, {}, {}, {}, {}", openPrice, subCnt, sku, type, maxCnt);

                log.info("--->{}, {}, {}, {}, {}", openPrice, subCnt, sku, type, maxCnt);

                forceSetPrice = getForceSetPrice(walletContract.getTotalBalance().subtract(feeAmount), openPrice, subCnt, sku, type, memberEntity);

            }



@@ -136,7 +141,7 @@
                updateHoldOrder.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);

                holdOrderDao.updateById(updateHoldOrder);



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

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

//                    sendOrderBombMsg(updateHoldOrder.getId(), updateHoldOrder.getOpeningType(), forceSetPrice, updateHoldOrder.getSymbol(), updateHoldOrder.getOperateNo());

                }

            }