From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 5a904c5..067eb29 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
@@ -147,7 +147,7 @@
 	@Resource
 	private ExtractCheckCompensateMapper extractCheckCompensateMapper;
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void repairOrder(String orderId) throws Exception {
 		// 姣旇緝CommonOrder涓嶵aoBaoOrder鐨勯浼版敹鐩�
@@ -391,7 +391,7 @@
 	}
 
 	// 淇敼璁㈠崟淇℃伅
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	private void updateOrderInfo(TaoBaoOrder taoBaoOrder, Long commonOrderId) throws Exception {
 		HongBaoOrder hongBaoOrder = hongBaoOrderService.selectDetailByCommonOrderId(commonOrderId);
 		CommonOrder newCommonOrder = TaoBaoOrderUtil.convert(taoBaoOrder);
@@ -598,7 +598,7 @@
 		}
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	public void addOrder(CommonOrder commonOrder, int type, Long firstUid, Long secondUid) throws Exception {
 		// 澧炲姞commonOrder
 		commonOrder.setCreateTime(commonOrder.getThirdCreateTime());
@@ -960,7 +960,7 @@
 		return orderInfoMap.get(orderId);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void repireFirstAndSecondLevel(String orderId) throws Exception {
 		repireFirstShare(orderId);

--
Gitblit v1.8.0