From 4ac9fb8e1f8ed5a3811cd3e3dc5a4223639867fc Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 May 2021 15:03:58 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc
---
src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java | 2 +-
src/main/resources/mapper/otc/OtcOrderDao.xml | 9 +++------
src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java | 2 +-
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 9 ++++-----
4 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
index 019481a..372d83a 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/controller/OtcMarketBussinessController.java
@@ -36,7 +36,7 @@
private final MemberDao memberDao;
- @ApiOperation(value = "applyMarketBussiness", notes = "申请市商接口")
+ @ApiOperation(value = "申请市商接口", notes = "申请市商接口")
@PostMapping(value = "/applyMaketBussiness")
public Result applyMarketBussiness() {
otcMarketBussinessService.add();
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
index da8e856..363eaff 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
@@ -48,15 +48,14 @@
}
OtcSetting setting = otcSettingDao.selectById(1L);
// 所有已完成订单
- List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 0);
+ List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 3);
if (CollUtil.isEmpty(finishOrders) || setting.getOrderNum() > finishOrders.size()) {
throw new GlobalException("条件未达标");
}
- List<OtcOrder> unFinishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 4);
- if (CollUtil.isNotEmpty(unFinishOrders)) {
- //完成率 = 已完成 / 总单数
- BigDecimal finishRatio = BigDecimal.valueOf(finishOrders.size()).divide(BigDecimal.valueOf(finishOrders.size() + unFinishOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
+ List<OtcOrder> allOrders = otcOrderDao.selectOrderListForUser(member.getId(), null);
+ if (CollUtil.isNotEmpty(allOrders)) {
+ BigDecimal finishRatio = BigDecimal.valueOf(finishOrders.size()).divide(BigDecimal.valueOf(allOrders.size()), 4, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(100));
if (setting.getCompletionRate().compareTo(finishRatio) > 0) {
throw new GlobalException("条件未达标");
}
diff --git a/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java b/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java
index de11da3..4e336b7 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/OtcOrderJob.java
@@ -51,7 +51,7 @@
List<OtcOrder> otcOrders = otcOrderDao.selectOrderListWithStatusAndType(OtcEntrustOrder.ORDER_TYPE_B, OtcOrder.STATUS_SUBMIT);
if (CollUtil.isNotEmpty(otcOrders)) {
for (OtcOrder otcOrder : otcOrders) {
- long between = DateUtil.between(new Date(), DateUtil.offsetMinute(otcOrder.getCreateTime(), 3), DateUnit.SECOND, false);
+ long between = DateUtil.between(new Date(), DateUtil.offsetMinute(otcOrder.getCreateTime(), 30), DateUnit.SECOND, false);
if (between <= 0) {
OtcOrder saleOrder = otcOrderDao.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml
index a965c23..858e4a9 100644
--- a/src/main/resources/mapper/otc/OtcOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcOrderDao.xml
@@ -89,12 +89,9 @@
<select id="selectOrderListForUser" resultType="com.xcong.excoin.modules.otc.entity.OtcOrder">
select * from otc_order
where member_id=#{memberId}
- <!-- 查询除完成以外所有订单 -->
- <if test="status != null and status == 0">
- and status = 3
- </if>
- <if test="status != null and status != 0">
- and status != 3
+ <!-- 查询除完成以外所有订单 -->
+ <if test="status != null">
+ and status == #{status}
</if>
</select>
--
Gitblit v1.9.1