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 | 142 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 117 insertions(+), 25 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 4aced39..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
@@ -116,7 +116,7 @@
}
// 鏁版嵁鍔犲伐閲嶆柊缁勭粐
- listDataFactory(listOrder, listGoods);
+ listDataFactory(listOrder, listGoods, uid);
return listOrder;
}
@@ -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);
}
@@ -148,7 +148,7 @@
return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day);
}
- public void listDataFactory(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods) {
+ public void listDataFactory(List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {
/* 缁勫悎鍟嗗搧淇℃伅 */
for (CommonOrderVO commonOrder : listGoods) {
@@ -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
@@ -242,9 +242,23 @@
String orderStateContent = "";
Map<String, String> orderStateMap = new HashMap<String, String>();
+ // 璁㈠崟鐘舵��
+ Integer orderState = order.getState();
+ // 绾㈠寘鐘舵��
Integer hongBaoState = order.getHongBaoState();
- Integer orderState = order.getState();
+ Integer stateWholeOrder = order.getStateWholeOrder();
+ if (CommonOrder.STATE_WHOLE_ORDER_BUFENYOUXIAO == stateWholeOrder) {
+ // 鏁翠釜璁㈠崟閮ㄥ垎澶辨晥锛氬垽鏂湡瀹炵姸鎬� 璁㈠崟銆佺孩鍖�
+ CommonOrderVO buFenOrder = commonOrderMapper.getBuFenOrderState(uid, order.getOrderNo());
+ if (buFenOrder != null) {
+ // 鏈夋晥鐨勮鍗曠姸鎬�
+ orderState = buFenOrder.getState();
+ // 鏈夋晥鐨勭孩鍖呯姸鎬�
+ hongBaoState = buFenOrder.getHongBaoState();
+ }
+ }
+
if (CommonOrder.STATE_FK == orderState) {
orderStateContent = "宸蹭粯娆�";
} else if (CommonOrder.STATE_JS == orderState) {
@@ -371,7 +385,7 @@
@Override
public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId) {
- return null;
+ return commonOrderMapper.listBySourceTypeAndOrderNo(sourceType, orderId);
}
@Transactional
@@ -460,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) {
@@ -492,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); // 瀹為檯浠樻閲戦
@@ -532,11 +544,11 @@
// 宸插け鏁�
order.setHongBaoState(3);
}
-
+
}
-
+
return list;
-
+
}
@Override
@@ -544,6 +556,86 @@
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,
+ Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException {
+
+ 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) {
+ order.setDownTime(format.format(thirdCreateTime));
+ }
+ // 鏀惰揣鏃堕棿
+ Date settleTime = order.getSettleTime();
+ 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); // 瀹為檯浠樻閲戦
+ }
+
+ /* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
+ Integer hongBaoType = order.getHongBaoType();
+ if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
+ // 鑷喘
+ order.setHongBaoType(1);
+ } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
+ // 鍒嗕韩
+ order.setHongBaoType(2);
+ } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
+ // 閭�璇�
+ order.setHongBaoType(3);
+ }
+
+ Integer hongBaoState = order.getHongBaoState();
+ if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
+ // 鏈埌璐�
+ order.setHongBaoState(1);
+
+ } else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
+ // 宸插埌璐�
+ order.setHongBaoState(2);
+
+ } else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
+ // 宸插け鏁�
+ order.setHongBaoState(3);
+ }
+
+ }
+
+ return list;
+
+ }
+
+ @Override
+ public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+ String startTime, String endTime) throws CommonOrderException {
+ return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime);
+ }
+
}
--
Gitblit v1.8.0