Merge remote-tracking branch 'origin/master'

cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java

@@ -2,6 +2,7 @@ package com.czg.controller.admin;
 
 import com.czg.annotation.Debounce;
 import com.czg.annotation.SaStaffCheckPermission;
+import com.czg.config.RabbitPublisher;
 import com.czg.order.dto.OrderInfoAddDTO;
 import com.czg.order.dto.OrderInfoPrintDTO;
 import com.czg.order.dto.OrderInfoQueryDTO;
@@ -35,6 +36,8 @@ public class AdminOrderController {
     private OrderInfoService orderInfoService;
     @Resource
     private PayService payService;
+    @Resource
+    private RabbitPublisher rabbitPublisher;
 
     /**
      * 订单列表
@@ -91,7 +94,11 @@ public class AdminOrderController {
     @PostMapping("/refundOrder")
     @Debounce(value = "#refundDTO.orderId")
     public CzgResult<Object> refundOrder(@Validated @RequestBody OrderInfoRefundDTO refundDTO) {
-        return payService.refundOrderBefore(refundDTO);
+        CzgResult<Object> result = payService.refundOrderBefore(refundDTO);
+        if (result.getCode() == 200 && refundDTO.getRefundDetails() != null && !refundDTO.getRefundDetails().isEmpty()) {
+            rabbitPublisher.sendOrderReturnPrintMsg(refundDTO.getOrderId().toString());
+        }
+        return result;
     }
 
     /**