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

admin

2020-04-10 1193f141ae9499d2446aa99e9c4fdc75e7552b7d

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

@@ -334,6 +334,7 @@
      Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderFanLiActual, mqMsg);

      String taskKey = getTaskKey(uid);

      msg.setKey(taskKey);

	
      // 添加事务消息

      try {

         orderTransactionProducer.send(msg, new LocalTransactionExecuter() {