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

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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -425,6 +425,8 @@ public class QueryOrdersResponse {
             private List<OrderPayItemResp> orderPayItemCreateReqList;
             private List<OrderPayItem> orderPayItem;
 
+            private String pickUpGoodsNo;
+
             @NoArgsConstructor
             @Data
             public static class AddDeliveryInfo {

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

@@ -43,13 +43,13 @@ 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());
         multiQueryRequest.setStoreId(orderBean.getShopId());
         multiQueryRequest.setFmId("");
-        multiQueryRequest.setRefundAmount(orderBean.getAmount());
+        multiQueryRequest.setRefundAmount(Long.valueOf(String.valueOf(refundAmount)));
         multiQueryRequest.setRefundTradeNo(getRefundSerialNo().toString());
         multiQueryRequest.setStoreId(orderBean.getShopId());
         multiQueryRequest.setNotifyUrl(refundNotifyCallback);

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

@@ -142,19 +142,19 @@ public class PaymentHandle {
         return payRefundResponse;
     }
 
-    public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean) {
-        PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
-        MultiOrderRefundRequest multiOrderRefundRequest = paymentSdkAdapter.getMultiOrderPayRefundRequest(orderBean);
-        MultiOrderRefundResponse multiOrderRefundResponse = mulitiPaymentClient.paymentApplicationRefund(multiOrderRefundRequest, orderBean.getCompanyId());
+    public PayRefundResponse multiRefund(QueryOrdersResponse.DataBean.OrderBean orderBean){
+        PayRefundStatus refundStatus=PayRefundStatus.SUCCESS;
+        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);
         }
         List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
         refundPlatformResponseList = refundPlatformResponseList.stream().filter(m -> !m.getEbcode().equalsIgnoreCase("10102")).collect(Collectors.toList());
-        if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
-            redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
+        if(null != refundPlatformResponseList && refundPlatformResponseList.size()>0){
+            redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()),orderBean.getOid(),1L,TimeUnit.DAYS);
         }
 
-        return handlePayRefundResponse(refundStatus, multiOrderRefundRequest.getRefundTradeNo());
+        return handlePayRefundResponse(refundStatus,multiOrderRefundRequest.getRefundTradeNo());
     }
 }