From e1cc0d03fadc2d251d36c0dc3650f75e830d5363 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 四月 2022 19:12:42 +0800
Subject: [PATCH] 功能完善
---
app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornGetPriceServiceImpl.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornGetPriceServiceImpl.java b/app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornGetPriceServiceImpl.java
index e7369e0..49555b9 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornGetPriceServiceImpl.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/service/impl/goldcorn/GoldCornGetPriceServiceImpl.java
@@ -3,8 +3,12 @@
import java.lang.Exception;
import javax.annotation.Resource;
+import com.yeshi.makemoney.app.entity.SystemEnum;
+import com.yeshi.makemoney.app.entity.goldcorn.GoldCornGetType;
+import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.Date;
import org.yeshi.utils.StringUtil;
@@ -32,12 +36,8 @@
public List<GoldCornGetPrice> list(GoldCornGetPriceQuery goldCornGetPriceQuery, int page, int pageSize) {
DaoQuery daoQuery = new DaoQuery();
daoQuery.type = goldCornGetPriceQuery.getType();
- if (!StringUtil.isNullOrEmpty(goldCornGetPriceQuery.getStartTime())) {
- daoQuery.minValidateTime = new Date(TimeUtil.convertToTimeTemp(goldCornGetPriceQuery.getStartTime(), "yyyy-MM-dd"));
- }
- if (!StringUtil.isNullOrEmpty(goldCornGetPriceQuery.getEndTime())) {
- daoQuery.maxValidateTime = new Date(TimeUtil.convertToTimeTemp(goldCornGetPriceQuery.getEndTime(), "yyyy-MM-dd") + 1000 * 60 * 60 * 24L);
- }
+ daoQuery.minValidateTime = goldCornGetPriceQuery.toStartTime();
+ daoQuery.maxValidateTime = goldCornGetPriceQuery.toEndTime();
daoQuery.start = (page - 1) * pageSize;
@@ -49,12 +49,8 @@
public long count(GoldCornGetPriceQuery goldCornGetPriceQuery) {
DaoQuery daoQuery = new DaoQuery();
daoQuery.type = goldCornGetPriceQuery.getType();
- if (!StringUtil.isNullOrEmpty(goldCornGetPriceQuery.getStartTime())) {
- daoQuery.minValidateTime = new Date(TimeUtil.convertToTimeTemp(goldCornGetPriceQuery.getStartTime(), "yyyy-MM-dd"));
- }
- if (!StringUtil.isNullOrEmpty(goldCornGetPriceQuery.getEndTime())) {
- daoQuery.maxValidateTime = new Date(TimeUtil.convertToTimeTemp(goldCornGetPriceQuery.getEndTime(), "yyyy-MM-dd") + 1000 * 60 * 60 * 24L);
- }
+ daoQuery.minValidateTime = goldCornGetPriceQuery.toStartTime();
+ daoQuery.maxValidateTime = goldCornGetPriceQuery.toEndTime();
return goldCornGetPriceDao.count(daoQuery);
}
@@ -101,5 +97,21 @@
}
}
+ @Override
+ public GoldCornGetPrice getPrice(SystemEnum system, GoldCornGetType type, Date date) {
+ DaoQuery daoQuery = new DaoQuery();
+ daoQuery.maxValidateTime = date;
+ daoQuery.system = system;
+ daoQuery.type = type;
+ daoQuery.sortList = Arrays.asList(new Sort.Order[]{Sort.Order.desc("validateTime")});
+ daoQuery.count = 1;
+
+ List<GoldCornGetPrice> list = goldCornGetPriceDao.list(daoQuery);
+ if (list != null && list.size() > 0) {
+ return list.get(0);
+ }
+ return null;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0