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

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

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

@@ -32,7 +32,6 @@ import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.ordercenter.util.LogUtil;
 import com.freemud.application.sdk.api.util.ResponseUtils;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -56,7 +55,6 @@ import java.util.*;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Component
-@Slf4j
 public class PaymentHandle {
 
     private static final String SUCCESS = "100";
@@ -120,7 +118,7 @@ public class PaymentHandle {
             refundResponse.setResult(result);
             return refundResponse;
         } catch (Exception e) {
-            log.error("getCommonPayRefundResponse error", e);
+            ErrorLog.errorConvertJson(this.getClass(), e.getMessage(), e);
             refundResponse = new PayRefundResponse();
             refundResponse.setPayRefundStatus(PayRefundStatus.COMPATIBILITY_STATUS);
             refundResponse.setMessage("请稍后再试！");
@@ -206,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);