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

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

@@ -83,7 +83,6 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
-import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;
 import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
@@ -126,6 +125,7 @@ import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -1671,7 +1671,8 @@ public class OrderServiceImpl implements Orderservice {
      * @param orderRefundVo
      * @param orderBean
      */
-    private BaseResponse partnerNoTakeOrder(OrderRefundVo orderRefundVo, OrderBean orderBean, String fatherOrderId,AfterSalesType afterSalesType,Boolean isRefundDeliveryFee) {
+    @SneakyThrows
+    private BaseResponse partnerNoTakeOrder(OrderRefundVo orderRefundVo, OrderBean orderBean, String fatherOrderId, AfterSalesType afterSalesType, Boolean isRefundDeliveryFee) {
         com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
         Long refundId = System.currentTimeMillis();
         String partnerId = orderBean.getCompanyId();

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

 package cn.freemud.management.adapter;
 
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
+import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -43,6 +43,7 @@ public class PaymentSdkAdapter {
         return refundRequestDTO;
     }
 
+    @SneakyThrows
     public MultiOrderRefundRequest getMultiOrderPayRefundRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, BigDecimal refundAmount) {
         MultiOrderRefundRequest multiQueryRequest = new MultiOrderRefundRequest();
         multiQueryRequest.setStationId("1");
@@ -50,7 +51,7 @@ public class PaymentSdkAdapter {
         multiQueryRequest.setStoreId(orderBean.getShopId());
         multiQueryRequest.setFmId("");
         multiQueryRequest.setRefundAmount(Long.valueOf(String.valueOf(refundAmount)));
-        multiQueryRequest.setRefundTradeNo(getRefundSerialNo().toString());
+        multiQueryRequest.setRefundTradeNo(String.valueOf(getRefundSerialNo()));
         multiQueryRequest.setStoreId(orderBean.getShopId());
         multiQueryRequest.setNotifyUrl(refundNotifyCallback);
         multiQueryRequest.setVer("V1");