dabaogp.git - Gitblit

			@@ -1,8 +1,5 @@
			package com.nq.enums;

			import com.nq.utils.PropertiesUtil;
			import lombok.Data;

			public enum EUserAssets {


			@@ -14,6 +11,7 @@
			CLOSE_POSITION("CLOSE_POSITION","平仓"),
			CONSTRAINT_CLOSE_POSITION("CONSTRAINT_CLOSE_POSITION","强制平仓"),
			BUY("BUY","购买"),
			BUY_RT("BUY_RT","购买退回"),
			WITHDRAW("WITHDRAW","提现"),

			TRANSFER("TRANSFER","转换"),

			@@ -183,6 +183,7 @@
			String type = eUserAssets.getDesc();
			String before = userAssets.getAvailableBalance().toString();
			String accectType = userAssets.getAccectType();
			BigDecimal amountLog = amount;
			if(Objects.equals(eUserAssets.getCode(), EUserAssets.BUY.getCode())){
			userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
			userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
			@@ -233,6 +234,7 @@
			}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.HANDLING_CHARGE.getCode())){
			if(userAssets.getAvailableBalance().compareTo(amount.abs()) >= 0){
			userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
			amountLog = amount.negate();
			}else {
			userAssets.setHandlingChargeWritten(userAssets.getHandlingChargeWritten().add(amount.abs()));
			}
			@@ -258,7 +260,7 @@
			moneyLog.setDescs(eUserAssets.getDesc());
			moneyLog.setBeFore(before);
			moneyLog.setAfter(after);
			moneyLog.setAmount(amount.toString());
			moneyLog.setAmount(amountLog.toString());
			moneyLog.setAccectType(accectType);
			moneyLog.setType(eUserAssets.getCode());
			moneyLog.setUserId(userId+"");

			@@ -281,10 +281,12 @@
			return ServerResponse.createByErrorMsg("客户资金账户不存在");
			}
			int applyNumber = userStockSubscribe.getApplyNums() - model.getApplyNumber();
			BigDecimal refundPrice = BigDecimal.ZERO;
			String before = userAssets.getAvailableBalance().toString();
			if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) <= 0){
			if(applyNumber > 0){
			//需要退回的资金
			BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
			refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
			//如果不是墨西哥币需要转换金额
			if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
			refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
			@@ -294,7 +296,7 @@
			}
			}else{
			if(applyNumber > 0){
			BigDecimal refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
			refundPrice = userStockSubscribe.getBuyPrice().multiply(new BigDecimal(applyNumber));
			//如果不是墨西哥币需要转换金额
			if (!stockSubscribe.getStockType().equals(EStockType.MX.getCode())) {
			refundPrice = iUserAssetsServices.exchangeAmountByRate(stockSubscribe.getStockType(), refundPrice);
			@@ -309,6 +311,19 @@
			}
			}
			}
			//退回资金交易记录MEX
			MoneyLog moneyLog = new MoneyLog();
			EUserAssets eUserAssets = EUserAssets.BUY_RT;
			moneyLog.setDescs(eUserAssets.getDesc());
			moneyLog.setBeFore(before);
			moneyLog.setAfter(userAssets.getAvailableBalance().toString());
			moneyLog.setAmount(refundPrice.toString());
			moneyLog.setAccectType(EStockType.MX.getCode());
			moneyLog.setType(eUserAssets.getCode());
			moneyLog.setUserId(userAssets.getUserId()+"");
			moneyLog.setSymbol(EStockType.MX.getSymbol());
			moneyLog.setCreateTime(new Date());
			moneyLogMapper.insert(moneyLog);
			ret = userStockSubscribeMapper.update1(model);
			userAssetsMapper.updateById(userAssets);
			iUserPositionService.newStockToPosition(model.getId(),userAssets.getAmountToBeCovered());//转持仓

	src/main/java/com/nq/enums/EUserAssets.java	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/nq/service/impl/UserAssetsServices.java	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/com/nq/service/impl/UserStockSubscribeServiceImpl.java	19 ●●●●● patch \| view \| raw \| blame \| history