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 | 76 +++++++++++++++----------------------
1 files changed, 31 insertions(+), 45 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 850162e..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,51 +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 (Integer page, Long uid, Integer state, Integer type,
- String orderNo, String startTime, String endTime) throws CommonOrderException {
+ 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);
-
- // 璁㈠崟淇℃伅涓虹┖
- if (listOrder == null || listOrder.size() == 0) {
- listOrder = new ArrayList<CommonOrderVO>();
- return listOrder;
- }
-
- // 鍟嗗搧淇℃伅
- List<CommonOrderVO> listGoods = commonOrderMapper.listByOrderNoAndType(listOrder);
- // 璁㈠崟鍟嗗搧涓虹┖
- if (listGoods ==null || listGoods.size() == 0) {
- return listOrder;
- }
-
- // 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- listDataFactory(listOrder, listGoods);
-
- return listOrder;
- }
-
-
- @Override
- public List<CommonOrderVO> listBonusOrder (Integer page, Long uid, Integer type,Integer day) throws CommonOrderException {
-
- int pageSize = Constant.PAGE_SIZE;
-
- List<CommonOrderVO> listOrder = commonOrderMapper.listBonusOrder((page - 1) * pageSize, pageSize, uid, type, day);
+ state, type, orderState, orderNo, startTime, endTime, dateType);
// 璁㈠崟淇℃伅涓虹┖
if (listOrder == null || listOrder.size() == 0) {
@@ -150,13 +126,9 @@
}
@Override
- public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime,String endTime) {
- return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime);
- }
-
- @Override
- public Map<String, BigDecimal> countBonusOrderByState(Long uid,Integer type, Integer day) {
- return commonOrderMapper.countBonusOrderByState(uid, type, day);
+ 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 ) {
@@ -192,6 +164,16 @@
commonGoodsVO.setActualPay(commonOrder.getTotalSettlement());
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;
}
@@ -287,16 +269,15 @@
String hongBaoState_Str = "";
String hongbaoInfoFontColor = "#E5005C";
-
/* 绾㈠寘鐘舵�� 杞崲 */
String stateContent = "";
+ 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) {
@@ -324,11 +305,16 @@
orderHongBaoState = 4;
stateContent = "宸插け鏁�";
hongBaoDate = " ";
+ hongbaoInfoFontColor = "#888888";
}
order.setHongBaoState(orderHongBaoState);
- order.setAccountState(stateContent);
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;
}
--
Gitblit v1.8.0