From de272f760b766b7b950e92ae3e730f2b8d801b8d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 31 May 2023 11:13:41 +0800
Subject: [PATCH] twoCoin项目修改

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 66ccb71..d0f307c 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -623,7 +623,7 @@
                 PoolEnum.COIN_A_PRICE.getType(),
                 PoolEnum.COIN_A_PRICE.getCode()
         );
-        BigDecimal coinAPrice = new BigDecimal(StrUtil.isEmpty(coinAPriceDic.getValue()) ? "0" : coinAPriceDic.getValue()).setScale(8,BigDecimal.ROUND_DOWN);
+        BigDecimal coinAPrice = new BigDecimal(StrUtil.isEmpty(coinAPriceDic.getValue()) ? "0" : coinAPriceDic.getValue()).setScale(12,BigDecimal.ROUND_DOWN);
         /**
          * 会员充值USDT买入A币记录的ID
          */
@@ -751,7 +751,7 @@
         coinAUsdtPriceDic.setValue(coinAUsdtPriceDicCnt.toString());
         dataDictionaryCustomMapper.updateById(coinAUsdtPriceDic);
 
-        BigDecimal divide = coinAUsdtPriceDicCnt.divide(coinACntDicCnt, 8, BigDecimal.ROUND_DOWN);
+        BigDecimal divide = coinAUsdtPriceDicCnt.divide(coinACntDicCnt, 12, BigDecimal.ROUND_DOWN);
         coinAPriceDic.setValue(divide.toString());
         dataDictionaryCustomMapper.updateById(coinAPriceDic);
 
@@ -1661,11 +1661,29 @@
         DataDictionaryCustom coinAPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                 PoolEnum.COIN_A_PRICE.getType(),
                 PoolEnum.COIN_A_PRICE.getCode());
-        BigDecimal coinAPrice = coinAUsdt.divide(coinACnt,8,BigDecimal.ROUND_DOWN);
+
+        BigDecimal coinAPrice = coinAUsdt.divide(coinACnt,12,BigDecimal.ROUND_DOWN);
         coinAPriceDic.setValue(coinAPrice.toString());
         dataDictionaryCustomMapper.updateById(coinAPriceDic);
-
-        chainProducer.sendAntKLineMsg(0);
+        /**
+         * 增加K线数据
+         */
+        DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
+        dappAKlineEntity.setType(0);
+        /**
+         * 获取最新一条小时或者分钟的数据
+         */
+        DappAKlineEntity oldOne = dappAKlineMapper.selectOneByType();
+        if(ObjectUtil.isNotEmpty(oldOne)){
+            dappAKlineEntity.setOpenPrice(oldOne.getClosePrice());
+            dappAKlineEntity.setLowestPrice(oldOne.getClosePrice());
+        }else{
+            dappAKlineEntity.setOpenPrice(coinAPrice);
+            dappAKlineEntity.setLowestPrice(coinAPrice);
+        }
+        dappAKlineEntity.setHighestPrice(coinAPrice);
+        dappAKlineEntity.setClosePrice(coinAPrice);
+        dappAKlineMapper.insert(dappAKlineEntity);
     }
 
     @Override
@@ -1726,7 +1744,7 @@
          */
         DappAKlineEntity minRecord = dappAKlineMapper.selectOneHourByType();
         if(ObjectUtil.isEmpty(minRecord)){
-            minRecord = dappAKlineMapper.selectOneByType();
+            minRecord = dappAKlineMapper.selectOneByTypeAsc();
         }
         DappAKlineEntity maxRecord = dappAKlineMapper.selectOneByType();
         List<DappAKlineEntity> dappAKlineEntities = dappAKlineMapper.selectListByIds(minRecord.getId(),maxRecord.getId());
@@ -1751,12 +1769,7 @@
             dappAKlineEntity.setHighestPrice(coinAPrice);
             dappAKlineEntity.setLowestPrice(coinAPrice);
         }
-        DappAKlineEntity oldOne = dappAKlineMapper.selectOneByType();
-        if(ObjectUtil.isNotEmpty(oldOne)){
-            dappAKlineEntity.setClosePrice(oldOne.getClosePrice());
-        }else{
-            dappAKlineEntity.setClosePrice(coinAPrice);
-        }
+        dappAKlineEntity.setClosePrice(coinAPrice);
         dappAKlineMapper.insert(dappAKlineEntity);
 
         chainProducer.sendAntKLineMsg(1);
@@ -1974,10 +1987,11 @@
         DappAKlineEntity oldOne = dappAKlineMapper.selectOneByType();
         if(ObjectUtil.isNotEmpty(oldOne)){
             dappAKlineEntity.setOpenPrice(oldOne.getClosePrice());
+            dappAKlineEntity.setLowestPrice(oldOne.getClosePrice());
         }else{
             dappAKlineEntity.setOpenPrice(coinAPrice);
+            dappAKlineEntity.setLowestPrice(coinAPrice);
         }
-        dappAKlineEntity.setLowestPrice(coinAPrice);
         dappAKlineEntity.setHighestPrice(coinAPrice);
         dappAKlineEntity.setClosePrice(coinAPrice);
         dappAKlineMapper.insert(dappAKlineEntity);

--
Gitblit v1.9.1