Merge branch 'feature/20201110_混合支付退款_张志恒' into qa

# Conflicts:
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java

@@ -128,7 +128,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
-            refundResponse = paymentHandle.refund(request, orderBean);
+            if(orderBean.getPayChannelType() != "4"){
+                refundResponse = paymentHandle.refund(request, orderBean);
+            }else{
+                refundResponse = paymentHandle.multiRefund(orderBean);
+
+            }
         } catch (OrderServiceException orderEx){ // 爱马哥兼容，不抛错
             return ResponseUtil.error(orderEx.getResult());
         }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/OrderPayItemResp.java

+package com.freemud.application.sdk.api.ordercenter.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderPayItemResp {
+    private Long id;
+
+    private Long orderId;
+
+    private String orderCode;
+
+    private String partnerId;
+
+    private String storeId;
+
+    private String payChannelType;
+
+    private String payChannelName;
+
+    private String operator;
+
+    private BigDecimal payAmount;
+
+    private String transId;
+
+    private String fmTradeNo;
+
+    private String outOrderNo;
+
+    private String platformTradeNo;
+
+    private String endTransTradeNo;
+}
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -13,6 +13,8 @@
 package com.freemud.application.sdk.api.ordercenter.response.orderInfo;
 
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.request.OrderTraceInfoResp;
+import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp;
 import lombok.Data;
 
 import java.math.BigDecimal;