Merge branch 'master' into qa

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

@@ -44,6 +44,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;
@@ -75,6 +76,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;
@@ -140,7 +142,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, reason, remark, refundDeliveryFee, refundMode);

order-management/src/main/java/cn/freemud/management/adapter/OrderCancelReqAdapter.java

@@ -59,6 +59,9 @@ public class OrderCancelReqAdapter {
     }
 
     public static List<PayRefundResponse.PayRefundItem> convertMultiRefundItem(List<MultiOrderRefundResponse.RefundPlatformResponse> orderRefundList) {
+        if (CollectionUtils.isEmpty(orderRefundList)) {
+            return Lists.newArrayList();
+        }
         return orderRefundList.stream()
                 .map(r -> {
                     PayRefundResponse.PayRefundItem refundItem = new PayRefundResponse.PayRefundItem();

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -118,6 +118,7 @@ public class PaymentHandle {
             refundResponse.setResult(result);
             return refundResponse;
         } catch (Exception e) {
+            ErrorLog.errorConvertJson(this.getClass(), e.getMessage(), e);
             refundResponse = new PayRefundResponse();
             refundResponse.setPayRefundStatus(PayRefundStatus.COMPATIBILITY_STATUS);
             refundResponse.setMessage("请稍后再试！");
@@ -203,7 +204,9 @@ public class PaymentHandle {
         } else {
             refundStatus = this.getFinalRefundStatus(Integer.valueOf(orderRefundResponse.getCode()));
             message = orderRefundResponse.getMessage();
-            refundItemList.add(OrderCancelReqAdapter.convert(orderRefundResponse.getData()));
+            if (orderRefundResponse.getData() != null) {
+                refundItemList.add(OrderCancelReqAdapter.convert(orderRefundResponse.getData()));
+            }
         }
         PayRefundResponse payRefundResponse = handlePayRefundResponse(refundStatus, refundReq.getRefundId());
         payRefundResponse.setPayRefundItemList(refundItemList);