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

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -12,6 +12,7 @@
  */
 package cn.freemud.entities.dto;
 
+import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -278,6 +279,12 @@ public class QueryOrdersResponseDto {
              */
             private BigDecimal weight;
 
+
+            /**
+             * 混合支付详情
+             */
+            private List<OrderPayItemResp> orderPayItemCreateReqList;
+
             @NoArgsConstructor
             @Data
             public static class AddDeliveryInfo {

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -1746,7 +1746,7 @@ public class OrderServiceImpl implements Orderservice {
         String partnerId = orderBean.getCompanyId();
         int state = PayRefundStatus.SUCCESS.getCode();
         if (orderBean.getAmount() != 0) {
-            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
+            if(null != orderBean.getOrderPayItemCreateReqList() && orderBean.getOrderPayItemCreateReqList().size()>0){
                 //调用支付退款
                 MultiOrderRefundRequest multiOrderRefundRequest = orderAdapter.getMultiOrderPayRefundRequest(orderBean, refundId);
                 MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());

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

@@ -128,7 +128,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
-            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
+            if(null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size()>0){
                 refundResponse = paymentHandle.multiRefund(orderBean);
             }else{
                 refundResponse = paymentHandle.refund(request, orderBean);
@@ -162,7 +162,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //支付退款
         PayRefundResponse refundResponse = new PayRefundResponse();
         try {
-            if("4".equalsIgnoreCase(orderBean.getPayChannelType())){
+            if(null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size()>0){
                 refundResponse = paymentHandle.multiRefund(orderBean);
             }else{
                 refundResponse = paymentHandle.refund(request, orderBean);