exchange.git - Gitblit

			@@ -10,6 +10,8 @@
			import com.alibaba.fastjson.JSONObject;
			import com.xcong.excoin.modules.blackchain.service.RocService;
			import com.xcong.excoin.modules.coin.mapper.OrderCoinsDealMapper;
			import com.xcong.excoin.modules.member.dao.MemberDao;
			import com.xcong.excoin.modules.member.entity.MemberEntity;
			import com.xcong.excoin.modules.platform.entity.PlatformCnyUsdtExchangeEntity;
			import com.xcong.excoin.modules.platform.entity.PlatformSymbolsCoinEntity;

			@@ -85,6 +87,9 @@

			@Resource
			private CoinTraderFactory factory;

			@Resource
			private MemberDao memberDao;


			@Override
			@@ -332,6 +337,11 @@
			public Result submitSalesWalletCoinOrderWithMatch(String symbol, Integer type, Integer tradeType, BigDecimal price, BigDecimal amount, BigDecimal entrustAmount) {
			//获取用户ID
			Long memberId = LoginUserUtils.getAppLoginUser().getId();
			// 需要实名
			MemberEntity memberEntity = memberDao.selectById(memberId);
			if(!MemberEntity.CERTIFY_STATUS_Y.equals(memberEntity.getCertifyStatus())){
			return Result.fail(MessageSourceUtils.getString("member_controller_0001"));
			}
			BigDecimal nowPriceinBigDecimal = price;
			//查询当前价
			//BigDecimal nowPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol + "/USDT")));
			@@ -498,7 +508,7 @@
			//获取用户ID
			Long memberId = LoginUserUtils.getAppLoginUser().getId();
			OrderCoinsEntity orderCoinsEntity = orderCoinsDao.selectById(orderId);
			if (ObjectUtil.isNotEmpty(orderCoinsEntity) && orderCoinsEntity.getMemberId() == memberId) {
			if (ObjectUtil.isNotEmpty(orderCoinsEntity) && orderCoinsEntity.getMemberId().equals(memberId) ) {
			// 如果是撮合交易单
			if (SymbolsConstats.EXCHANGE_SYMBOLS.contains(orderCoinsEntity.getSymbol())) {
			return this.cancelEntrustWalletCoinOrderForMatch(orderId);
			@@ -584,7 +594,7 @@
			// 取消撮合订单的单
			CoinTrader trader = factory.getTrader(orderCoinsEntity.getSymbol());
			trader.cancelOrder(orderCoinsEntity);
			if (ObjectUtil.isNotEmpty(orderCoinsEntity) && orderCoinsEntity.getMemberId() == memberId) {
			if (ObjectUtil.isNotEmpty(orderCoinsEntity) && orderCoinsEntity.getMemberId().equals(memberId)) {
			if (orderCoinsEntity.getOrderStatus() == OrderCoinsEntity.ORDERSTATUS_CANCEL \|\| orderCoinsEntity.getOrderStatus()==OrderCoinsEntity.ORDERSTATUS_DONE) {
			return Result.fail(MessageSourceUtils.getString("order_service_0012"));
			}
			@@ -616,6 +626,8 @@
			if (ObjectUtil.isNotEmpty(walletCoin)) {
			//手续费 = 开仓价数量手续费率
			//返还金额=开仓价*未成交数量+手续费

			// 市价的按成交额退款
			BigDecimal returnBalance = orderCoinsEntity.getEntrustAmount().subtract(orderCoinsEntity.getDealAmount());
			// 需要退回的手续费
			BigDecimal returnFee = BigDecimal.ZERO;
			@@ -946,6 +958,13 @@
			update.setOrderStatus(OrderCoinsEntity.ORDERSTATUS_DONE);
			update.setUpdateTime(new Date());
			orderCoinsDao.updateById(update);
			// 限价买入时，如果成交价比设置的价格低，需要退还多余的冻结
			OrderCoinsEntity coinsEntity = orderCoinsDao.selectById(buyOrderId);
			BigDecimal subtract = coinsEntity.getEntrustAmount().subtract(coinsEntity.getDealAmount());
			if(subtract.compareTo(BigDecimal.ZERO)>=0){
			// 下单扣的比较多
			memberWalletCoinDao.updateWalletBalance(coinsEntity.getId(),subtract,subtract,subtract.negate());
			}
			} else {
			OrderCoinsEntity update = new OrderCoinsEntity();
			update.setId(buyOrderId);
			@@ -1041,69 +1060,6 @@
			memberAccountFlowEntityDao.insert(recordSell);
			}
			}
			}

			@Override
			public void initOrders(String symbol, Integer type, Integer tradeType, BigDecimal price,
			BigDecimal amount, BigDecimal entrustAmount) {
			//获取用户ID
			Long memberId = 10L;
			BigDecimal nowPriceinBigDecimal = price;
			//查询当前价
			//BigDecimal nowPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol + "/USDT")));

			// 获取交易管理的杠杠倍率，手续费率等信息，由平台进行设置
			symbol = symbol.toUpperCase();

			// 手续费用(手续费=建仓价X数量X手续费率)
			BigDecimal closingPrice = BigDecimal.ZERO;

			// BigDecimal totalPayPricCoin = nowPrice.multiply(amount).add(closingPrice);
			// 首先将单插入到数据库主表（委托表）
			// 创建订单
			OrderCoinsEntity order = new OrderCoinsEntity();
			//根据委托类型生成不同数据
			// 如果是限价交易直接插入主表数据
			order.setMemberId(memberId);
			order.setOrderNo(generateSimpleSerialno(memberId.toString()));
			order.setOrderType(type);
			order.setSymbol(symbol);
			//order.setMarkPrice(nowPrice);

			// 成交量先设置为0
			order.setDealCnt(BigDecimal.ZERO);
			// 成交价
			//order.setDealPrice(price);
			// 成交金额
			order.setDealAmount(BigDecimal.ZERO);
			order.setOrderStatus(OrderCoinsEntity.ORDERSTATUS_DODING);
			order.setTradeType(tradeType);
			// 手续费
			order.setFeeAmount(closingPrice);
			if (OrderCoinsEntity.TRADETYPE_FIXEDPRICE.equals(tradeType)) {
			// 限价是需要价格和数量可以得到成交金额
			// 下单量
			order.setEntrustCnt(amount);
			// 下单价格
			order.setEntrustPrice(price);
			order.setEntrustAmount(amount.multiply(price));
			} else {
			if (OrderCoinsEntity.ORDERTYPE_BUY.equals(type)) {
			// 市价只有金额
			order.setEntrustAmount(entrustAmount);
			} else {
			// 下单量
			order.setEntrustCnt(amount);
			// 下单价格
			order.setEntrustPrice(price);
			order.setEntrustAmount(amount.multiply(price));
			}

			}
			orderCoinsDao.insert(order);
			// 加入到撮合
			CoinTrader trader = factory.getTrader(symbol);
			trader.trade(order);
			}

			}