Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

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