From c554c7ad5405bafa149dbb6429e8245f78b33ffc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Dec 2020 15:59:53 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index 7211bb8..d2466f9 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -1,9 +1,14 @@
package com.matrix.system.hive.service.imp;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.ModelUtils;
import com.matrix.core.tools.StringUtils;
+import com.matrix.core.tools.WebUtil;
+import com.matrix.system.app.vo.UserAchieveVo;
+import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
@@ -16,10 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* This field was generated by Zking.software.Codegen.
@@ -308,5 +310,49 @@
achieveNewDao.updateAchieveTime(achieveNew);
}
+ @Override
+ public List<AchieveNew> findVipConsumeStatisticsList(AchieveNew achieveNew, PaginationVO pageVo) {
+ return achieveNewDao.selectVipConsumeStatisticsList(achieveNew, pageVo);
+ }
+ @Override
+ public int findVipConsumeStatisticsTotal(AchieveNew achieveNew) {
+ return achieveNewDao.selectVipConsumeStatisticsTotal(achieveNew);
+ }
+
+ @Override
+ public UserAchieveVo findUserAchieveByTime(int type) {
+ SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ Calendar calendar = Calendar.getInstance();
+ Date startTime = calendar.getTime();
+ Date endTime = calendar.getTime();
+ switch (type) {
+ // 本日
+ case 1 :
+ break;
+ // 昨日
+ case 2:
+ startTime = DateUtil.previousNDate(startTime, 1);
+ endTime = startTime;
+ break;
+ // 本月
+ case 3:
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ startTime = calendar.getTime();
+ break;
+ // 上月
+ case 4:
+ calendar.add(Calendar.MONTH, -1);
+ calendar.set(Calendar.DAY_OF_MONTH, 1);
+ startTime = calendar.getTime();
+ calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+ endTime = calendar.getTime();
+ break;
+ default:
+ break;
+
+ }
+
+ return achieveNewDao.selectUserAchieveByTime(startTime, endTime, users.getSuId());
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1