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

admin

2020-04-16 cb657522c511a4396f63591beebd5a621bed77ab

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

@@ -321,7 +321,7 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettleTB(Long uid,Date maxPregetTime) throws OrderMoneySettleException {

   public void shareSettleTB(Long uid, Date maxPregetTime) throws OrderMoneySettleException {

      /**

       * 处理分享赚

       */

@@ -367,7 +367,7 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettleJD(Long uid,Date maxPregetTime) throws OrderMoneySettleException {

   public void shareSettleJD(Long uid, Date maxPregetTime) throws OrderMoneySettleException {

      /**

       * 处理分享赚

       */

@@ -408,7 +408,7 @@


   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettlePDD(Long uid,Date maxPregetTime) throws OrderMoneySettleException {

   public void shareSettlePDD(Long uid, Date maxPregetTime) throws OrderMoneySettleException {

      /**

       * 处理分享赚

       */

@@ -737,7 +737,8 @@
      // 所有的返利到账红包ID

      for (Long hongBaoId : recieveHongBaoIds) {

         try {

            HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

            if (Constant.ENABLE_MQ)

               HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

         }

@@ -819,6 +820,7 @@
      // 所有的返利到账红包ID

      for (Long hongBaoId : recieveHongBaoIds) {

         try {

            if(Constant.ENABLE_MQ)

            HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);