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

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

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

@@ -1697,7 +1697,7 @@
      if (!Constant.IS_TEST)

         if (result.getResultCode() == HongBaoAddResult.CODE_ADD) {// 只发送新增消息

            OrderMQMsg mqMsg = new OrderMQMsg(orderId, sourceType, uid, OrderMQMsg.HANDLE_TYPE_ADD,

                  isCommonOrderValid(coList), 0, new Date(), result.isMiandan());

                  isCommonOrderValid(coList), 0, new Date(), result.isMiandan(),coList.get(0).getThirdCreateTime());

            Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderStatistic, mqMsg);

            producer.send(msg);

         }