From 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 140 +++++++++++++++++++++++++++++-----------------
1 files changed, 87 insertions(+), 53 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 019c260..aeaf1a3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -4,9 +4,9 @@
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.HashMap;
import javax.annotation.Resource;
@@ -68,24 +68,27 @@
@Override
public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state,
- Integer type, String orderNo, String startTime,String endTime) throws CommonOrderException{
- return commonOrderMapper.listGroupOrderNoByUid(start, count, uid, state, type, orderNo, startTime, endTime);
+ Integer type,Integer orderState, String orderNo, String startTime,String endTime,
+ Integer dateType) throws CommonOrderException{
+ return commonOrderMapper.listGroupOrderNoByUid(start, count, uid, state, type, orderState,
+ orderNo, startTime, endTime, dateType);
}
@Override
- public long countGroupOrderNoByUid(Long uid,Integer state, Integer type, String orderNo,
- String startTime,String endTime) throws CommonOrderException{
- return commonOrderMapper.countGroupOrderNoByUid(uid, state, type, orderNo, startTime, endTime);
+ public long countGroupOrderNoByUid(Long uid,Integer state, Integer type, Integer orderState,
+ String orderNo, String startTime,String endTime, Integer dateType) throws CommonOrderException{
+ return commonOrderMapper.countGroupOrderNoByUid(uid, state, type, orderState, orderNo,
+ startTime, endTime, dateType);
}
@Override
- public List<CommonOrderVO> getOrderByUid (Long page, Long uid, Integer state, Integer type,
- String orderNo, String startTime, String endTime) throws CommonOrderException {
+ public List<CommonOrderVO> getOrderByUid (Integer page, Long uid, Integer state, Integer type,
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException {
int pageSize = Constant.PAGE_SIZE;
List<CommonOrderVO> listOrder = listGroupOrderNoByUid((page - 1) * pageSize, pageSize, uid,
- state, type, orderNo, startTime, endTime);
+ state, type, orderState, orderNo, startTime, endTime, dateType);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -99,6 +102,36 @@
if (listGoods ==null || listGoods.size() == 0) {
return listOrder;
}
+
+ // 鏁版嵁鍔犲伐閲嶆柊缁勭粐
+ listDataFactory(listOrder, listGoods);
+
+ return listOrder;
+ }
+
+
+ @Override
+ public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day) {
+ return commonOrderMapper.countOrderByHongBaoType(uid, day);
+ }
+
+ @Override
+ public long countOrder(Long uid,Integer type, Integer day) {
+ return commonOrderMapper.countBonusOrder(uid, type, day);
+ }
+
+ @Override
+ public BigDecimal countOrderMoney(Long uid, Integer type, Integer day) {
+ return commonOrderMapper.countBonusOrderMoney(uid, type, day);
+ }
+
+ @Override
+ public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,
+ String endTime, Integer day) {
+ return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day);
+ }
+
+ public void listDataFactory (List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods ) {
/* 缁勫悎鍟嗗搧淇℃伅 */
for (CommonOrderVO commonOrder: listGoods) {
@@ -132,6 +165,16 @@
listOrderGoods.add(commonGoodsVO);
+ Integer orderType = commonOrder.getOrderType();
+ if (orderType == null) {
+ String shopType = commonGoodsVO.getShopType();
+ if (CommonOrderGoodsVO.TYPE_TAOBAO.equalsIgnoreCase(shopType)) {
+ commonOrder.setOrderType(1);
+ } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {
+ commonOrder.setOrderType(2);
+ }
+ }
+
break;
}
}
@@ -155,17 +198,6 @@
if (settleTime != null) {
order.setReceiveTime(format.format(settleTime));
}
-
- Date accountTime = order.getAccountTime();
- if (accountTime != null) {
- order.setGetTime(formatday.format(accountTime));
- }
-
- Date preAccountTime = order.getPreAccountTime();
- if (preAccountTime != null) {
- order.setPreGetTime(formatday.format(preAccountTime));
- }
-
/* 璁㈠崟鐘舵�� 杞崲澶勭悊*/
String orderStateContent = "";
@@ -233,29 +265,56 @@
}
+ String hongBaoDate = "";
String hongBaoState_Str = "";
String hongbaoInfoFontColor = "#E5005C";
+
/* 绾㈠寘鐘舵�� 杞崲 */
String stateContent = "";
- Map<String, String> accountState = new HashMap<String, String>();
+ String stateFontColor = "#E5005C";
+ Integer orderHongBaoState = null;
Integer hongBaoState = order.getHongBaoState();
if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
+ orderHongBaoState = 1;
stateContent = "鏈埌璐�";
hongBaoState_Str = "棰勪及";
- hongbaoInfoFontColor = "#888888";
+
+ Date preAccountTime = order.getPreAccountTime();
+ if (preAccountTime != null) {
+ hongBaoDate = "棰勮鍒拌处鏃堕棿" + formatday.format(preAccountTime);
+ }
} else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
+ orderHongBaoState = 3;
stateContent = "宸插埌璐�";
+
+ Date accountTime = order.getAccountTime();
+ if (accountTime != null) {
+ hongBaoDate = "鍒拌处鏃堕棿" + formatday.format(accountTime);
+ }
+
} else if (HongBaoV2.STATE_BUFENSHIXIAO == hongBaoState) {
- stateContent = "閮ㄥ垎澶辨晥";
+ stateContent = "閮ㄥ垎澶辨晥";
+ orderHongBaoState = 3;
+ Date accountTime = order.getAccountTime();
+ if (accountTime != null) {
+ hongBaoDate = "鍒拌处鏃堕棿" + formatday.format(accountTime);
+ }
+
} else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
- stateContent = "宸插け鏁�";
+ orderHongBaoState = 4;
+ stateContent = "宸插け鏁�";
+ hongBaoDate = " ";
+ hongbaoInfoFontColor = "#888888";
}
- accountState.put("content", stateContent);
- accountState.put("fontColor", "#E5005C");
- order.setAccountState(accountState);
+ order.setHongBaoState(orderHongBaoState);
+ order.setHongBaoDate(hongBaoDate);
-
+ Map<String, String> stateMap = new HashMap<String, String>();
+ stateMap.put("content", stateContent);
+ stateMap.put("fontColor", stateFontColor);
+ order.setAccountState(stateMap);
+
if ("濂栭噾".equals(hongbaoInfo) && hongBaoState_Str.trim().length() > 0) {
hongbaoInfo = hongBaoState_Str + hongbaoInfo;
}
@@ -267,32 +326,7 @@
hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao);
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
-
-
}
-
- return listOrder;
- }
-
-
- @Override
- public Map<String, BigDecimal> countOrderByHongBaoType(Long uid, Integer day) {
- return commonOrderMapper.countOrderByHongBaoType(uid, day);
- }
-
- @Override
- public long countOrder(Long uid, Integer isToday) {
- return commonOrderMapper.countOrder(uid, isToday);
- }
-
- @Override
- public BigDecimal countOrderMoney(Long uid, Integer isToday) {
- return commonOrderMapper.countOrderMoney(uid, isToday);
- }
-
- @Override
- public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,String endTime) {
- return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime);
}
}
--
Gitblit v1.8.0