Merge branch 'div'

yujian

2019-04-18 248aa38c12a393d12c5ab721ee75fbd5c7dfbb9f

 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();