Merge remote-tracking branch 'origin/div' into div

admin

2019-12-20 c96375400afce5cd0be41e8af0eb7e8deb484994

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -417,7 +417,7 @@
   private HongBaoOrderMapper hongBaoOrderMapper;



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {

      // 查询最新的红包数据

      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());