From 10442c267d316d4c4f86ca2fa072eaef4337bd75 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 10:17:00 +0800
Subject: [PATCH] 20210528
---
src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java | 20 ++++++++++++++++----
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 28 ++++++++++++++++------------
2 files changed, 32 insertions(+), 16 deletions(-)
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 063e337..4fee959 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
@@ -130,43 +130,47 @@
@Override
public Result applyConditions() {
- MemberEntity member = LoginUserUtils.getAppLoginUser();
- member = memberDao.selectById(member.getId());
-// long memberId = 444L;
-// MemberEntity member = memberDao.selectById(memberId);
+// MemberEntity member = LoginUserUtils.getAppLoginUser();
+// member = memberDao.selectById(member.getId());
+ long memberId = 444L;
+ MemberEntity member = memberDao.selectById(memberId);
ApplyConditionsVo applyConditionsVo = new ApplyConditionsVo();
OtcSetting setting = otcSettingDao.selectById(1L);
+ applyConditionsVo.setOrderNum(setting.getOrderNum());
+ applyConditionsVo.setTotalAmount(setting.getTotalAmount());
+ applyConditionsVo.setCompletionRate(setting.getCompletionRate());
+ applyConditionsVo.setCancellNum(setting.getCancellNum());
// 所有已完成订单
List<OtcOrder> finishOrders = otcOrderDao.selectOrderListForUser(member.getId(), 3);
if (CollUtil.isEmpty(finishOrders) || setting.getOrderNum() > finishOrders.size()) {
- applyConditionsVo.setOrderNum(2);
+ applyConditionsVo.setOrderNumStatus(2);
}else{
- applyConditionsVo.setOrderNum(1);
+ applyConditionsVo.setOrderNumStatus(1);
}
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) {
- applyConditionsVo.setCompletionRate(2);
+ applyConditionsVo.setCompletionRateStatus(2);
}else{
- applyConditionsVo.setCompletionRate(1);
+ applyConditionsVo.setCompletionRateStatus(1);
}
}
BigDecimal totalAmount = otcOrderDao.selectOrderTotalAmount(member.getId());
if (setting.getTotalAmount().compareTo(totalAmount) > 0) {
- applyConditionsVo.setTotalAmount(2);
+ applyConditionsVo.setTotalAmountStatus(2);
}else{
- applyConditionsVo.setTotalAmount(1);
+ applyConditionsVo.setTotalAmountStatus(1);
}
Integer certifyStatus = member.getCertifyStatus();
if(MemberEntity.CERTIFY_STATUS_Y == certifyStatus){
- applyConditionsVo.setMemberAuth(1);
+ applyConditionsVo.setMemberAuthStatus(1);
}else{
- applyConditionsVo.setMemberAuth(2);
+ applyConditionsVo.setMemberAuthStatus(2);
}
return Result.ok(applyConditionsVo);
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java
index 359e4d1..a554624 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/ApplyConditionsVo.java
@@ -11,15 +11,27 @@
public class ApplyConditionsVo {
@ApiModelProperty(value = "商家入驻总单数1：满足 2：不满足")
- private Integer orderNum;
+ private Integer orderNumStatus;
@ApiModelProperty(value = "商家入驻完成率1：满足 2：不满足")
- private Integer completionRate;
+ private Integer completionRateStatus;
@ApiModelProperty(value = "商家入驻总金额1：满足 2：不满足")
- private Integer totalAmount;
+ private Integer totalAmountStatus;
@ApiModelProperty(value = "实名认证1：满足 2：不满足")
- private Integer memberAuth;
+ private Integer memberAuthStatus;
+
+ @ApiModelProperty(value = "总单数")
+ private Integer orderNum;
+
+ @ApiModelProperty(value = "完成率")
+ private BigDecimal completionRate;
+
+ @ApiModelProperty(value = "总金额")
+ private BigDecimal totalAmount;
+
+ @ApiModelProperty(value = "今日取消次数")
+ private Integer cancellNum;
}
--
Gitblit v1.9.1