From a53b79219e1f05c4871165804d799a08aa66f4d1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Jun 2020 19:26:04 +0800
Subject: [PATCH] add tow new job
---
src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java | 5 +
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 57 +++++++++++++++++++
src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java | 54 ++++++++++++++++++
src/main/resources/mapper/home/MemberQuickBuySaleDao.xml | 6 ++
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java | 2
src/main/resources/application-test.yml | 1
src/main/java/com/xcong/excoin/modules/home/dao/MemberQuickBuySaleDao.java | 2
src/main/resources/application.yml | 1
8 files changed, 128 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
index 52166a3..7da4069 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java
@@ -146,4 +146,9 @@
* 批次号 队列平仓时使用，避免重复
*/
public String batchNo;
+
+ /**
+ * 持仓费
+ */
+ private BigDecimal holdAmount;
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java b/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
index 9294a72..c480514 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java
@@ -42,4 +42,6 @@
public Result findOrderDetailById(Long id);
+ public void calHoldOrderHoldFeeAmount();
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index 7a7014c..fb05a19 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -22,6 +22,7 @@
import com.xcong.excoin.modules.contract.parameter.dto.*;
import com.xcong.excoin.modules.contract.parameter.vo.*;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
+import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.AgentReturnEntity;
@@ -78,6 +79,9 @@
@Resource
private OrderProducer producer;
+
+ @Resource
+ private MemberDao memberDao;
@Transactional(rollbackFor = Exception.class)
@Override
@@ -561,4 +565,57 @@
OrderDetailVo orderDetailVo = ContractOrderEntityMapper.INSTANCE.entityToDetailVo(contractOrderEntity);
return Result.ok(orderDetailVo);
}
+
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public void calHoldOrderHoldFeeAmount() {
+ List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectAllHoldOrder();
+ PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
+
+ if (CollUtil.isNotEmpty(list)) {
+ for (ContractHoldOrderEntity holdOrderEntity : list) {
+ BigDecimal holdAmount = holdOrderEntity.getHoldAmount();
+ if (holdAmount == null) {
+ holdAmount = BigDecimal.ZERO;
+ }
+
+ BigDecimal thisTimeHold = holdOrderEntity.getBondAmount().multiply(tradeSettingEntity.getDoingRatio());
+ log.info("订单编号:{}, 持仓费:{}", holdOrderEntity.getOrderNo(), thisTimeHold);
+ MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
+
+ // 判断当前可用余额是否大于目前持仓费，若大于则扣可用余额，若小于则扣保证金中的金额
+ if (thisTimeHold.compareTo(walletContractEntity.getAvailableBalance()) < 0) {
+ memberWalletContractDao.increaseWalletContractBalanceById(thisTimeHold.negate(), thisTimeHold.negate(), null, walletContractEntity.getId());
+
+ holdOrderEntity.setHoldAmount(holdAmount.add(thisTimeHold));
+ contractHoldOrderDao.updateById(holdOrderEntity);
+ } else {
+ BigDecimal available = walletContractEntity.getAvailableBalance();
+ BigDecimal lessAmount = thisTimeHold.subtract(available);
+ MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getId());
+ memberWalletContractDao.increaseWalletContractBalanceById(available.negate(), available.negate(), null, walletContractEntity.getId());
+
+ BigDecimal newBondAmount = holdOrderEntity.getBondAmount().subtract(lessAmount);
+
+ BigDecimal newForcePrice = CalculateUtil.getForceSetPrice(newBondAmount.subtract(holdOrderEntity.getOpeningFeeAmount()), holdOrderEntity.getOpeningPrice(), holdOrderEntity.getSymbolCnt(), holdOrderEntity.getSymbolSku(), holdOrderEntity.getOpeningType(), memberEntity);
+
+ holdOrderEntity.setHoldAmount(holdAmount.add(thisTimeHold));
+ holdOrderEntity.setBondAmount(newBondAmount);
+ holdOrderEntity.setForceClosingPrice(newForcePrice);
+ holdOrderEntity.setOperateNo(holdOrderEntity.getOperateNo() + 1);
+ contractHoldOrderDao.updateById(holdOrderEntity);
+
+ OrderModel model = null;
+ // 开多
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {
+ model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_MORE_BOMB.getValue(), newForcePrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ // 开空
+ } else {
+ model = new OrderModel(holdOrderEntity.getId(), RabbitPriceTypeEnum.CLOSE_LESS_BOMB.getValue(), newForcePrice.setScale(8, RoundingMode.HALF_UP).toPlainString(), holdOrderEntity.getSymbol());
+ }
+ producer.sendPriceOperate(JSONObject.toJSONString(model));
+ }
+ }
+ }
+ }
}
diff --git a/src/main/java/com/xcong/excoin/modules/home/dao/MemberQuickBuySaleDao.java b/src/main/java/com/xcong/excoin/modules/home/dao/MemberQuickBuySaleDao.java
index 5f084f8..9f0f27f 100644
--- a/src/main/java/com/xcong/excoin/modules/home/dao/MemberQuickBuySaleDao.java
+++ b/src/main/java/com/xcong/excoin/modules/home/dao/MemberQuickBuySaleDao.java
@@ -9,4 +9,6 @@
MemberQuickBuySaleEntity selectByIdAndMemberId(@Param("memberId")Long memberId,@Param("id")Long id);
+ int updateQuickBuySaleTimeOut();
+
}
diff --git a/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java b/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java
new file mode 100644
index 0000000..eda6f7f
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java
@@ -0,0 +1,54 @@
+package com.xcong.excoin.quartz.job;
+
+import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
+import com.xcong.excoin.modules.home.dao.MemberQuickBuySaleDao;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * @author wzy
+ * @date 2020-06-08
+ **/
+@Slf4j
+@Component
+@ConditionalOnProperty(prefix = "app", name = "loop-job", havingValue = "true")
+public class LoopExecutorJob {
+
+ @Resource
+ private MemberQuickBuySaleDao memberQuickBuySaleDao;
+
+ @Resource
+ private ContractHoldOrderService contractHoldOrderService;
+
+ /**
+ * 更新快捷充值超时状态
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void updateChargeUsdt() {
+ try {
+ memberQuickBuySaleDao.updateQuickBuySaleTimeOut();
+ } catch (Exception e) {
+ log.error("更新快捷充值超时状态", e);
+ }
+ }
+
+
+ /**
+ * 持仓费计算
+ */
+ @Scheduled(cron = "0 0 0 */1 * ?")
+ public void updateDoingPrice() {
+ log.info("#持仓费计算#");
+ try {
+ contractHoldOrderService.calHoldOrderHoldFeeAmount();
+ } catch (Exception e) {
+ log.error("#持仓费计算错误#", e);
+ }
+ }
+}
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 74aa15a..849fecd 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -96,6 +96,7 @@
kline-update-job: false
newest-price-update-job: true
other-job: true
+ loop-job: true
rabbit-consumer: true
aliyun:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cf1a6f1..9b7adbf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -99,6 +99,7 @@
newest-price-update-job: false
#其他任务控制
other-job: false
+ loop-job: false
rabbit-consumer: false
aliyun:
diff --git a/src/main/resources/mapper/home/MemberQuickBuySaleDao.xml b/src/main/resources/mapper/home/MemberQuickBuySaleDao.xml
index 4af7288..36e68e0 100644
--- a/src/main/resources/mapper/home/MemberQuickBuySaleDao.xml
+++ b/src/main/resources/mapper/home/MemberQuickBuySaleDao.xml
@@ -6,4 +6,10 @@
<select id="selectByIdAndMemberId" resultType="com.xcong.excoin.modules.home.entity.MemberQuickBuySaleEntity">
SELECT a.* FROM member_quick_buy_sale a WHERE a.id = #{id} AND a.member_id = #{memberId}
</select>
+
+ <update id="updateQuickBuySaleTimeOut">
+ update member_quick_buy_sale
+ set order_status = 5
+ where order_type = 'B' and order_status=1
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1