From bf0a347104579e5f7a2ed6e660ebb9f17f76ffc0 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 17 一月 2020 16:51:54 +0800
Subject: [PATCH] 后台编辑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 210 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 138 insertions(+), 72 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 50b530f..9e7da62 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
@@ -1,8 +1,8 @@
package com.yeshi.fanli.service.impl.count;
import java.math.BigDecimal;
-import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -16,9 +16,16 @@
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;
+import com.yeshi.fanli.entity.admin.count.CountOrderTrackRate;
+import com.yeshi.fanli.entity.admin.count.CountOrderTrackRate.OrderTrackRateEnum;
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;
@Service
public class CommonOrderCountServiceImpl implements CommonOrderCountService {
@@ -37,6 +44,15 @@
@Resource
private CommonOrderCountMapper commonOrderCountMapper;
+
+
+ @Resource
+ private CountOrderInfoDao countOrderInfoDao;
+
+
+ @Resource
+ private CountOrderTrackRateDao countOrderTrackRateDao;
+
@Override
public Long countByState(Integer state) {
@@ -131,77 +147,6 @@
return listObject;
}
- @Override
- public List<ChartTDO> getTrackAccuracyRate(Integer dateType, String year, String startTime, String endTime,
- int sourceType) throws Exception {
-
- List<ChartTDO> result_list = null;
-
- // 鐢ㄦ埛璁㈠崟
- List<ChartTDO> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year, startTime, endTime,
- sourceType);
- if (listTotal == null || listTotal.size() == 0) {
- return result_list;
- }
-
- // 娣樺疂鑱旂洘
- List<ChartTDO> type_list = null;
- switch (sourceType) {
- case Constant.SOURCE_TYPE_TAOBAO:
- type_list = taoBaoOrderMapper.countOrderNumber(dateType, year, startTime, endTime);
- break;
- case Constant.SOURCE_TYPE_JD:
- type_list = jdOrderItemMapper.countOrderNumber(dateType, year, startTime, endTime);
- break;
- case Constant.SOURCE_TYPE_PDD:
- type_list = pddOrderMapper.countOrderNumber(dateType, year, startTime, endTime);
- break;
- }
- if (type_list == null || type_list.size() == 0) {
- return null;
- }
-
- switch (dateType) {
- case 1: // 鎸夊ぉ澶勭悊
- result_list = dayFactory(startTime, endTime, type_list);
- break;
- case 2: // 鎸夋湀澶勭悊
- result_list = monthFactory(type_list);
- break;
- case 3:
- result_list = yearFactory(type_list);
- break;
- default:
- break;
- }
-
- DecimalFormat df = new DecimalFormat("#.00");
-
- for (int i = 0; i < result_list.size(); i++) {
- double proportion = 0;
- ChartTDO chartTDO = result_list.get(i);
- String showDate = chartTDO.getShowDate();
- for (int j = 0; j < listTotal.size(); j++) {
- ChartTDO innerChartTDO = listTotal.get(j);
- String innerDate = innerChartTDO.getShowDate();
- if (innerDate != null && innerDate.toString().equals(showDate.toString())) {
- String innerValue = innerChartTDO.getShowValue();
- long innerData = Long.parseLong(innerValue);
-
- String showValue = chartTDO.getShowValue();
- long showData = Long.parseLong(showValue);
-
- if (showData > 0) {
- proportion = innerData / (double) showData;
- }
- break; // 缁撴潫鍐呴儴寰幆
- }
- }
- chartTDO.setShowValue(Double.parseDouble(df.format(proportion * 100)) + "");
- }
-
- return result_list;
- }
@Override
public List<ChartTDO> countWeiQaunOrderMoney(Integer dateType, String year, String startTime, String endTime)
@@ -261,4 +206,125 @@
public List<Long> getSameGoodsOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameGoodsOrderCount) {
return commonOrderCountMapper.getSameGoodsOrderByUidAndHongBaoType(typeList, uid, minSameGoodsOrderCount);
}
+
+
+ @Override
+ public Integer countOderByUidAndDate(Date preDay, Long uid) {
+ return commonOrderCountMapper.countOderByUidAndDate(preDay, uid);
+ }
+
+ @Override
+ public List<CountOrderDTO> countValidOrderByDay(String preDay) {
+ return commonOrderCountMapper.countValidOrderByDay(preDay);
+ }
+
+ @Override
+ public Integer countDownOrderUserByUidAndDate(Date preDay, List<Long> list) {
+ return commonOrderCountMapper.countDownOrderUserByUidAndDate(preDay, list);
+ }
+
+ @Override
+ public List<CountOrderDTO> countCommissionByDay(String preDay) {
+ return commonOrderCountMapper.countCommissionByDay(preDay);
+ }
+
+
+ @Override
+ public Integer countOderByDate(String preDay) {
+ return commonOrderCountMapper.countOderByDate(preDay);
+ }
+
+ @Override
+ public BigDecimal countCommissionByDate(String preDay) {
+ return commonOrderCountMapper.countCommissionByDate(preDay);
+ }
+
+
+
+ @Override
+ public List<CountOrderTrackRate> getOrderTrackRate(int type, Date startTime, Date endTime) {
+
+ OrderTrackRateEnum trackRateEnum = null;
+ if (type == 1) {
+ trackRateEnum = OrderTrackRateEnum.taobao;
+ } else if (type == 2) {
+ trackRateEnum = OrderTrackRateEnum.jd;
+ } else if (type == 3) {
+ trackRateEnum = OrderTrackRateEnum.pdd;
+ } else {
+ trackRateEnum = OrderTrackRateEnum.taobao;
+ }
+
+ // 閲嶆柊鏌ヨ缁熻浠婃棩浠ュ強绌虹己
+ initOrderTrackRate(trackRateEnum);
+
+ return countOrderTrackRateDao.query(trackRateEnum, startTime, endTime);
+ }
+
+ // 鍒濆鍖栫粺璁�
+ private void initOrderTrackRate(OrderTrackRateEnum trackRateEnum) {
+ try {
+ CountOrderTrackRate lastRecord = countOrderTrackRateDao.getMaxDate(trackRateEnum);
+ 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++) {
+ addOrderTrackRateCount(DateUtil.plusDay(i, lastDay), trackRateEnum);
+ }
+ } else {
+ // 閲嶆柊缁熻鏄ㄦ棩
+ addOrderTrackRateCount(DateUtil.reduceDay2(1, lastDay), trackRateEnum);
+ // 閲嶆柊缁熻浠婃棩
+ addOrderTrackRateCount(TimeUtil.getGernalTime(today.getTime()), trackRateEnum);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+ private void addOrderTrackRateCount(String preDay, OrderTrackRateEnum trackRateEnum) throws Exception {
+ int value = trackRateEnum.getValue();
+ Long count = commonOrderCountMapper.countOrderBySourceTypeAndDay(preDay,value);
+ if (count == null) {
+ count = 0L;
+ }
+
+ Long total = null;
+ switch (value) {
+ case Constant.SOURCE_TYPE_TAOBAO:
+ total = taoBaoOrderMapper.countOrderByDay(preDay);
+ break;
+ case Constant.SOURCE_TYPE_JD:
+ total = jdOrderItemMapper.countOrderByDay(preDay);
+ break;
+ case Constant.SOURCE_TYPE_PDD:
+ total = pddOrderMapper.countOrderByDay(preDay);
+ break;
+ }
+
+ if(total == null)
+ total = 0L;
+
+ CountOrderTrackRate record = new CountOrderTrackRate();
+ record.setNum(count);
+ record.setTotalNum(total);
+ record.setDay(TimeUtil.parse(preDay));
+ record.setType(trackRateEnum.name());
+ record.setId(StringUtil.Md5(preDay + trackRateEnum.name()));
+ countOrderTrackRateDao.save(record);
+ }
+
+
}
--
Gitblit v1.8.0