From 0d9ac58dc11f54351e5e18dba8e950717d78019f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 09 九月 2019 14:55:24 +0800
Subject: [PATCH] 搜索发现
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java
index 5be3338..3a2ae7f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralDetailServiceImpl.java
@@ -28,18 +28,29 @@
@Resource
private IntegralDetailMapper integralDetailMapper;
+ @Override
+ public void insertSelective(IntegralDetail record) {
+ integralDetailMapper.insertSelective(record);
+ }
+
+
+ @Override
+ public IntegralDetail getDetailByUniqueKey(String uniqueKey) {
+ return integralDetailMapper.getDetailByUniqueKey(uniqueKey);
+ }
+
@Override
- public List<IntegralDetailVO> listDetailForClient(Long uid, Long detailId, Date maxTime) {
+ public List<IntegralDetailVO> listDetailForClient(Long uid, Long detailId, Date maxTime, Integer type) {
List<IntegralDetailVO> finalList = new ArrayList<>();
List<IntegralDetail> list = null;
if (detailId == null) {// 棣栨璇锋眰
if (maxTime == null)// 娌℃湁绛涢�夋椂闂�
{
list = integralDetailMapper.selectByMaxCreateTime(uid,
- new Date(System.currentTimeMillis() + 1000 * 60 * 60L), 20);
+ new Date(System.currentTimeMillis() + 1000 * 60 * 60L), 20, type);
} else {// 绛涢�変簡鏃堕棿
- list = integralDetailMapper.selectByMaxCreateTime(uid, maxTime, 20);
+ list = integralDetailMapper.selectByMaxCreateTime(uid, maxTime, 20, type);
}
if (list != null && list.size() > 0) {
Calendar calendar = Calendar.getInstance();
@@ -62,7 +73,7 @@
} else {// 浜屾璇锋眰
int size = 21;
- List<IntegralDetail> tempList = integralDetailMapper.selectByUidWithIndexId(uid, detailId, size);
+ List<IntegralDetail> tempList = integralDetailMapper.selectByUidWithIndexId(uid, detailId, size, type);
Set<Date> dateSet = new HashSet<>();// 鐢ㄤ簬鍌ㄥ瓨鏄惁鍦ㄥ悓涓�鏃堕棿涓婇潰锛堢簿纭埌绉掞級
if (tempList.size() > 0) {
for (IntegralDetail umd : tempList) {
@@ -73,7 +84,7 @@
while (dateSet.size() == 1 && tempList2.size() != tempList.size() && size < 40) {// 鍙湁涓�涓椂闂寸偣鐨勬暟鎹�
tempList = tempList2;
size += 10;
- tempList2 = integralDetailMapper.selectByUidWithIndexId(uid, detailId, size);
+ tempList2 = integralDetailMapper.selectByUidWithIndexId(uid, detailId, size, type);
dateSet.clear();
for (IntegralDetail umd : tempList2) {
dateSet.add(umd.getCreateTime());
@@ -155,8 +166,8 @@
BigDecimal income = new BigDecimal(voList.get(p).getIncome());
// 鍘婚櫎鏀嚭璐熷彿
- finalList.get(key).getMonth().setExpend(expend.setScale(2).toString().replace("-", ""));
- finalList.get(key).getMonth().setIncome(income.setScale(2).toString());
+ finalList.get(key).getMonth().setExpend(expend.setScale(0).toString().replace("-", ""));
+ finalList.get(key).getMonth().setIncome(income.setScale(0).toString());
p++;
}
}
@@ -165,17 +176,17 @@
@Override
- public long countDetailForClient(Long uid, Long detailId, Date maxTime) {
+ public long countDetailForClient(Long uid, Long detailId, Date maxTime, Integer type) {
long monthCount = 0L;
long detailCount = 0L;
// 鏈�氳繃鏃堕棿绛涢�夛紝鏌ヨ鎵�鏈�
if (maxTime == null) {
- detailCount = integralDetailMapper.selectCountByUid(uid);
+ detailCount = integralDetailMapper.selectCountByUid(uid, type);
// 鐢ㄤ簬琛ㄧず褰撳墠鎵�鏈�
- monthCount = integralDetailMapper.selectMonthCountByUid(uid, new Date(System.currentTimeMillis() + 1000 * 60 * 60L));
+ monthCount = integralDetailMapper.selectMonthCountByUid(uid, new Date(System.currentTimeMillis() + 1000 * 60 * 60L), type);
} else {// 閫氳繃鏃堕棿绛涢�変簡鐨勶紝闇�瑕佹煡璇㈡墍鏈�
- detailCount = integralDetailMapper.selectCountByUidAndMaxCreateTime(uid, maxTime);
- monthCount = integralDetailMapper.selectMonthCountByUid(uid, maxTime);
+ detailCount = integralDetailMapper.selectCountByUidAndMaxCreateTime(uid, maxTime, type);
+ monthCount = integralDetailMapper.selectMonthCountByUid(uid, maxTime, type);
}
return monthCount + detailCount;
--
Gitblit v1.8.0