From c12b6ec43f6c79426d6f2337f903d3c0a225e9a5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 二月 2019 10:39:01 +0800
Subject: [PATCH] 订单错误信息捕捉修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 81 ++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 44 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 f6f6363..9c0ae0f 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
@@ -135,10 +135,10 @@
public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime) {
return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime);
}
-
+
@Override
- public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day,
- String startTime, String endTime) {
+ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
+ String endTime) {
return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);
}
@@ -181,7 +181,7 @@
if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {
commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));
}
-
+
Integer hongBaoType = order.getHongBaoType();
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
@@ -241,12 +241,12 @@
/* 璁㈠崟鐘舵�� 杞崲澶勭悊 */
String orderStateContent = "";
Map<String, String> orderStateMap = new HashMap<String, String>();
-
+
// 璁㈠崟鐘舵��
Integer orderState = order.getState();
// 绾㈠寘鐘舵��
Integer hongBaoState = order.getHongBaoState();
-
+
Integer stateWholeOrder = order.getStateWholeOrder();
if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) {
// 鏁翠釜璁㈠崟閮ㄥ垎澶辨晥锛氬垽鏂湡瀹炵姸鎬� 璁㈠崟銆佺孩鍖�
@@ -257,9 +257,8 @@
// 鏈夋晥鐨勭孩鍖呯姸鎬�
hongBaoState = buFenOrder.getHongBaoState();
}
- }
-
-
+ }
+
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
} else if (CommonOrder.STATE_JS == orderState) {
@@ -386,7 +385,7 @@
@Override
public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId) {
- return null;
+ return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);
}
@Transactional
@@ -475,28 +474,26 @@
public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate) {
return commonOrderMapper.countByUidAndOrderStateWithOrderBalanceTime(uid, state, minDate, maxDate);
}
-
-
+
@Override
public List<CommonOrderVO> listQueryByUid(long start, int count, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
throws CommonOrderException {
-
-
- List<CommonOrderVO> list = commonOrderMapper.listQueryByUid(start, count, uid, state, type,
- orderState, orderNo, startTime, endTime, dateType);
-
+
+ List<CommonOrderVO> list = commonOrderMapper.listQueryByUid(start, count, uid, state, type, orderState, orderNo,
+ startTime, endTime, dateType);
+
if (list == null) {
list = new ArrayList<CommonOrderVO>();
}
-
+
if (list.size() == 0) {
return list;
}
-
+
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
for (CommonOrderVO order : list) {
-
+
// 涓嬪崟鏃堕棿
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
@@ -507,13 +504,13 @@
if (settleTime != null) {
order.setReceiveTime(format.format(settleTime));
}
-
+
// 鍒拌处鏃堕棿
Date accountTime = order.getAccountTime();
if (accountTime != null) {
order.setHongBaoDate(format.format(accountTime));
}
-
+
BigDecimal settlement = order.getSettlement();
if (settlement != null && settlement.compareTo(new BigDecimal(0)) > 0) {
order.setPayment(settlement); // 瀹為檯浠樻閲戦
@@ -547,11 +544,11 @@
// 宸插け鏁�
order.setHongBaoState(3);
}
-
+
}
-
+
return list;
-
+
}
@Override
@@ -559,29 +556,25 @@
String startTime, String endTime, Integer dateType) throws CommonOrderException {
return commonOrderMapper.countQueryByUid(uid, state, type, orderState, orderNo, startTime, endTime, dateType);
}
-
-
-
+
@Override
- public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
+ public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException {
-
-
- List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count,keyType, key, state, type,
- orderState, startTime, endTime);
-
-
+
+ List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState,
+ startTime, endTime);
+
if (list == null) {
list = new ArrayList<CommonOrderVO>();
}
-
+
if (list.size() == 0) {
return list;
}
-
+
SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
for (CommonOrderVO order : list) {
-
+
// 涓嬪崟鏃堕棿
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
@@ -592,13 +585,13 @@
if (settleTime != null) {
order.setReceiveTime(format.format(settleTime));
}
-
+
// 鍒拌处鏃堕棿
Date accountTime = order.getAccountTime();
if (accountTime != null) {
order.setHongBaoDate(format.format(accountTime));
}
-
+
BigDecimal settlement = order.getSettlement();
if (settlement != null && settlement.compareTo(new BigDecimal(0)) > 0) {
order.setPayment(settlement); // 瀹為檯浠樻閲戦
@@ -632,11 +625,11 @@
// 宸插け鏁�
order.setHongBaoState(3);
}
-
+
}
-
+
return list;
-
+
}
@Override
@@ -644,5 +637,5 @@
String startTime, String endTime) throws CommonOrderException {
return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime);
}
-
+
}
--
Gitblit v1.8.0