From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 187 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 185 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
index bbe08b8..cbfd979 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -1,7 +1,12 @@
package com.yeshi.fanli.service.impl.order;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -9,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.yeshi.utils.DateUtil;
import org.yeshi.utils.NumberUtil;
import com.yeshi.fanli.dao.mybatis.order.LostOrderMapper;
@@ -48,10 +54,13 @@
// 鏌ヨ鏄惁鎻愪氦
List<LostOrder> orderList = lostOrderMapper.selectByOrderId(orderId);
if (orderList != null && orderList.size() > 0) {
- if (orderList.get(0).getState() == 0) {
+ if (orderList.get(0).getState() == 0 || orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_VERFING) {
return -2;
- } else {
+ } else if (orderList.get(0).getState() == 1
+ && orderList.get(0).getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {
return -1;
+ } else {
+ return -6;
}
}
@@ -251,4 +260,178 @@
lostOrderDao.update("delete from LostOrder lo where lo.userInfo.id=?", new Serializable[] { uid });
}
+ @Override
+ public Map<String, Object> countByUid(long uid) {
+ return lostOrderMapper.countByUid(uid);
+ }
+
+ /**
+ * 鍚庣鍒楄〃鏌ヨ
+ *
+ * @param start
+ * @param count
+ * @param key
+ * @return
+ */
+ @Override
+ public List<LostOrder> listQuery(long start, int count, String key, Integer state, Integer handleType) {
+ return lostOrderMapper.listQuery(start, count, key, state, handleType);
+ }
+
+ @Override
+ public long countQuery(String key, Integer state, Integer handleType) {
+ return lostOrderMapper.countQuery(key, state, handleType);
+ }
+
+
+ @Override
+ public List<Map<String, Object>> countLostNum( Integer dateType, Integer resultCode,
+ String year, String startTime, String endTime) throws Exception {
+
+ List<Map<String, Object>> list = lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);
+
+ if (list == null || list.size() == 0) {
+ return null;
+ }
+
+ switch (dateType){
+ case 1: // 鎸夊ぉ澶勭悊
+ return dayFactory(startTime, endTime, list);
+ case 2: // 鎸夋湀澶勭悊
+ return monthFactory(list);
+ case 3:
+ return yearFactory(list);
+ default:
+ return null;
+ }
+ }
+
+
+ @Override
+ public List<Map<String, Object>> countAppealMoney( Integer dateType, String year, String startTime,
+ String endTime) throws Exception {
+
+ List<Map<String, Object>> list = lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
+
+ if (list == null || list.size() == 0) {
+ return null;
+ }
+
+ switch (dateType){
+ case 1: // 鎸夊ぉ澶勭悊
+ return dayFactory(startTime, endTime, list);
+ case 2: // 鎸夋湀澶勭悊
+ return monthFactory(list);
+ case 3:
+ return yearFactory(list);
+ default:
+ return null;
+ }
+ }
+
+ 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>>();
+
+ if (startTime.equals(endTime)) {
+
+ Map<String, Object> map = list.get(0);
+ Object total = map.get("showValue");
+ if (total == null) {
+ map.put("showValue", 0);
+ }
+ listObject.add(map);
+ return listObject;
+ }
+
+ String plusDay = "";
+ for (int i = 0; i < 1000; i++) {
+ if (i == 0) {
+ plusDay = startTime;
+ } else {
+ plusDay = DateUtil.plusDay(i, startTime);
+ }
+
+ Map<String, Object> mapObject = new HashMap<String, Object>();
+ Object 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");
+ break;
+ }
+ }
+
+ if (total == null) {
+ total = 0;
+ }
+ 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));
+
+ listObject.add(mapObject);
+
+ if (plusDay.equals(endTime)) {
+ break; // 鏃堕棿缁撴潫
+ }
+ }
+
+ return listObject;
+ }
+
+ public List<Map<String, Object>> monthFactory(List<Map<String, Object>> list) {
+
+ List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
+ // 12 涓湀澶勭悊
+ for (int i = 1; i <= 12; i++) {
+ Map<String, Object> mapObject = new HashMap<String, Object>();
+ Object 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 ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
+ total = map.get("total");
+ break;
+ }
+ }
+
+ if (total == null) {
+ total = 0;
+ }
+ mapObject.put("total", total);
+
+ mapObject.put("showDate", i + "鏈�");
+
+ listObject.add(mapObject);
+ }
+ return listObject;
+ }
+
+ public List<Map<String, Object>> yearFactory(List<Map<String, Object>> list) {
+
+ List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
+
+ for (int i = 0; i < list.size(); i++) {
+ Map<String, Object> map = list.get(i);
+ Object total = map.get("total");
+
+ if (total == null) {
+ total = 0;
+ }
+ map.put("total", total);
+
+ listObject.add(map);
+ }
+
+ return listObject;
+ }
}
--
Gitblit v1.8.0