From 2b8b6b15c284bb5f75309ff695666f1da35a130a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 18 May 2021 18:43:26 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/test/java/com/xcong/excoin/XchTest.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/test/java/com/xcong/excoin/XchTest.java b/src/test/java/com/xcong/excoin/XchTest.java
index c87176f..b3438a9 100644
--- a/src/test/java/com/xcong/excoin/XchTest.java
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -1,8 +1,11 @@
package com.xcong.excoin;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.xcong.excoin.modules.coin.parameter.dto.CoinInListDto;
import com.xcong.excoin.modules.coin.service.CoinService;
import com.xcong.excoin.modules.yunding.dao.YdOrderDao;
@@ -14,12 +17,16 @@
import org.springframework.boot.test.context.SpringBootTest;
import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
@SpringBootTest
public class XchTest {
@Autowired
private XchProfitService xchProfitService;
+ @Autowired
+ private YdOrderDao ydOrderDao;
@Test
public void usdtReturnTest() {
@@ -34,13 +41,26 @@
}
@Test
- public void becomeAgentTest() {
- xchProfitService.autoBeAgent(40L);
+ public void orderWork() {
+ 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)){
+ for(YdOrderEntity ydOrderEntity : ydOrderEntities){
+ Date workTime = ydOrderEntity.getWorkTime();
+ if(ObjectUtil.isNotEmpty(workTime) && DateUtil.compare(date, workTime) > -1){
+ Long id = ydOrderEntity.getId();
+ ydOrderDao.UpdateByIdAndState(id,YdOrderEntity.ORDER_STATE_WORK);
+ }
+ }
+ }
}
@Test
public void orderUsdtProfitTest() {
- xchProfitService.usdtProfitDistributorByOrderId(1L);
+ xchProfitService.usdtProfitDistributorByOrderId(17L);
}
//
// @Autowired
@@ -51,8 +71,6 @@
// ydPowerJob.orderWork();
// }
- @Autowired
- private YdOrderDao ydOrderDao;
@Test
public void orderTest() {
--
Gitblit v1.9.1