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

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

@@ -43,7 +43,7 @@ public class PaymentSdkAdapter {
         return refundRequestDTO;
     }
 
-    public MultiOrderRefundRequest getMultiOrderPayRefundRequest(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+    public MultiOrderRefundRequest getMultiOrderPayRefundRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, BigDecimal refundAmount) {
         MultiOrderRefundRequest multiQueryRequest = new MultiOrderRefundRequest();
         multiQueryRequest.setStationId("1");
         multiQueryRequest.setPartnerId(orderBean.getCompanyId());

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

@@ -144,7 +144,7 @@ public class PaymentHandle {
 
     public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){
         PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
-        MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean);
+        MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean,getRefundAmount(orderBean));
         MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest,orderBean.getCompanyId());
         if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
             throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);