From 73a3d86a47d8da711b609cd224c63526f7d00f9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 七月 2020 12:49:06 +0800
Subject: [PATCH] 比价相关的bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
index f7aa9e0..4bd090c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
@@ -16,7 +16,6 @@
import com.yeshi.fanli.dao.mybatis.pdd.PDDOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
-import com.yeshi.fanli.dao.user.count.CountOrderInfoDao;
import com.yeshi.fanli.dao.user.count.CountOrderTrackRateDao;
import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.dto.order.CountOrderDTO;
@@ -25,7 +24,7 @@
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
@Service
public class CommonOrderCountServiceImpl implements CommonOrderCountService {
@@ -44,16 +43,10 @@
@Resource
private CommonOrderCountMapper commonOrderCountMapper;
-
-
- @Resource
- private CountOrderInfoDao countOrderInfoDao;
-
-
+
@Resource
private CountOrderTrackRateDao countOrderTrackRateDao;
-
@Override
public Long countByState(Integer state) {
return commonOrderCountMapper.countByState(state);
@@ -224,9 +217,21 @@
}
@Override
+ public List<Long> getUidByValidOrderByDay(String preDay) {
+ return commonOrderCountMapper.getUidByValidOrderByDay(preDay);
+ }
+
+
+ @Override
public Integer countDownOrderUserByUidAndDate(Date preDay, List<Long> list) {
return commonOrderCountMapper.countDownOrderUserByUidAndDate(preDay, list);
}
+
+ @Override
+ public List<Long> getDownOrderUserByListUidAndDate(Date preDay, List<Long> list) {
+ return commonOrderCountMapper.getDownOrderUserByListUidAndDate(preDay, list);
+ }
+
@Override
public List<CountOrderDTO> countCommissionByDay(String preDay) {
@@ -330,6 +335,30 @@
record.setId(StringUtil.Md5(preDay + trackRateEnum.name()));
countOrderTrackRateDao.save(record);
}
+
+ @Override
+ public Long countOrderBySourceTypeAndDay(int source, String preDay) {
+ return commonOrderCountMapper.countOrderBySourceTypeAndDay(preDay, source);
+ }
+
+ @Override
+ public long countOrderBySourceAndNearDay(Long uid, int source, int day) {
+ Long count = commonOrderCountMapper.countOrderBySourceAndNearDay(uid, source, day);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+ @Override
+ public long countHistoryOrderNum(Long uid) {
+ Long count = commonOrderCountMapper.countHistoryOrderNum(uid);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
}
--
Gitblit v1.8.0