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

admin

2020-06-30 70e22f5f9c51a24452a877489a49c2d800b399eb

 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java

@@ -243,7 +243,7 @@
               BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());

               Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,

                     OrderTopicTagEnum.banLiShopOrderRefund, msg);

               message.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60 * 5L);// 延时24小时通知检测微信退款状态

               message.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60 * 5L);// 延时5分钟通知检测微信退款状态

               SendResult result = producer.send(message);

               if (result == null) {

                  throw new BanLiShopOrderException(8, "消息发送失败");