Merge branch 'feature/售后单记录支付信息' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java

@@ -14,12 +14,14 @@ package com.freemud.sdk.api.assortment.order.request.order;
 
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class CancelOrderRequest extends BaseConfig {
@@ -102,6 +104,11 @@ public class CancelOrderRequest extends BaseConfig {
     private Integer refundState;
 
     /**
+     * 对退款明细的记录
+     */
+    private List<OrderCancelReq.PayRefundItem> payRefundItemList;
+
+    /**
      * 售后单拓展信息
      */
     private AfterSalesOrderExtInfoReq extInfoReq;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -986,6 +986,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setOperationClient(cancelOrderRequest.getOperationClient());
         request.setRefundState(cancelOrderRequest.getRefundState());
         request.setRefundDeliveryAmount(cancelOrderRequest.isRefundDeliveryAmount());
+        request.setPayRefundItemList(cancelOrderRequest.getPayRefundItemList());
         com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }

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

@@ -15,6 +15,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1;
 import com.freemud.application.sdk.api.ordercenter.request.AfterSalesRefundFailReq;
+import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderModifyRelatingCodeReq;
 import com.freemud.application.sdk.api.ordercenter.request.POSOrderOperationBaseReq;
 import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
@@ -29,12 +30,15 @@ import com.freemud.sdk.api.assortment.order.request.order.BaseQueryOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
 import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -204,6 +208,17 @@ public class SaasOrderHandle {
         //作废订单
         CancelOrderRequest cancelOrderRequest = orderSdkAdapter.getCancelOrderRequest(request.getOperator(), request.getReason(), refundResponse.getPayRefundStatus(), refundResponse.getRefundId(), orderBean);
         cancelOrderRequest.setOperationClient(request.getOperationClient());
+
+        List<OrderCancelReq.PayRefundItem> refundItemList = new ArrayList<>();
+        if (!CollectionUtils.isEmpty(refundResponse.getPayRefundItemList())) {
+            refundResponse.getPayRefundItemList().forEach(item -> {
+                OrderCancelReq.PayRefundItem refundItem = new OrderCancelReq.PayRefundItem();
+                BeanUtils.copyProperties(item, refundItem);
+                refundItemList.add(refundItem);
+            });
+        }
+        cancelOrderRequest.setPayRefundItemList(refundItemList);
+
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderReject(cancelOrderRequest);
         if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
             return ResponseUtil.error(ResponseResult.AFFIRM_ORDER_FAIL);