Merge branch 'EP-Indicator' of zhixinlian/client-server into master

blockchain-server/blockchain-server-btc/src/main/java/com/blockchain/server/btc/inner/BtcWalletInner.java

@@ -34,9 +34,8 @@ public class BtcWalletInner {
     }
 
     @GetMapping("/getWallets")
-    public ResultDTO<List<BtcWalletDTO>> getWallets(@RequestParam("userId") String userId,
-                                                    @RequestParam("walletType") String walletType) {
-        return ResultDTO.requstSuccess(btcWalletService.selectAllByUserOpenId(userId, walletType));
+    public ResultDTO<List<BtcWalletDTO>> getWallets(@RequestParam("userId") String userId) {
+        return ResultDTO.requstSuccess(btcWalletService.selectAllByUserOpenId(userId));
     }
 
 }

blockchain-server/blockchain-server-btc/src/main/java/com/blockchain/server/btc/mapper/BtcWalletMapper.java

@@ -69,6 +69,8 @@ public interface BtcWalletMapper extends Mapper<BtcWallet> {
      */
     List<BtcWalletDTO> selectAllByUserOpenId(@Param("userOpenId") String userOpenId, @Param("walletType") String walletType);
 
+    List<BtcWalletDTO> selectAll(@Param("userOpenId") String userOpenId);
+
     /**
      * 用户充值修改钱包金额
      *
@@ -78,4 +80,4 @@ public interface BtcWalletMapper extends Mapper<BtcWallet> {
                                         @Param("tokenSymbol") String tokenSymbol,
                                         @Param("walletType") String walletType,
                                         @Param("modifyTime") Date modifyTime);
-}
+}

blockchain-server/blockchain-server-btc/src/main/java/com/blockchain/server/btc/service/BtcWalletService.java

@@ -27,6 +27,14 @@ public interface BtcWalletService {
      */
     List<BtcWalletDTO> selectAllByUserOpenId(String userOpenId, String walletType);
 
+    /**
+     * 获取用户某应用钱包的所有区块
+     *
+     * @param userOpenId 用户id
+     * @return
+     */
+    List<BtcWalletDTO> selectAllByUserOpenId(String userOpenId);
+
     /**
      * 获取用户钱包
      *

blockchain-server/blockchain-server-btc/src/main/java/com/blockchain/server/btc/service/impl/BtcWalletServiceImpl.java

@@ -91,6 +91,11 @@ public class BtcWalletServiceImpl<psvm> implements BtcWalletService {
         return btcWalletMapper.selectAllByUserOpenId(userOpenId, walletType);
     }
 
+    @Override
+    public List<BtcWalletDTO> selectAllByUserOpenId(String userOpenId) {
+        return btcWalletMapper.selectAll(userOpenId);
+    }
+
     @Override
     public BtcWalletDTO selectByUserOpenId(String userOpenId, Integer tokenId, String walletType) {
         return btcWalletMapper.selectByUserOpenId(userOpenId, tokenId, walletType);

blockchain-server/blockchain-server-btc/src/main/resources/mapper/BtcWalletMapper.xml

@@ -30,6 +30,12 @@
         WHERE user_open_id = #{userOpenId} AND wallet_type = #{walletType}
     </select>
 
+    <select id="selectAll" resultMap="BtcWalletMap">
+        SELECT * FROM
+        <include refid="tableName"/>
+        WHERE user_open_id = #{userOpenId}
+    </select>
+
     <select id="selectByAddr" resultMap="BtcWalletMap">
         SELECT * FROM
         <include refid="tableName"/>
@@ -73,4 +79,4 @@
         AND wallet.token_symbol = #{tokenSymbol}
         AND wallet.wallet_type = #{walletType}
     </update>
-</mapper>
+</mapper>

blockchain-server/blockchain-server-eos/src/main/java/com/blockchain/server/eos/inner/EosWalletInnerController.java

@@ -54,10 +54,9 @@ public class EosWalletInnerController {
         return ResultDTO.requstSuccess();
     }
 
-    @GetMapping("/selectWalletByWalletType")
-    public ResultDTO<List<WalletDTO>> selectWalletByWalletType(@RequestParam("userOpenId") String userOpenId,
-                                              @RequestParam("walletType") String walletType) {
-        return ResultDTO.requstSuccess(eosWalletService.listWalletByWalletType(walletType, userOpenId));
+    @GetMapping("/selectWalletByUserOpenId")
+    public ResultDTO<List<WalletDTO>> selectWalletByWalletType(@RequestParam("userOpenId") String userOpenId) {
+        return ResultDTO.requstSuccess(eosWalletService.listWalletByUserOpenId(userOpenId));
     }
 
 }

blockchain-server/blockchain-server-eos/src/main/java/com/blockchain/server/eos/mapper/WalletMapper.java

@@ -35,6 +35,14 @@ public interface WalletMapper extends Mapper<Wallet> {
      */
     List<WalletDTO> listWalletByWalletType(@Param("walletType") String walletType, @Param("userOpenId") String userOpenId);
 
+    /**
+     * 根据用户id查询用户钱包
+     *
+     * @param userOpenId
+     * @return
+     */
+    List<WalletDTO> listWalletByUserOpenId(@Param("userOpenId") String userOpenId);
+
     /**
      * 通过用户id和币种名称和钱包标识查找用户
      *

blockchain-server/blockchain-server-eos/src/main/java/com/blockchain/server/eos/service/EosWalletService.java

@@ -55,6 +55,14 @@ public interface EosWalletService {
      */
     List<WalletDTO> listWalletByWalletType(String walletType, String userOpenId);
 
+    /**
+     * 查询钱包
+     *
+     * @param userOpenId
+     * @return
+     */
+    List<WalletDTO> listWalletByUserOpenId(String userOpenId);
+
     /**
      * 冻结与解冻方法
      *

blockchain-server/blockchain-server-eos/src/main/java/com/blockchain/server/eos/service/impl/EosWalletServiceImpl.java

@@ -147,6 +147,12 @@ public class EosWalletServiceImpl implements EosWalletService, ITxTransaction {
         return walletMapper.listWalletByWalletType(walletType, userOpenId);
     }
 
+    @Override
+    public List<WalletDTO> listWalletByUserOpenId(String userOpenId) {
+        ExceptionPreconditionUtils.notEmpty(userOpenId);
+        return walletMapper.listWalletByUserOpenId(userOpenId);
+    }
+
     /**
      * 冻结与解冻方法
      *

blockchain-server/blockchain-server-eos/src/main/resources/mapper/WalletMapper.xml

@@ -52,6 +52,12 @@
         and wallet_type = #{walletType}
     </select>
 
+    <select id="listWalletByUserOpenId" parameterType="java.lang.String" resultMap="walletMap">
+        select id, token_name, user_open_id, token_symbol, balance, free_balance, freeze_balance, create_time, update_time, wallet_type
+        from <include refid="tableName"/>
+        where user_open_id = #{userOpenId}
+    </select>
+
     <select id="selectWallet" parameterType="java.lang.String" resultMap="walletMap">
         select id, token_name, user_open_id, token_symbol, balance, free_balance, freeze_balance, create_time, update_time, wallet_type
         from <include refid="tableName"/>
@@ -84,4 +90,4 @@
         AND wallet.token_symbol = #{tokenSymbol}
         AND wallet.wallet_type = #{walletType}
     </update>
-</mapper>
+</mapper>

blockchain-server/blockchain-server-eth/src/main/java/com/blockchain/server/eth/inner/EthWalletInner.java

@@ -60,9 +60,8 @@ public class EthWalletInner {
     }
 
     @GetMapping("/getWallets")
-    public ResultDTO<List<EthWalletDTO>> getWallets(@RequestParam("userId") String userId,
-                                                    @RequestParam(name = "walletType", required = false) String walletType) {
-        return ResultDTO.requstSuccess(ethWalletService.selectByUserOpenIdAndWalletType(userId, walletType));
+    public ResultDTO<List<EthWalletDTO>> getWallets(@RequestParam("userId") String userId) {
+        return ResultDTO.requstSuccess(ethWalletService.selectByUserOpenId(userId));
     }
 
 }

blockchain-server/blockchain-server-eth/src/main/java/com/blockchain/server/eth/mapper/EthWalletMapper.java

@@ -74,6 +74,14 @@ public interface EthWalletMapper extends Mapper<EthWallet> {
     List<EthWalletDTO> selectByUserOpenIdAndWalletType(@Param("userOpenId") String userOpenId,
                                                        @Param("walletType") String walletType);
 
+    /**
+     * 根据用户ID、钱包类型查询钱包信息
+     *
+     * @param userOpenId 用户ID
+     * @return
+     */
+    List<EthWalletDTO> selectByUserOpenId(@Param("userOpenId") String userOpenId);
+
 
     /**
      * 修改用户指定钱包的金额
@@ -122,4 +130,4 @@ public interface EthWalletMapper extends Mapper<EthWallet> {
                                         @Param("tokenSymbol") String tokenSymbol,
                                         @Param("walletType") String walletType,
                                         @Param("modifyTime") Date modifyTime);
-}
+}

blockchain-server/blockchain-server-eth/src/main/java/com/blockchain/server/eth/service/IEthWalletService.java

@@ -101,6 +101,14 @@ public interface IEthWalletService {
      */
     List<EthWalletDTO> selectByUserOpenIdAndWalletType(String userOpenId, String walletType);
 
+    /**
+     * 根据用户ID，币种地址，钱包类型查询钱包信息
+     *
+     * @param userOpenId 用户ID
+     * @return
+     */
+    List<EthWalletDTO> selectByUserOpenId(String userOpenId);
+
     /**
      * 根据钱包地址，币种地址，钱包类型查询钱包信息
      *

blockchain-server/blockchain-server-eth/src/main/java/com/blockchain/server/eth/service/impl/EthWalletServiceImpl.java

@@ -189,6 +189,13 @@ public class EthWalletServiceImpl implements IEthWalletService, ITxTransaction {
         return list;
     }
 
+    @Override
+    public List<EthWalletDTO> selectByUserOpenId(String userOpenId) {
+        ExceptionPreconditionUtils.checkStringNotBlank(userOpenId,
+                new EthWalletException(EthWalletEnums.NULL_USEROPENID));
+        return ethWalletMapper.selectByUserOpenId(userOpenId);
+    }
+
     @Override
     public List<EthWalletDTO> selectByAddrAndWalletType(String addr, String walletType) {
         // 数据格式判断

blockchain-server/blockchain-server-eth/src/main/resources/mapper/EthWalletMapper.xml

@@ -86,6 +86,12 @@
         and wallet_type = #{walletType}
     </select>
 
+    <select id="selectByUserOpenId" resultMap="EthWalletDTO">
+        <include refid="selectEthWalletVo"/>
+        WHERE
+        user_open_id = #{userOpenId}
+    </select>
+
     <update id="updateBalanceByUserIdInRowLock">
         UPDATE
         <include refid="tableName"/>
@@ -135,4 +141,4 @@
         AND wallet.token_symbol = #{tokenSymbol}
         AND wallet.wallet_type = #{walletType}
     </update>
-</mapper>
+</mapper>

blockchain-server/blockchain-server-yyyf/pom.xml

@@ -73,6 +73,11 @@
             <artifactId>hutool-core</artifactId>
             <version>5.3.6</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>2.8.4</version>
+        </dependency>
 
     </dependencies>
 

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/feign/BtcFeign.java

@@ -13,6 +13,5 @@ public interface BtcFeign {
     String CONTENT_PATH = "/inner/wallet";
 
     @PostMapping(CONTENT_PATH + "/getWallets")
-    ResultDTO<List<BtcWalletDTO>> getWallets(@RequestParam("userId") String userId,
-                                             @RequestParam("walletType") String walletType);
+    ResultDTO<List<BtcWalletDTO>> getWallets(@RequestParam("userId") String userId);
 }

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/feign/CurrencyFeign.java

@@ -1,13 +1,13 @@
 package com.blockchain.server.yyyf.feign;
 
-import com.blockchain.common.base.dto.ResultDTO;
 import com.blockchain.server.yyyf.feign.dto.CurrencyMarketDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 @FeignClient(name = "dapp-currency-server")
 public interface CurrencyFeign {
     @GetMapping("/inner/market/getList")
-    ResultDTO<CurrencyMarketDTO> getList(@RequestParam("currencyPair") String currencyPair);
+    List<CurrencyMarketDTO> getList();
 }

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/feign/EosFeign.java

@@ -9,6 +9,6 @@ import java.util.List;
 
 @FeignClient("dapp-eos-server")
 public interface EosFeign {
-    @GetMapping("/inner/walletTx/selectWalletByWalletType")
-    ResultDTO<List<EosWalletDTO>> selectWalletByWalletType(String userOpenId, String walletType);
+    @GetMapping("/inner/walletTx/selectWalletByUserOpenId")
+    ResultDTO<List<EosWalletDTO>> selectWalletByWalletType(String userOpenId);
 }

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/feign/EthFeign.java

@@ -12,8 +12,7 @@ import java.util.List;
 @FeignClient("dapp-eth-server")
 public interface EthFeign {
     @GetMapping("/inner/wallet/getWallets")
-    ResultDTO<List<EthWalletDTO>> getWallets(@RequestParam("userId") String userId,
-                                             @RequestParam(name = "walletType") String walletType);
+    ResultDTO<List<EthWalletDTO>> getWallets(@RequestParam("userId") String userId);
 
     @GetMapping("/inner/walletParam/getGasConfig")
     ResultDTO<GasDTO> getGasConfig(String tokenSymbol);

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/DefaultIndicatorsManager.java

@@ -1,11 +1,24 @@
 package com.blockchain.server.yyyf.indicators;
 
 import cn.hutool.core.map.MapUtil;
+import com.blockchain.common.base.dto.ResultDTO;
 import com.blockchain.server.yyyf.dto.UserTimeMoneyDto;
 import com.blockchain.server.yyyf.entity.AssessUserTarget;
+import com.blockchain.server.yyyf.feign.BtcFeign;
+import com.blockchain.server.yyyf.feign.CurrencyFeign;
+import com.blockchain.server.yyyf.feign.EosFeign;
+import com.blockchain.server.yyyf.feign.EthFeign;
+import com.blockchain.server.yyyf.feign.dto.BtcWalletDTO;
+import com.blockchain.server.yyyf.feign.dto.CurrencyMarketDTO;
+import com.blockchain.server.yyyf.feign.dto.EosWalletDTO;
+import com.blockchain.server.yyyf.feign.dto.EthWalletDTO;
+import com.blockchain.server.yyyf.indicators.dto.AppTypeEnum;
+import com.blockchain.server.yyyf.indicators.dto.CurrencyEnum;
 import com.blockchain.server.yyyf.indicators.dto.IndicatorsTypeEnum;
 import com.blockchain.server.yyyf.mapper.AssessUserMapper;
 import com.blockchain.server.yyyf.mapper.AssessUserTargetMapper;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
 import lombok.AllArgsConstructor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -13,6 +26,11 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import static cn.hutool.core.util.NumberUtil.add;
+import static cn.hutool.core.util.NumberUtil.mul;
 
 /**
  * @author fengyu
@@ -23,6 +41,16 @@ public class DefaultIndicatorsManager implements IndicatorsManager {
     private final ApplicationContext applicationContext;
     private final AssessUserTargetMapper assessUserTargetMapper;
     private final AssessUserMapper assessUserMapper;
+    private final BtcFeign btcFeign;
+    private final EosFeign eosFeign;
+    private final EthFeign ethFeign;
+    private final CurrencyFeign currencyFeign;
+
+    private static final String CURRENCY_CACHE_KEY = "currency";
+    private static final Cache<String, List<CurrencyMarketDTO>> CURRENCY_MARKET_CACHE = Caffeine.newBuilder()
+            .expireAfterWrite(1, TimeUnit.HOURS)
+            .maximumSize(5)
+            .build();
 
     @Override
     public Map<String, Float> calculatePageIndicators(String assessUserId) {
@@ -37,17 +65,70 @@ public class DefaultIndicatorsManager implements IndicatorsManager {
 
     @Override
     public BigDecimal calculateCurrentTotalAssets(String userId, String assessUserId) {
-        //feign interface call
+        //币币总资产 + 法币总资产 + 冻结资金
+        List<CurrencyMarketDTO> currencyMarketDto = CURRENCY_MARKET_CACHE.get(CURRENCY_CACHE_KEY, t -> currencyFeign.getList());
+        assert currencyMarketDto != null;
+        Map<String, BigDecimal> currencyPairMap = currencyMarketDto.stream()
+                .collect(Collectors.toMap(CurrencyMarketDTO::getCurrencyPair, CurrencyMarketDTO::getAmount));
+        BigDecimal currencyAssets = getAssetsByUserId(userId, currencyPairMap);
+        //数字钱包
         UserTimeMoneyDto timeMoneyDto = assessUserMapper.selectCurrentUserTimeMoneyDto(assessUserId, userId);
+        BigDecimal digitalAssets = getDigitalAssets(timeMoneyDto, currencyPairMap);
+        //初始资产剩余资产 单位RMB
+        BigDecimal remainingAssets = getRemainingAssets(timeMoneyDto);
+        //计算总资产 转换成RMB
+        Double rmbRate = currencyMarketDto.stream().filter(dto -> dto.getCurrencyPair().equals(CurrencyEnum.BTC_USDT.getCode())).map(CurrencyMarketDTO::getCnyAmount).findFirst().orElse(7.0);
+        return add(mul(add(currencyAssets, digitalAssets), rmbRate), remainingAssets);
+    }
+
+    private BigDecimal getRemainingAssets(UserTimeMoneyDto timeMoneyDto) {
+        return add(timeMoneyDto.getAliPay(), timeMoneyDto.getWxPay(), timeMoneyDto.getBankCard());
+    }
 
+    private BigDecimal getDigitalAssets(UserTimeMoneyDto timeMoneyDto, Map<String, BigDecimal> currencyPairMap) {
+        BigDecimal btcMoney = mul(timeMoneyDto.getBtc(), currencyPairMap.get(CurrencyEnum.BTC_USDT.getCode()));
+        BigDecimal usdtMoney = timeMoneyDto.getUsdt();
+        BigDecimal eosMoney = mul(timeMoneyDto.getEos(), currencyPairMap.get(CurrencyEnum.EOS_USDT.getCode()));
+        BigDecimal ethMoney = mul(timeMoneyDto.getEth(), currencyPairMap.get(CurrencyEnum.ETH_USDT.getCode()));
+        return add(btcMoney, usdtMoney, eosMoney, ethMoney);
+    }
 
-        //1.获取 币币总资产 + 法币总资产 + 数字钱包 + 初始资产 + 挂单资金
-        //cache rate
-        //2.计算总资产 转换成RMB
-        //cache RMB rate
-        return null;
+    private BigDecimal getAssetsByUserId(String userId, Map<String, BigDecimal> currencyPairMap) {
+        ResultDTO<List<BtcWalletDTO>> btcWallets = btcFeign.getWallets(userId);
+        ResultDTO<List<EthWalletDTO>> ethWallets = ethFeign.getWallets(userId);
+        ResultDTO<List<EosWalletDTO>> eosWallets = eosFeign.selectWalletByWalletType(userId);
+        BigDecimal c2cAssets = getAssetsByType(AppTypeEnum.C2C, currencyPairMap, btcWallets.getData(), ethWallets.getData(), eosWallets.getData());
+        BigDecimal cctAssets = getAssetsByType(AppTypeEnum.CCT, currencyPairMap, btcWallets.getData(), ethWallets.getData(), eosWallets.getData());
+        return add(c2cAssets, cctAssets);
     }
 
+    private BigDecimal getAssetsByType(AppTypeEnum appType, Map<String, BigDecimal> currencyPairMap,
+                                       List<BtcWalletDTO> btcWallets, List<EthWalletDTO> ethWallets,
+                                       List<EosWalletDTO> eosWallets) {
+        //BTC
+        Map<String, BigDecimal> btcBalanceMap = btcWallets.stream()
+                .filter(dto -> dto.getWalletType().equals(appType.name()))
+                .collect(Collectors.toMap(BtcWalletDTO::getTokenSymbol, dto -> BigDecimal.valueOf(dto.getBalance() + dto.getFreezeBalance())));
+        BigDecimal btcAmount = currencyPairMap.get(CurrencyEnum.BTC_USDT.getCode());
+        BigDecimal btcPrice = mul(btcAmount, btcBalanceMap.get(CurrencyEnum.BTC.getCode()));
+        //USDT
+        BigDecimal usdtPrice = btcBalanceMap.get(CurrencyEnum.USDT.getCode());
+
+        //ETH
+        Map<String, BigDecimal> ethBalanceMap = ethWallets.stream()
+                .filter(dto -> dto.getWalletType().equals(appType.name()))
+                .collect(Collectors.toMap(EthWalletDTO::getTokenSymbol, dto -> BigDecimal.valueOf(Double.parseDouble(dto.getBalance()) + Double.parseDouble(dto.getFreezeBalance()))));
+        BigDecimal ethAmount = currencyPairMap.get(CurrencyEnum.ETH_USDT.getCode());
+        BigDecimal ethPrice = mul(ethAmount, ethBalanceMap.get(CurrencyEnum.ETH.getCode()));
+
+        //EOS
+        Map<String, BigDecimal> eosBalanceMap = eosWallets.stream()
+                .filter(dto -> dto.getWalletType().equals(appType.name()))
+                .collect(Collectors.toMap(EosWalletDTO::getTokenSymbol, dto -> add(dto.getBalance(), dto.getFreezeBalance())));
+        BigDecimal eosAmount = currencyPairMap.get(CurrencyEnum.EOS_USDT.getCode());
+        BigDecimal eosPrice = mul(eosAmount, eosBalanceMap.get(CurrencyEnum.EOS.getCode()));
+        return add(btcPrice, usdtPrice, ethPrice, eosPrice);
+    }
 
     /**
      * calculate single indicator
@@ -62,4 +143,5 @@ public class DefaultIndicatorsManager implements IndicatorsManager {
         IndicatorsHandler indicatorsHandler = applicationContext.getBean(type.getCode(), IndicatorsHandler.class);
         return indicatorsHandler.handleIndicator(assessUserId);
     }
+
 }

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/dto/AppTypeEnum.java

@@ -0,0 +1,12 @@
+package com.blockchain.server.yyyf.indicators.dto;
+
+/**
+ * @author fengyu
+ */
+
+public enum AppTypeEnum {
+    /*法币交易*/
+    C2C,
+    /*币币交易*/
+    CCT
+}

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/dto/CurrencyEnum.java

@@ -0,0 +1,24 @@
+package com.blockchain.server.yyyf.indicators.dto;
+
+import lombok.Getter;
+
+/**
+ * @author fengyu
+ */
+public enum CurrencyEnum {
+    /*btc*/
+    BTC("BTC"),
+    ETH("ETH"),
+    EOS("EOS"),
+    USDT("USDT"),
+    BTC_USDT("BTC-USDT"),
+    ETH_USDT("ETH-USDT"),
+    EOS_USDT("EOS-USDT");
+
+    @Getter
+    private final String code;
+
+    CurrencyEnum(String code) {
+        this.code = code;
+    }
+}

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/dto/IndicatorsTypeEnum.java

@@ -23,9 +23,7 @@ public enum IndicatorsTypeEnum {
     MAX_DRAWDOWN_RATE("MaxDrawdownRate"),
     /*最大亏损率*/
     MAX_LOSS_RATE("MaxLossRate"),
-    /*风险率（资产负债比）*/
-    ASSET_LIABILITY_RISK_RATE("AssetLiabilityRiskRate"),
-    /*TVPI*/
+    /*Total Value to Paid-in Capital*/
     TVPI("TVPI");
 
     @Getter

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/handle/AssetLiabilityRiskRateIndicatorsHandler.java

@@ -1,17 +0,0 @@
-package com.blockchain.server.yyyf.indicators.handle;
-
-import com.blockchain.server.yyyf.indicators.IndicatorsHandler;
-import org.springframework.stereotype.Component;
-
-/**
- * @author fengyu
- */
-@Component(AssetLiabilityRiskRateIndicatorsHandler.HANDLER_NAME + IndicatorsHandler.HANDLER_NAME)
-public class AssetLiabilityRiskRateIndicatorsHandler implements IndicatorsHandler {
-    public static final String HANDLER_NAME = "AssetLiabilityRiskRate";
-
-    @Override
-    public Float handleIndicator(String assessUserId) {
-        return null;
-    }
-}

blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/indicators/handle/TotalGrowthRateIndicatorsHandler.java

@@ -1,9 +1,12 @@
 package com.blockchain.server.yyyf.indicators.handle;
 
+import com.blockchain.server.yyyf.dto.UserTimeMoneyDto;
 import com.blockchain.server.yyyf.indicators.IndicatorsHandler;
 import com.blockchain.server.yyyf.indicators.IndicatorsUtils;
 import com.blockchain.server.yyyf.indicators.dto.AssetsReporter;
 import com.blockchain.server.yyyf.indicators.dto.LastAndFirstAssetsDto;
+import com.blockchain.server.yyyf.mapper.AssessUserMapper;
+import com.blockchain.server.yyyf.service.AssessUserService;
 import com.blockchain.server.yyyf.service.AssetsReporterService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -11,6 +14,8 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.util.List;
 
+import static cn.hutool.core.util.NumberUtil.add;
+
 /**
  * @author fengyu
  */
@@ -20,6 +25,8 @@ public class TotalGrowthRateIndicatorsHandler implements IndicatorsHandler {
     public static final String HANDLER_NAME = "TotalGrowthRate";
 
     private final AssetsReporterService assetsReporterService;
+    private final AssessUserService assessUserService;
+    private final AssessUserMapper assessUserMapper;
 
     @Override
     public Float handleIndicator(String assessUserId) {
@@ -27,14 +34,16 @@ public class TotalGrowthRateIndicatorsHandler implements IndicatorsHandler {
         //获取最初、最后交易的信息
         LastAndFirstAssetsDto lastAndFirstAssetsDto = IndicatorsUtils.getLastAndFirstAssetsDto(reporterList);
 
-        AssetsReporter lastAssets =lastAndFirstAssetsDto.getLastAssets();
-        AssetsReporter firstAssets =lastAndFirstAssetsDto.getFirstAssets();
+        AssetsReporter lastAssets = lastAndFirstAssetsDto.getLastAssets();
+        AssetsReporter firstAssets = lastAndFirstAssetsDto.getFirstAssets();
 
         //充值的总金额
-        //todo 不知道如何获取
-        BigDecimal rechargeAmount=null;
+        List<UserTimeMoneyDto> userTimeMoneyList = assessUserService.selectUserTimeMoneyDtosForNotEnd();
+        String sysUserId = userTimeMoneyList.stream().filter(dto -> dto.getAssessUserId().equals(assessUserId)).findFirst().map(UserTimeMoneyDto::getQUserId).get();
+        UserTimeMoneyDto timeMoneyDto = assessUserMapper.selectCurrentUserTimeMoneyDto(assessUserId, sysUserId);
+        BigDecimal rechargeAmount = add(timeMoneyDto.getAliPayInit(), timeMoneyDto.getWxPayInit(), timeMoneyDto.getBankCardInit());
 
-        return lastAssets.getAssets().subtract(firstAssets.getAssets()).divide(rechargeAmount,4,BigDecimal.ROUND_HALF_UP)
+        return lastAssets.getAssets().subtract(firstAssets.getAssets()).divide(rechargeAmount, 4, BigDecimal.ROUND_HALF_UP)
                 .multiply(BigDecimal.valueOf(100)).floatValue();
     }
 }