From 37379e979c1daf45d1db774fee87c73c1e092cd3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 10:22:04 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java | 2 ++
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
index f78552d..0e979f0 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/YunDingServiceImpl.java
@@ -288,6 +288,7 @@
BigDecimal totalProfitAll = BigDecimal.ZERO;
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("member_id",memberId);
+ objectQueryWrapper.eq("type",YdOrderEntity.PRODUCT_ORDER);
List<YdOrderEntity> ydOrderEntities = ydOrderDao.selectList(objectQueryWrapper);
if(CollUtil.isNotEmpty(ydOrderEntities)){
for(YdOrderEntity order : ydOrderEntities){
@@ -301,6 +302,7 @@
QueryWrapper<YdOrderEntity> powerNowQuery = new QueryWrapper<>();
powerNowQuery.eq("member_id",memberId);
powerNowQuery.eq("state",YdOrderEntity.ORDER_STATE_WORK);
+ powerNowQuery.eq("type",YdOrderEntity.PRODUCT_ORDER);
List<YdOrderEntity> PowerNowQuery = ydOrderDao.selectList(powerNowQuery);
if(CollUtil.isNotEmpty(PowerNowQuery)){
for(YdOrderEntity order : PowerNowQuery){
@@ -313,6 +315,7 @@
int powerReady = 0;
QueryWrapper<YdOrderEntity> powerReradyQuery = new QueryWrapper<>();
powerReradyQuery.eq("member_id",memberId);
+ powerReradyQuery.eq("type",YdOrderEntity.PRODUCT_ORDER);
powerReradyQuery.eq("state",YdOrderEntity.ORDER_STATE_READY);
List<YdOrderEntity> PowerReradyQuery = ydOrderDao.selectList(powerReradyQuery);
if(CollUtil.isNotEmpty(PowerReradyQuery)){
diff --git a/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java b/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
index c927550..49a1c38 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/YdPowerJob.java
@@ -32,6 +32,7 @@
log.info("产品生效任务");
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("state",YdOrderEntity.ORDER_STATE_READY);
+ objectQueryWrapper.eq("type",YdOrderEntity.PRODUCT_ORDER);
List<YdOrderEntity> ydOrderEntities = ydOrderDao.selectList(objectQueryWrapper);
Date date = new Date();
if(CollUtil.isNotEmpty(ydOrderEntities)){
@@ -52,6 +53,7 @@
public void orderEnd() {
QueryWrapper<YdOrderEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("",YdOrderEntity.ORDER_STATE_WORK);
+ objectQueryWrapper.eq("type",YdOrderEntity.PRODUCT_ORDER);
List<YdOrderEntity> ydOrderEntities = ydOrderDao.selectList(objectQueryWrapper);
Date date = new Date();
if(CollUtil.isNotEmpty(ydOrderEntities)){
--
Gitblit v1.9.1