From e2b90ab5fa5c12d945751a08b97e252ce68341fd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 08 八月 2019 09:45:06 +0800
Subject: [PATCH] 华为推送修改，商品更新循环依赖修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 125 +++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 55 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 2f63b16..8f53447 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
@@ -12,31 +12,39 @@
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.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 {
+
+ 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>>();
@@ -111,9 +119,9 @@
total = 0;
}
mapObject.put("showValue", total);
-
- if (i <10) {
- mapObject.put("showDate", "0"+ i);
+
+ if (i < 10) {
+ mapObject.put("showDate", "0" + i);
} else {
mapObject.put("showDate", i);
}
@@ -141,96 +149,104 @@
return listObject;
}
-
+
@Override
public List<Map<String, Object>> getTrackAccuracyRate(Integer dateType, String year, String startTime,
- String endTime) throws Exception{
-
+ String endTime, int sourceType) throws Exception {
+
List<Map<String, Object>> result_list = null;
-
+
// 鐢ㄦ埛璁㈠崟
- List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year,
- startTime, endTime);
+ List<Map<String, Object>> 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<Map<String, Object>> 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");
for (int j = 0; j < listTotal.size(); j++) {
Map<String, Object> innerMap = listTotal.get(j);
Object innerDate = innerMap.get("showDate");
-
+
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());
-
+
if (showData > 0) {
- proportion = innerData/(double)showData;
+ proportion = innerData / (double) showData;
}
-
+
break; // 缁撴潫鍐呴儴寰幆
}
}
-
- resultMap.put("showValue", Double.parseDouble(df.format(proportion *100)));
+
+ resultMap.put("showValue", 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{
+ 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{
+ 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,11 +254,10 @@
public Map<String, Object> lastMonthSettleOrderNumber(Long uid) {
return countOrderNumberBySettleTime(uid, 2, 4); // 鏍规嵁
}
-
+
@Override
public BigDecimal getMoneyByOrderNo(String orderNo) {
return commonOrderCountMapper.getMoneyByOrderNo(orderNo);
}
-
-
+
}
--
Gitblit v1.8.0