modify

wzy

2021-04-08 1a3f2693a476338da836de84cbded66bc9dfcf42

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

@@ -211,11 +211,10 @@
     * @param contractHoldOrderEntity

     * @return

     */

    public static BigDecimal calWholePriceTwo(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity, int type) {

    public static BigDecimal calWholePriceTwo(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity, int type, BigDecimal newPrice) {

        ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);

        MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);

        RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);

        BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(contractHoldOrderEntity.getSymbol())));

        CacheSettingUtils cacheSettingUtils = SpringContextHolder.getBean(CacheSettingUtils.class);



        Long memberId = memberEntity.getId();

        MemberWalletContractEntity walletContract = walletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());

@@ -230,6 +229,7 @@
                } else {

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

                }



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

            }