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

admin

2020-06-30 70e22f5f9c51a24452a877489a49c2d800b399eb

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

@@ -55,8 +55,8 @@
import com.yeshi.fanli.service.manger.order.TeamRewardManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.mq.cmq.HongBaoRecieveCMQManager;

import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;

import com.yeshi.fanli.util.rocketmq.MQTopicName;



@@ -155,6 +155,9 @@
            }

         }

      }

		
      if(hongBaoList.size()==0)

         return;



      String taskKey = getTaskKey(uid);



@@ -224,6 +227,9 @@
            }

         }

      }

		
      if(hongBaoList.size()==0)

         return;



      // 邀请赚到账事务消息



@@ -290,6 +296,9 @@
            }

         }

      }

		
      if(hongBaoList.size()==0)

         return;



      // 邀请赚到账事务消息

      String taskKey = getTaskKey(uid);

@@ -354,6 +363,9 @@
            }

         }

      }

		
      if(hongBaoList.size()==0)

         return;



      // 邀请赚到账事务消息

      String taskKey = getTaskKey(uid);

@@ -630,7 +642,7 @@
      }

      // 通知免单到账

      try {

         userSystemCouponService.updateStateByArrivalAccount(orderId);

         userSystemCouponService.updateStateByArrivalAccount(orderId,sourceType);

      } catch (Exception e) {

         e.printStackTrace();

      }