From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 88 +++++++++++++++++++------------------------
1 files changed, 39 insertions(+), 49 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 6d743a3..2f63b16 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.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -77,11 +77,7 @@
}
mapObject.put("showValue", total);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
- Date parseDate = sdf.parse(plusDay.toString());
-
- mapObject.put("showDate", sdf2.format(parseDate));
+ mapObject.put("showDate", plusDay);
listObject.add(mapObject);
@@ -115,8 +111,12 @@
total = 0;
}
mapObject.put("showValue", total);
-
- mapObject.put("showDate", i + "鏈�");
+
+ if (i <10) {
+ mapObject.put("showDate", "0"+ i);
+ } else {
+ mapObject.put("showDate", i);
+ }
listObject.add(mapObject);
}
@@ -148,12 +148,14 @@
List<Map<String, Object>> result_list = null;
+ // 鐢ㄦ埛璁㈠崟
List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year,
startTime, endTime);
if (listTotal == null || listTotal.size() == 0) {
return result_list;
}
+ // 娣樺疂鑱旂洘
List<Map<String, Object>> type_list = taoBaoOrderMapper.countOrderNumber(dateType, year,
startTime, endTime);
@@ -175,15 +177,16 @@
break;
}
+ DecimalFormat df = new DecimalFormat("#.00");
for (int i = 0; i < result_list.size(); i++) {
- float proportion = 0;
+ 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 = result_list.get(j);
+ Map<String, Object> innerMap = listTotal.get(j);
Object innerDate = innerMap.get("showDate");
if (innerDate != null && innerDate.toString().equals(showDate.toString())) {
@@ -194,14 +197,14 @@
long showData = Long.parseLong(showValue.toString());
if (showData > 0) {
- proportion = innerData/showData;
+ proportion = innerData/(double)showData;
}
break; // 缁撴潫鍐呴儴寰幆
}
}
- resultMap.put("showValue", proportion);
+ resultMap.put("showValue", Double.parseDouble(df.format(proportion *100)));
}
return result_list;
@@ -210,48 +213,35 @@
@Override
public List<Map<String, Object>> countWeiQaunOrderMoney(Integer dateType, String year, String startTime,
String endTime) throws Exception{
-
- List<Map<String, Object>> listTotal = taoBaoWeiQuanOrderMapper.countWeiQaunOrderMoney(dateType,
- year, startTime, endTime);
-
- if (listTotal == null || listTotal.size() == 0) {
- return null;
- }
-
- switch (dateType){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, listTotal);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(listTotal);
- case 3:
- return yearFactory(listTotal);
- default:
- return null;
- }
+ return taoBaoWeiQuanOrderMapper.countWeiQaunOrderMoney(dateType, year, startTime, endTime);
}
@Override
public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,
String endTime) throws Exception{
-
- List<Map<String, Object>> listTotal = taoBaoWeiQuanOrderMapper.countWeiQaunOrderNumber(dateType,
- year, startTime, endTime);
-
- if (listTotal == null || listTotal.size() == 0) {
- return null;
- }
-
- switch (dateType){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, listTotal);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(listTotal);
- case 3:
- return yearFactory(listTotal);
- default:
- return null;
- }
+ 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
+ */
+ @Override
+ 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