Merge branch 'div_8'

yujian

2019-05-14 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5

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