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

@@ -212,20 +212,21 @@ public class ImgMqMessageRecordServiceImpl implements ImgMqMessageRecordService
         if(CollectionUtil.isNotEmpty(imgMqMessageRecords)){
             for (ImgMqMessageRecord imgMqMessageRecord : imgMqMessageRecords) {
                 //判断消息是否超过30分钟，超过则改状态为INVALID废弃，否则调用发送消息方法
-               if(DateUtils.isLessThan30Min(imgMqMessageRecord.getCreateTime())){
+                if(DateUtils.isLessThan30Min(imgMqMessageRecord.getCreateTime())){
-                   String content = imgMqMessageRecord.getContent();
+                    String content = imgMqMessageRecord.getContent();
-                   JSONObject jsonObject = JSON.parseObject(content);
+                    JSONObject jsonObject = JSON.parseObject(content);
-                   String msg = jsonObject.getString("content");
+                    String msg = jsonObject.getString("content");
-                   MqRecordMessage message = new MqRecordMessage();
+                    MqRecordMessage message = new MqRecordMessage();
-                   message.setId(imgMqMessageRecord.getId());
+                    message.setId(imgMqMessageRecord.getId());
-                   message.setContent(msg);
+                    message.setReturnTopic(imgMqMessageRecord.getReturnTopic());
-                   //少于30分钟，发送消息
+                    message.setContent(msg);
-                   sendAsyncMsg(imgMqMessageRecord.getTopic(),null,message);
+                    //少于30分钟，发送消息
-               }else{
+                    sendAsyncMsg(imgMqMessageRecord.getTopic(),null,message);
-                   //超过30分钟，修改状态为废弃
+                }else{
-                   imgMqMessageRecord.setStatus(EnumMessageStatus.INVALID);
+                    //超过30分钟，修改状态为废弃
-                   imgMqMessageRecordMapper.updateById(imgMqMessageRecord);
+                    imgMqMessageRecord.setStatus(EnumMessageStatus.INVALID);
-               }
+                    imgMqMessageRecordMapper.updateById(imgMqMessageRecord);
+                }
             }
         }
         log.info("==============img服务消费补偿任务完成,耗时【{}】毫秒！===============",System.currentTimeMillis() - startTime);

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

@@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.bnyer.common.core.domain.ImgMqMessageRecord;
 import com.bnyer.common.core.domain.OrderMqMessageRecord;
 import com.bnyer.common.core.enums.EnumMessageStatus;
 import com.bnyer.common.core.utils.DateUtils;
@@ -216,6 +215,7 @@ public class OrderMqMessageRecordServiceImpl implements OrderMqMessageRecordServ
                     String msg = jsonObject.getString("content");
                     MqRecordMessage message = new MqRecordMessage();
                     message.setId(orderMqMessageRecord.getId());
+                    message.setReturnTopic(orderMqMessageRecord.getReturnTopic());
                     message.setContent(msg);
                     //少于30分钟，发送消息
                     sendAsyncMsg(orderMqMessageRecord.getTopic(),null,message);

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/controller/UnifiedPayController.java

@@ -5,15 +5,13 @@ import com.bnyer.common.core.enums.ResponseEnum;
 import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.common.core.utils.bean.EntityConvertUtil;
 import com.bnyer.common.core.utils.ip.IpUtils;
-import com.bnyer.pay.annotation.LimitRepeatRequest;
+import com.bnyer.pay.bean.dto.QueryOrderDto;
 import com.bnyer.pay.bean.dto.RefundDto;
 import com.bnyer.pay.bean.dto.UnifiedOrderDto;
-import com.bnyer.pay.bean.dto.QueryOrderDto;
 import com.bnyer.pay.bean.dto.UnifiedOrderExtDto;
-import com.bnyer.pay.bean.vo.ThirdRefundVo;
-import com.bnyer.pay.service.UnifiedPayService;
-import com.bnyer.pay.bean.vo.UnifiedOrderVo;
 import com.bnyer.pay.bean.vo.QueryOrderVo;
+import com.bnyer.pay.bean.vo.UnifiedOrderVo;
+import com.bnyer.pay.service.UnifiedPayService;
 import com.bnyer.pay.utils.PaymentRefundUtil;
 import io.swagger.annotations.Api;
 import io.swagger.v3.oas.annotations.Operation;
@@ -59,7 +57,7 @@ public class UnifiedPayController {
         return R.ok(queryOrderVo);
     }
 
-    @LimitRepeatRequest(time = 10, message = "请勿频繁操作")
+    //@LimitRepeatRequest(time = 10, message = "请勿频繁操作")
     @PostMapping("/refund")
     @Operation(summary = "统一退款" , description = "统一退款")
     public R<?> refund(@Valid @RequestBody RefundDto dto){

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

@@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.bnyer.common.core.domain.OrderMqMessageRecord;
 import com.bnyer.common.core.domain.PayMqMessageRecord;
 import com.bnyer.common.core.enums.EnumMessageStatus;
 import com.bnyer.common.core.utils.DateUtils;
@@ -217,6 +216,7 @@ public class PayMqMessageRecordServiceImpl implements PayMqMessageRecordService
                     String msg = jsonObject.getString("content");
                     MqRecordMessage message = new MqRecordMessage();
                     message.setId(payMqMessageRecord.getId());
+                    message.setReturnTopic(payMqMessageRecord.getReturnTopic());
                     message.setContent(msg);
                     //少于30分钟，发送消息
                     sendAsyncMsg(payMqMessageRecord.getTopic(),null,message);