20200529 代码提交

xiaoyong931011

2020-05-29 864b77ebac060a40bb0a454e53fa851540a4cd19

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

@@ -12,6 +12,7 @@


import javax.annotation.Resource;



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

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



@@ -23,12 +24,12 @@
import com.xcong.excoin.modules.coin.dao.MemberSelectSymbolsDao;

import com.xcong.excoin.modules.coin.dao.OrderCoinDealDao;

import com.xcong.excoin.modules.coin.dao.OrderCoinsDao;

import com.xcong.excoin.modules.coin.entity.CnyUsdtExchange;

import com.xcong.excoin.modules.coin.entity.MemberAccountFlowEntity;

import com.xcong.excoin.modules.coin.entity.OrderCoinsDealEntity;

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;

@@ -39,7 +40,7 @@
import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;

import com.xcong.excoin.modules.member.entity.MemberSelectSymbolsEntity;

import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;

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

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.MessageSourceUtils;

@@ -59,7 +60,7 @@
   @Resource

   MemberSelectSymbolsDao memberSelectSymbolsDao;

   @Resource

   CnyUsdtExchangeDao cnyUsdtExchangeDao;

    PlatformCnyUsdtExchangeDao cnyUsdtExchangeDao;

   @Resource

   OrderCoinsDao orderCoinsDao;

   @Resource

@@ -117,8 +118,8 @@
      BigDecimal closePrice = new BigDecimal("100.0000");

      

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

		
      CnyUsdtExchange cnyUsdtExchange = cnyUsdtExchangeDao.getCNYAndUSDTOne();



      PlatformCnyUsdtExchangeEntity cnyUsdtExchange = cnyUsdtExchangeDao.getCNYAndUSDTOne();

      BigDecimal cnyUsdt = cnyUsdtExchange.getValue();

      TransactionPageOfWalletCoinVo transactionPageOfWalletCoinVo = new TransactionPageOfWalletCoinVo();

      //是否自选

@@ -321,10 +322,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"));

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

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

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

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

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

                     

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

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

@@ -360,13 +361,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 +380,6 @@
                     return Result.ok(MessageSourceUtils.getString("order_service_0013"));

                  }

               }

					
               OrderCoinsDealEntity detail = new OrderCoinsDealEntity();

               detail.setMemberId(memberId);

               detail.setOrderId(orderCoinsEntity.getId());

@@ -388,6 +387,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 +462,26 @@
      return Result.ok(memberSelectSymbolsVo);

   }



   @Override

   public Result findCollectList() {

      //获取用户ID

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

      Map<String, Object> columnMap = new HashMap<>();

      columnMap.put("member_id", memberId);

      List<MemberSelectSymbolsEntity> selectByMap = memberSelectSymbolsDao.selectByMap(columnMap);

		
      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);

   }



}