From d1fe0aeb6aa1f205c6cfae319ebc91f33c1db3f6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 05 五月 2019 12:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
index 9eb6697..0f55244 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
@@ -32,7 +32,7 @@
@Resource
private HongBaoOrderService hongBaoOrderService;
- @Transactional(propagation = Propagation.NESTED, rollbackFor = Exception.class)
+ //@Transactional(propagation = Propagation.NESTED, rollbackFor = Exception.class)
public boolean addOrder(Order order) throws Exception {
order.setVersion(2);
WriteLock writeLock = orderLock.writeLock();
--
Gitblit v1.8.0