Merge branch 'master' into feature/rui.zhu/退款接口逻辑调整

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/RefundService.java

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -104,7 +104,7 @@ public class OrderCallBackMQService {
         this.sendOrderStatusProcessCenterMQ(body);
 
         //支付宝订单状态变更上报
-        sendzfbOrderMQ(body);
+//        sendzfbOrderMQ(body);
     }
 
     /**
@@ -410,25 +410,25 @@ public class OrderCallBackMQService {
         }
     }
 
-    private void sendzfbOrderMQ(OrderCallBackRequestVo body) {
-        try {
-            if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
-                return;
-            }
-            if (OrderClientType.ALIPAY.getIndex() != body.getOrderClient()) {
-                return;
-            }
-            logUtil.info("sendzfbOrderMQ orderCode:{} ", body.getOrderCode());
-
-            // 支付宝订单状态推送　tapd需求id 1032865
-            if ("1".equals(body.getMsgType())) {
-                Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
-                        null, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE);
-                MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);
-                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE_ROUTING_KEY, message);
-            }
-        } catch (Exception e) {
-            logUtil.error("", "sendzfbOrderMQ orderCode:{} ", e, body.getOrderCode());
-        }
-    }
+//    private void sendzfbOrderMQ(OrderCallBackRequestVo body) {
+//        try {
+//            if (Objects.isNull(body) || StringUtils.isEmpty(body.getContent())) {
+//                return;
+//            }
+//            if (OrderClientType.ALIPAY.getIndex() != body.getOrderClient()) {
+//                return;
+//            }
+//            logUtil.info("sendzfbOrderMQ orderCode:{} ", body.getOrderCode());
+//
+//            // 支付宝订单状态推送　tapd需求id 1032865
+//            if ("1".equals(body.getMsgType())) {
+//                Header header = new Header(MQAction.UPDATE.getAction(), "call-back-service-api",
+//                        null, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE);
+//                MQMessage<OrderCallBackRequestVo> message = new MQMessage<>(header, body);
+//                mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.ZFB_ORDER_SEND_QUEUE_ROUTING_KEY, message);
+//            }
+//        } catch (Exception e) {
+//            logUtil.error("", "sendzfbOrderMQ orderCode:{} ", e, body.getOrderCode());
+//        }
+//    }
 }

order-application-service/src/main/java/cn/freemud/service/RefundService.java

@@ -45,6 +45,7 @@ import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCod
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
+import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.constant.OrderRedisKeyConstant;
 import com.freemud.sdk.api.assortment.order.entities.OrderRefundConfigEntity;
 import com.freemud.sdk.api.assortment.order.enums.AutoOrderConfigTime;
@@ -76,6 +77,7 @@ public class RefundService {
     private final OrderSdkService orderSdkService;
     private final RedisCache redisCache;
     private final PaymentHandle paymentHandle;
+    private final OrderSdkAdapter orderSdkAdapter;
     private final OrderCenterSdkService orderCenterSdkService;
     private final OrderQueueService orderQueueService;
     private final EcologyAdminApplicationClient ecologyAdminApplicationClient;
@@ -144,7 +146,7 @@ public class RefundService {
         if (NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(order.getOrderState())) {
             // 商家未接单逻辑处理    1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
             refundOrder(order, isPartRefund, reason, remark, refundDeliveryFee, refundMode);
-            orderQueueService.backOrdersStatusChange(order.getOrderCode(), order.getOrderState(), order.getPayState(), order.getPartnerId());
+            orderQueueService.backOrdersStatusChange(order.getOrderCode(), orderSdkAdapter.getOldStatus(order.getOrderState()), order.getPayState(), order.getPartnerId());
         } else {
             // 已接单的，创建售后单
             createAfterSales(order, refundAmount, isPartRefund, reason, remark, refundDeliveryFee, refundMode);