From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 259 ++++++++++++++++++++++++++++-----------------------
1 files changed, 140 insertions(+), 119 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 6e7b560..50b530f 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.HashMap;
import java.util.List;
import java.util.Map;
@@ -11,42 +11,47 @@
import org.springframework.stereotype.Service;
import org.yeshi.utils.DateUtil;
+import com.yeshi.fanli.dao.mybatis.jd.JDOrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderCountMapper;
+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.dto.ChartTDO;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
+import com.yeshi.fanli.util.Constant;
@Service
public class CommonOrderCountServiceImpl implements CommonOrderCountService {
-
@Resource
private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;
@Resource
private TaoBaoOrderMapper taoBaoOrderMapper;
-
+
+ @Resource
+ private JDOrderItemMapper jdOrderItemMapper;
+
+ @Resource
+ private PDDOrderMapper pddOrderMapper;
+
@Resource
private CommonOrderCountMapper commonOrderCountMapper;
-
-
+
@Override
public Long countByState(Integer state) {
- return commonOrderCountMapper.countByState(state);
+ return commonOrderCountMapper.countByState(state);
}
-
- public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list) throws Exception {
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
-
+ public List<ChartTDO> dayFactory(String startTime, String endTime, List<ChartTDO> list) throws Exception {
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
if (startTime.equals(endTime)) {
-
- Map<String, Object> map = list.get(0);
- Object total = map.get("showValue");
- if (total == null) {
- map.put("showValue", 0);
+ ChartTDO chartTDO = list.get(0);
+ String showValue = chartTDO.getShowValue();
+ if (showValue == null) {
+ chartTDO.setShowValue("0");
}
- listObject.add(map);
+ listObject.add(chartTDO);
return listObject;
}
@@ -58,27 +63,22 @@
plusDay = DateUtil.plusDay(i, startTime);
}
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
+ String total = null;
for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
- String month = createDate.toString();
- if (plusDay.equalsIgnoreCase(month)) {
- total = map.get("showValue");
+ ChartTDO chartTDO = list.get(j);
+ String showDate = chartTDO.getShowDate();
+ if (plusDay.equalsIgnoreCase(showDate)) {
+ total = chartTDO.getShowValue();
break;
}
}
-
if (total == null) {
- total = 0;
+ total = "0";
}
- mapObject.put("showValue", total);
-
- mapObject.put("showDate", plusDay);
-
- listObject.add(mapObject);
+ ChartTDO chartTDO = new ChartTDO();
+ chartTDO.setShowDate(plusDay);
+ chartTDO.setShowValue(total);
+ listObject.add(chartTDO);
if (plusDay.equals(endTime)) {
break; // 鏃堕棿缁撴潫
@@ -88,149 +88,141 @@
return listObject;
}
- public List<Map<String, Object>> monthFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
+ public List<ChartTDO> monthFactory(List<ChartTDO> list) {
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
// 12 涓湀澶勭悊
for (int i = 1; i <= 12; i++) {
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
+ String total = null;
for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
- String month = createDate.toString();
+ ChartTDO chartTDO = list.get(j);
+ String month = chartTDO.getShowDate();
if ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
- total = map.get("showValue");
+ total = chartTDO.getShowValue();
break;
}
}
if (total == null) {
- total = 0;
+ total = "0";
}
- mapObject.put("showValue", total);
-
- if (i <10) {
- mapObject.put("showDate", "0"+ i);
+
+ ChartTDO chartTDO = new ChartTDO();
+ chartTDO.setShowValue(total);
+ if (i < 10) {
+ chartTDO.setShowDate("0" + i);
} else {
- mapObject.put("showDate", i);
+ chartTDO.setShowDate(i + "");
}
-
- listObject.add(mapObject);
+ listObject.add(chartTDO);
}
return listObject;
}
- public List<Map<String, Object>> yearFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
-
+ public List<ChartTDO> yearFactory(List<ChartTDO> list) {
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
for (int i = 0; i < list.size(); i++) {
- Map<String, Object> map = list.get(i);
- Object total = map.get("showValue");
-
- if (total == null) {
- total = 0;
+ ChartTDO chartTDO = list.get(i);
+ String showValue = chartTDO.getShowValue();
+ if (showValue == null) {
+ chartTDO.setShowValue("0");
}
- map.put("showValue", total);
-
- listObject.add(map);
+ listObject.add(chartTDO);
}
-
return listObject;
}
-
+
@Override
- public List<Map<String, Object>> getTrackAccuracyRate(Integer dateType, String year, String startTime,
- String endTime) throws Exception{
-
- List<Map<String, Object>> result_list = null;
-
+ public List<ChartTDO> getTrackAccuracyRate(Integer dateType, String year, String startTime, String endTime,
+ int sourceType) throws Exception {
+
+ List<ChartTDO> result_list = null;
+
// 鐢ㄦ埛璁㈠崟
- List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year,
- startTime, endTime);
+ List<ChartTDO> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year, startTime, endTime,
+ sourceType);
if (listTotal == null || listTotal.size() == 0) {
return result_list;
- }
-
+ }
+
// 娣樺疂鑱旂洘
- List<Map<String, Object>> type_list = taoBaoOrderMapper.countOrderNumber(dateType, year,
- startTime, endTime);
-
+ 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;
+
+ 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;
- Map<String, Object> resultMap = result_list.get(i);
-
- Object showDate = resultMap.get("showDate");
+ ChartTDO chartTDO = result_list.get(i);
+ String showDate = chartTDO.getShowDate();
for (int j = 0; j < listTotal.size(); j++) {
- Map<String, Object> innerMap = listTotal.get(j);
- Object innerDate = innerMap.get("showDate");
-
+ ChartTDO innerChartTDO = listTotal.get(j);
+ String innerDate = innerChartTDO.getShowDate();
if (innerDate != null && innerDate.toString().equals(showDate.toString())) {
- Object innerValue = innerMap.get("showValue");
- long innerData = Long.parseLong(innerValue.toString());
-
- Object showValue = resultMap.get("showValue");
- long showData = Long.parseLong(showValue.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;
+ proportion = innerData / (double) showData;
}
-
break; // 缁撴潫鍐呴儴寰幆
}
}
-
- resultMap.put("showValue", Double.parseDouble(df.format(proportion *100)));
+ chartTDO.setShowValue(Double.parseDouble(df.format(proportion * 100)) + "");
}
-
+
return result_list;
}
@Override
- public List<Map<String, Object>> countWeiQaunOrderMoney(Integer dateType, String year, String startTime,
- String endTime) throws Exception{
+ public List<ChartTDO> countWeiQaunOrderMoney(Integer dateType, String year, String startTime, String endTime)
+ throws Exception {
return taoBaoWeiQuanOrderMapper.countWeiQaunOrderMoney(dateType, year, startTime, endTime);
}
-
-
+
@Override
- public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,
- String endTime) throws Exception{
+ public List<ChartTDO> countWeiQaunOrderNumber(Integer dateType, String year, String startTime, String endTime)
+ throws Exception {
return taoBaoWeiQuanOrderMapper.countWeiQaunOrderNumber(dateType, year, startTime, endTime);
-
}
-
+
@Override
public Map<String, Object> countOrderNumberBySettleTime(Long uid, Integer state, Integer day) {
return commonOrderCountMapper.countOrderNumberBySettleTime(uid, state, day);
}
-
-
+
/**
* 鏍规嵁缁撶畻鏃堕棿绛涢�� 涓婁釜鏈堝凡缁撶畻鐨勮璁㈠崟鏁伴噺
+ *
* @param uid
* @return
*/
@@ -238,6 +230,35 @@
public Map<String, Object> lastMonthSettleOrderNumber(Long uid) {
return countOrderNumberBySettleTime(uid, 2, 4); // 鏍规嵁
}
+
+ @Override
+ public BigDecimal getMoneyByOrderNo(String orderNo) {
+ return commonOrderCountMapper.getMoneyByOrderNo(orderNo);
+ }
+
+ @Override
+ public long countValidOrderByDate(Long uid, String dateTime) {
+ return commonOrderCountMapper.countValidOrderByDate(uid, dateTime);
+ }
+
+ @Override
+ public long countSameShopOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameShopGoodsCount) {
+ return commonOrderCountMapper.countSameShopOrderByUidAndHongBaoType(typeList, uid, minSameShopGoodsCount);
+ }
+
+ @Override
+ public long countSameGoodsOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameGoodsOrderCount) {
+ return commonOrderCountMapper.countSameGoodsOrderByUidAndHongBaoType(typeList, uid, minSameGoodsOrderCount);
+ }
+
-
+ @Override
+ public List<Long> getSameShopOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameShopGoodsCount) {
+ return commonOrderCountMapper.getSameShopOrderByUidAndHongBaoType(typeList, uid, minSameShopGoodsCount);
+ }
+
+ @Override
+ public List<Long> getSameGoodsOrderByUidAndHongBaoType(List<Integer> typeList, Long uid, int minSameGoodsOrderCount) {
+ return commonOrderCountMapper.getSameGoodsOrderByUidAndHongBaoType(typeList, uid, minSameGoodsOrderCount);
+ }
}
--
Gitblit v1.8.0