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

yujian

2020-05-26 022c492fe0645af7761889f6471e3e2ae5751fb6

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

@@ -156,6 +156,9 @@
         }

      }



      if(hongBaoList.size()==0)

         return;



      String taskKey = getTaskKey(uid);



      TeamRewardPreRecieveMQMsg mqMsg = new TeamRewardPreRecieveMQMsg(taskKey, uid, sourceType, maxPregetTime,

@@ -225,6 +228,9 @@
         }

      }



      if(hongBaoList.size()==0)

         return;



      // 邀请赚到账事务消息



      String taskKey = getTaskKey(uid);

@@ -291,6 +297,9 @@
         }

      }



      if(hongBaoList.size()==0)

         return;



      // 邀请赚到账事务消息

      String taskKey = getTaskKey(uid);

      TeamRewardPreRecieveMQMsg mqMsg = new TeamRewardPreRecieveMQMsg(taskKey, uid, sourceType, maxPregetTime,

@@ -355,6 +364,9 @@
         }

      }



      if(hongBaoList.size()==0)

         return;



      // 邀请赚到账事务消息

      String taskKey = getTaskKey(uid);

      TeamRewardPreRecieveMQMsg mqMsg = new TeamRewardPreRecieveMQMsg(taskKey, uid, sourceType, maxPregetTime,