20200602 代码提交

xiaoyong931011

2020-06-02 1e2725d0ab46e73cf21279f816f2320b626fbd3e

 src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java

@@ -29,6 +29,7 @@
import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;

import com.xcong.excoin.modules.coin.mapper.OrderWalletCoinDealMapper;

import com.xcong.excoin.modules.coin.mapper.OrderWalletCoinMapper;

import com.xcong.excoin.modules.coin.parameter.vo.FindCollectListVo;

import com.xcong.excoin.modules.coin.parameter.vo.MemberSelectSymbolsVo;

import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinDealListVo;

import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinDealVo;

@@ -42,7 +43,9 @@
import com.xcong.excoin.modules.platform.dao.PlatformCnyUsdtExchangeDao;

import com.xcong.excoin.modules.platform.dao.TradeSettingDao;

import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;

import com.xcong.excoin.utils.CoinTypeConvert;

import com.xcong.excoin.utils.MessageSourceUtils;

import com.xcong.excoin.utils.RedisUtils;



import cn.hutool.core.collection.CollUtil;

import cn.hutool.core.util.ObjectUtil;

@@ -66,6 +69,8 @@
   OrderCoinDealDao orderCoinDealDao;

   @Resource

   MemberAccountFlowEntityDao memberAccountFlowEntityDao;

    @Resource

    RedisUtils redisUtils;

   

   @Override

   public String generateSimpleSerialno(String userId) {

@@ -93,7 +98,7 @@
   }



   @Override

   public Result enterTransactionPageOfWalletCoin(String symbol, String type) {

   public Result enterTransactionPageOfWalletCoin(String symbol) {

      if (StrUtil.isBlank(symbol)) {

         return Result.fail(MessageSourceUtils.getString("order_service_0001"));

      }

@@ -109,12 +114,8 @@
      //获取USDT的币币账户信息

      MemberWalletCoinEntity walletCoinUsdt = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, 

                                             MemberWalletCoinEnum.WALLETCOINCODE.getValue());

      /**

       * todo

       */

      //获取某个币种的收盘价

      //Double closePrice = symbolsService.getCloseSymbolsBySymbolsName(symbol+"/USDT");

      BigDecimal closePrice = new BigDecimal("100.0000");

		
      BigDecimal closePrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol+"/USDT")));

      

      List<MemberSelectSymbolsEntity> memSymbols = memberSelectSymbolsDao.selectSymbolByMemIdAndSymbol(memberId, symbol);



@@ -134,11 +135,8 @@
      // 手续费用率

      transactionPageOfWalletCoinVo.setFeeRatio(tradeSetting.getFeeRatio().setScale(4, BigDecimal.ROUND_DOWN));

      // 用户可用金额

      if(MemberWalletCoinEnum.ENTERTRANSACTIONPAGEOFWALLETCOIN_BUY.getValue().equals(type)) {//买入

         transactionPageOfWalletCoinVo.setAvailableBalance(walletCoinUsdt.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

      }else {

         transactionPageOfWalletCoinVo.setAvailableBalance(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

      }

      transactionPageOfWalletCoinVo.setAvailableBalanceBuy(walletCoinUsdt.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

      transactionPageOfWalletCoinVo.setAvailableBalanceSell(walletCoin.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

      //当前价

      transactionPageOfWalletCoinVo.setCurrentPrice(closePrice.setScale(4, BigDecimal.ROUND_DOWN));

      //比例

@@ -147,24 +145,18 @@
      transactionPageOfWalletCoinVo.setCurrentPriceCny(cnyUsdt.multiply(closePrice).setScale(4, BigDecimal.ROUND_DOWN));

      

      transactionPageOfWalletCoinVo.setSymbol(symbol);

      transactionPageOfWalletCoinVo.setType(type);

      return Result.ok(transactionPageOfWalletCoinVo);

   }



   @Override

   @Transactional

   public Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,

         BigDecimal amount) {

   public Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,BigDecimal amount) {

         //获取用户ID

         Long memberId = LoginUserUtils.getAppLoginUser().getId();

         

         /**

          * todo

         */

         //查询当前价

         //BigDecimal nowPrice = new BigDecimal(redisUtil.getString(CoinTypeConConvert.convertToKey(symbol+"/USDT")));

         BigDecimal nowPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol+"/USDT")));

         

         BigDecimal nowPrice = new BigDecimal("10.0000");

         // 获取交易管理的杠杠倍率，手续费率等信息，由平台进行设置

         symbol = symbol.toUpperCase();

         MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);

@@ -277,7 +269,8 @@
               walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().subtract(amount).setScale(4, BigDecimal.ROUND_DOWN));

               memberWalletCoinDao.updateById(walletCoin);

               

               walletCoinUsdt.setAvailableBalance(walletCoinUsdt.getAvailableBalance().add(totalPayPrice).setScale(4, BigDecimal.ROUND_DOWN));

               BigDecimal subtract = totalPayPrice.subtract(closingPrice).subtract(closingPrice);

               walletCoinUsdt.setAvailableBalance(walletCoinUsdt.getAvailableBalance().add(subtract).setScale(4, BigDecimal.ROUND_DOWN));

               memberWalletCoinDao.updateById(walletCoinUsdt);

            }

         }

