Merge remote-tracking branch 'origin/feature-1.1-dev' into feature-1.1-dev

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/ImgMqMessageRecordServiceImpl.java

@@ -215,8 +215,11 @@ public class ImgMqMessageRecordServiceImpl implements ImgMqMessageRecordService
                    String content = imgMqMessageRecord.getContent();
                    JSONObject jsonObject = JSON.parseObject(content);
                    String msg = jsonObject.getString("content");
+                   MqRecordMessage message = new MqRecordMessage();
+                   message.setId(imgMqMessageRecord.getId());
+                   message.setContent(msg);
                    //少于30分钟，发送消息
-                   sendAsyncMsg(imgMqMessageRecord.getTopic(),null,msg);
+                   sendAsyncMsg(imgMqMessageRecord.getTopic(),null,message);
                }else{
                    //超过30分钟，修改状态为废弃
                    imgMqMessageRecord.setStatus(EnumMessageStatus.INVALID);

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/OrderMqMessageRecordServiceImpl.java

@@ -213,8 +213,11 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ
                     String content = orderMqMessageRecord.getContent();
                     JSONObject jsonObject = JSON.parseObject(content);
                     String msg = jsonObject.getString("content");
+                    MqRecordMessage message = new MqRecordMessage();
+                    message.setId(orderMqMessageRecord.getId());
+                    message.setContent(msg);
                     //少于30分钟，发送消息
-                    sendAsyncMsg(orderMqMessageRecord.getTopic(),null,msg);
+                    sendAsyncMsg(orderMqMessageRecord.getTopic(),null,message);
                 }else{
                     //超过30分钟，修改状态为废弃
                     orderMqMessageRecord.setStatus(EnumMessageStatus.INVALID);

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayMqMessageRecordServiceImpl.java

@@ -214,8 +214,11 @@ public class PayMqMessageRecordServiceImpl implements PayMqMessageRecordService
                     String content = payMqMessageRecord.getContent();
                     JSONObject jsonObject = JSON.parseObject(content);
                     String msg = jsonObject.getString("content");
+                    MqRecordMessage message = new MqRecordMessage();
+                    message.setId(payMqMessageRecord.getId());
+                    message.setContent(msg);
                     //少于30分钟，发送消息
-                    sendAsyncMsg(payMqMessageRecord.getTopic(),null,msg);
+                    sendAsyncMsg(payMqMessageRecord.getTopic(),null,message);
                 }else{
                     //超过30分钟，修改状态为废弃
                     payMqMessageRecord.setStatus(EnumMessageStatus.INVALID);