From 9d8dfb01ff72c57abad3b80f3d65e81a5354db03 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 09:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
index dc81681..e9af597 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java
@@ -116,6 +116,7 @@
if (order.getOrderState().equalsIgnoreCase("璁㈠崟浠樻") || order.getOrderState().equalsIgnoreCase("璁㈠崟鎴愬姛"))
return;
}
+
List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
orderId);
@@ -154,7 +155,11 @@
Long mainUid = null;
// 缁熻杩斿埄鐨勮祫閲�
for (CommonOrder co : commonOrderList) {
- hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(co.getId());
+ HongBaoOrder tempHongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(co.getId());
+ if (tempHongBaoOrder == null || tempHongBaoOrder.getHongBaoV2() == null)
+ continue;
+ hongBaoOrder = tempHongBaoOrder;
+
mainUid = hongBaoOrder.getHongBaoV2().getUserInfo().getId();
if (oldMoney.get(mainUid) == null)
oldMoney.put(mainUid, new BigDecimal(0));
@@ -808,6 +813,8 @@
@Transactional
private void deleteByCommonOrderId(Long commonOrderId) {
HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(commonOrderId);
+ if (hongBaoOrder == null || hongBaoOrder.getHongBaoV2() == null)
+ return;
List<HongBaoV2> children = hongBaoV2Service.listChildrenById(hongBaoOrder.getHongBaoV2().getId());
if (children != null)
for (HongBaoV2 hongBao : children) {
--
Gitblit v1.8.0