@@ -321,10 +314,10 @@


   @Override

   @Transactional

   public Result cancelEntrustWalletCoinOrder(String orderNo) {

   public Result cancelEntrustWalletCoinOrder(String orderId) {

         //获取用户ID

         Long memberId = LoginUserUtils.getAppLoginUser().getId();

         OrderCoinsEntity orderCoinsEntity = orderCoinsDao.findWalletCoinOrderByOrderNo(orderNo);

         OrderCoinsEntity orderCoinsEntity = orderCoinsDao.selectById(orderId);

            if(ObjectUtil.isNotEmpty(orderCoinsEntity) && orderCoinsEntity.getMemberId() == memberId) {

               if(orderCoinsEntity.getOrderStatus() == OrderCoinsEntity.ORDERSTATUS_CANCEL){

                  return Result.fail(MessageSourceUtils.getString("order_service_0012"));

@@ -334,7 +327,7 @@
               

               String symbol = orderCoinsEntity.getSymbol();

               

               if(orderCoinsEntity.getOrderType() == OrderCoinsEntity.TRADETYPE_FIXEDPRICE) {

               if(OrderCoinsEntity.ORDERTYPE_BUY.equals(orderCoinsEntity.getOrderType())) {

                  //如果是限价买入，撤单将USDT账户冻结金额返回

                  String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

                  MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, walletCode);

@@ -342,7 +335,7 @@
                  if (ObjectUtil.isNotEmpty(walletCoin)) {

                     //手续费 = 开仓价*数量*手续费率

                     //返还金额=开仓价*未成交数量+手续费

                     BigDecimal returnBalance = orderCoinsEntity.getEntrustPrice().add(orderCoinsEntity.getFeeAmount());

                     BigDecimal returnBalance = orderCoinsEntity.getDealAmount();

                     

                     walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));

                     walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));

@@ -360,13 +353,12 @@
                  }

               }else {

                  //如果是限价卖出，撤单将对应的钱包冻结金额返回

                  String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

                  MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, walletCode);

                  MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, symbol);

                  if (ObjectUtil.isNotEmpty(walletCoin)) {

                     //返还金额=开仓价*未成交数量

                     BigDecimal returnBalance = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());

                     walletCoin.setAvailableBalance(returnBalance.setScale(4, BigDecimal.ROUND_DOWN));

                     walletCoin.setFrozenBalance(BigDecimal.ZERO);

                     walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));

                     memberWalletCoinDao.updateById(walletCoin);

                     // 流水记录

                     MemberAccountFlowEntity record = new MemberAccountFlowEntity();

@@ -380,7 +372,6 @@
                     return Result.ok(MessageSourceUtils.getString("order_service_0013"));

                  }

               }

					
               OrderCoinsDealEntity detail = new OrderCoinsDealEntity();

               detail.setMemberId(memberId);

               detail.setOrderId(orderCoinsEntity.getId());

@@ -388,6 +379,7 @@
               detail.setOrderType(orderCoinsEntity.getOrderType());

               detail.setTradeType(orderCoinsEntity.getTradeType());

               detail.setSymbol(symbol);

               detail.setOrderStatus(OrderCoinsDealEntity.ORDERSTATUS_CANCEL);

               detail.setSymbolCnt(orderCoinsEntity.getEntrustCnt());

               detail.setEntrustPrice(orderCoinsEntity.getEntrustPrice().setScale(4, BigDecimal.ROUND_DOWN));

               detail.setDealPrice(orderCoinsEntity.getDealPrice().setScale(4, BigDecimal.ROUND_DOWN));

@@ -462,4 +454,24 @@
      return Result.ok(memberSelectSymbolsVo);

   }



   @Override

   public Result findCollectList() {

      //获取用户ID

      Long memberId = LoginUserUtils.getAppLoginUser().getId();

      List<MemberSelectSymbolsEntity> selectByMap = memberSelectSymbolsDao.selectSymbolByMemId(memberId);

		
      FindCollectListVo findCollectListVo = new FindCollectListVo();

      List<MemberSelectSymbolsVo> arrayList = new ArrayList<>();

      if(CollUtil.isNotEmpty(selectByMap)) {

         for(MemberSelectSymbolsEntity memberSelectSymbolsEntity : selectByMap) {

            MemberSelectSymbolsVo memberSelectSymbolsVo = new MemberSelectSymbolsVo();

            memberSelectSymbolsVo.setSymbol(memberSelectSymbolsEntity.getSymbol());

            arrayList.add(memberSelectSymbolsVo);

         }

      }

      findCollectListVo.setMemberSelectSymbolsVo(arrayList);

		
      return Result.ok(findCollectListVo);

   }



}