Merge branch 'master' into develop

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, 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);