From 44327a748a3e6e04a21faa85e44c89e60a954f23 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 19 五月 2020 11:43:33 +0800
Subject: [PATCH] 活动通用券 取消验证
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java | 145 +-----------------------------------------------
1 files changed, 3 insertions(+), 142 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
index 0c0f61a..3683078 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
@@ -65,8 +65,6 @@
private UserInfoRegisterService userInfoRegisterService;
-
-
@Override
public long countNewUser(Integer isToday, Integer isMonth) {
return userInfoMapper.countNewUser(isToday, isMonth);
@@ -319,55 +317,11 @@
@Override
public List<CountUserInfo> getNewUserData(Date startTime, Date endTime, String channel) {
// 閲嶆柊鏌ヨ缁熻浠婃棩浠ュ強绌虹己
- initChannelUserCount();
return countUserInfoDao.query(CountUserEnum.newUser, startTime, endTime, channel);
}
- // 鍒濆鍖栫粺璁�
- @Override
- public void initChannelUserCount() {
- CountUserInfo lastRecord = countUserInfoDao.getMaxDate(CountUserEnum.newUser);
- Date lastDay = null;
- if (lastRecord != null && lastRecord.getDay() != null) {
- lastDay = lastRecord.getDay();
- }
- try {
- if (lastDay == null) {
- lastDay = TimeUtil.parse("2017-05-14");
- }
- Date today = new Date();
- int betweenDays = DateUtil.daysBetween2(lastDay, today);
- // 缁熻浠婃棩涔嬪墠鐨�
- if (betweenDays > 0) {
- for (int i = 0; i <= betweenDays; i++) {
- addRecordCount(DateUtil.plusDay(i, lastDay));
- }
- }
- // 閲嶆柊缁熻浠婃棩
- addRecordCount(TimeUtil.getGernalTime(today.getTime()));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addRecordCount(String preDay) throws Exception {
- ChannelEnum[] channels = ChannelEnum.values();
- for (int i = 0; i < channels.length; i++) {
- Integer count = userInfoRegisterService.countByChannelAndDay(channels[i].getVlaue(), preDay);
- if (count == null) {
- count = 0;
- }
- CountUserInfo record = new CountUserInfo();
- record.setNum(count);
- record.setChannel(channels[i].name());
- record.setId(StringUtil.Md5(preDay + channels[i].name() + CountUserEnum.newUser.name()));
- record.setDay(TimeUtil.parse(preDay));
- record.setType(CountUserEnum.newUser);
- countUserInfoDao.save(record);
- }
- }
@Override
@@ -427,7 +381,7 @@
for (int m = 0; m <listRegister.size(); m ++) {
boolean reduce = false;
Long uid = listRegister.get(m).getId();
- String vlaue = listRegister.get(m).getChannel().getVlaue();
+ String vlaue = listRegister.get(m).getChannel();
for (int n = 0; n <listOrder.size(); n ++) {
if (channelVlaue.equalsIgnoreCase(vlaue) && uid.longValue() == listOrder.get(n).getUid()) {
@@ -579,7 +533,7 @@
for (int m = 0; m <listRegister.size(); m ++) {
boolean reduce = false;
Long uid = listRegister.get(m).getId();
- String vlaue = listRegister.get(m).getChannel().getVlaue();
+ String vlaue = listRegister.get(m).getChannel();
for (int n = 0; n <listOrder.size(); n ++) {
if (channelVlaue.equalsIgnoreCase(vlaue) && uid.longValue() == listOrder.get(n).getUid()) {
@@ -820,53 +774,11 @@
@Override
public List<CountOrderInfo> counOrderLastNum(Date startTime, Date endTime) {
- // 閲嶆柊鏌ヨ缁熻浠婃棩浠ュ強绌虹己
- initOrderLastNum();
return countOrderInfoDao.query(CountOrderEnum.lastNum, startTime, endTime);
}
- // 鍒濆鍖栫粺璁�
- private void initOrderLastNum() {
- try {
- CountOrderInfo lastRecord = countOrderInfoDao.getMaxDate(CountOrderEnum.lastNum);
- Date lastDay = null;
- if (lastRecord != null && lastRecord.getDay() != null) {
- lastDay = lastRecord.getDay();
- }
- if (lastDay == null) {
- lastDay = TimeUtil.parse("2019-01-01");
- }
-
- Date today = new Date();
- int betweenDays = DateUtil.daysBetween2(lastDay, today);
- if (betweenDays > 0) {
- for (int i = 0; i <= betweenDays; i++) {
- addRecordOrderLastNum(DateUtil.plusDay(i, lastDay));
- }
- } else {
- // 閲嶆柊缁熻鏄ㄦ棩
- addRecordOrderLastNum(DateUtil.reduceDay2(1, lastDay));
- // 閲嶆柊缁熻浠婃棩
- addRecordOrderLastNum(TimeUtil.getGernalTime(today.getTime()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addRecordOrderLastNum(String preDay) throws Exception {
- Integer num = lostOrderService.countLostOrderNum(preDay);
- if (num == null)
- num = 0;
- CountOrderInfo record = new CountOrderInfo();
- record.setNum(num);
- record.setDay(TimeUtil.parse(preDay));
- record.setType(CountOrderEnum.lastNum.name());
- record.setId(StringUtil.Md5(preDay + CountOrderEnum.lastNum.name()));
- countOrderInfoDao.save(record);
- }
@Override
public List<CountOrderInfo> counOrderLastMoney(Date startTime, Date endTime) {
@@ -919,58 +831,7 @@
}
- @Override
- public List<CountOrderInfo> countOrderType(Integer state, Date startTime, Date endTime) {
- // 閲嶆柊鏌ヨ缁熻浠婃棩浠ュ強绌虹己
- initOrderTypeCount();
- return countOrderInfoDao.query(CountOrderEnum.orderType, startTime, endTime, state);
- }
-
- // 鍒濆鍖栫粺璁�
- private void initOrderTypeCount() {
- try {
- CountOrderInfo lastRecord = countOrderInfoDao.getMaxDate(CountOrderEnum.orderType);
- Date lastDay = null;
- if (lastRecord != null && lastRecord.getDay() != null) {
- lastDay = lastRecord.getDay();
- }
-
- if (lastDay == null) {
- lastDay = TimeUtil.parse("2018-01-01");
- }
-
- Date today = new Date();
- int betweenDays = DateUtil.daysBetween2(lastDay, today);
- if (betweenDays > 0) {
- for (int i = 0; i <= betweenDays; i++) {
- addRecordOrderTypeCount(DateUtil.plusDay(i, lastDay));
- }
- } else {
- // 閲嶆柊缁熻鏄ㄦ棩
- addRecordOrderTypeCount(DateUtil.reduceDay2(1, lastDay));
- // 閲嶆柊缁熻浠婃棩
- addRecordOrderTypeCount(TimeUtil.getGernalTime(today.getTime()));
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addRecordOrderTypeCount(String preDay) throws Exception {
- for (int i = 1; i < 4; i++) {
- Integer count = hongBaoV2CountService.countOrderByTypeAndDate(i, preDay);
- if (count == null)
- count = 0;
- CountOrderInfo record = new CountOrderInfo();
- record.setNum(count);
- record.setState(i);
- record.setDay(TimeUtil.parse(preDay));
- record.setType(CountOrderEnum.orderType.name());
- record.setId(StringUtil.Md5(preDay + CountOrderEnum.orderType.name()));
- countOrderInfoDao.save(record);
- }
- }
@Override
public List<CountUserInfo> countUserDownOrderByChannelAndToday(String channel, Date startTime, Date endTime) {
@@ -1027,7 +888,7 @@
for (int m = 0; m <listRegister.size(); m ++) {
boolean reduce = false;
Long uid = listRegister.get(m).getId();
- String vlaue = listRegister.get(m).getChannel().getVlaue();
+ String vlaue = listRegister.get(m).getChannel();
for (int n = 0; n <listOrder.size(); n ++) {
if (channelVlaue.equalsIgnoreCase(vlaue) && uid.longValue() == listOrder.get(n).getUid()) {
--
Gitblit v1.8.0