方法名修改，退款接口异常处理

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

@@ -2,6 +2,7 @@ package cn.freemud.service.impl;
 
 import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.base.log.ErrorLog;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.constant.RedisKeyConstant;
 import cn.freemud.constant.ResponseCodeConstant;
@@ -830,7 +831,7 @@ public class PayServiceImpl {
      * 支付退款
      */
     public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefund(PayRefundRequestDto orderPayRefundRequest) {
-        return orderRefundNew(orderPayRefundRequest);
+        return orderPayRefund(orderPayRefundRequest);
     }
 
     /**
@@ -1280,14 +1281,22 @@ public class PayServiceImpl {
     /**
      * 退款从sdk 剥离
      */
-    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefundNew(PayRefundRequestDto refundRequest) {
+    public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderPayRefund(PayRefundRequestDto refundRequest) {
 
         PaymentQueryOrderRequestDto paymentQueryOrderRequest = new PaymentQueryOrderRequestDto();
 
         paymentQueryOrderRequest.setPartnerId(refundRequest.getPartnerId());
         paymentQueryOrderRequest.setStoreId(refundRequest.getStoreId());
         paymentQueryOrderRequest.setFrontTransId(refundRequest.getOrgTransId());
-        com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse = omsPaymentClient.payQueryOrder(paymentQueryOrderRequest);
+       com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse = null;
+        try {
+            payQueryOrderResponse = omsPaymentClient.payQueryOrder(paymentQueryOrderRequest);
+        }catch (Exception e){
+            cn.freemud.base.log.ErrorLog.errorConvertJson(this.getClass(), "paymentcenter/queryOrder error", e);
+        }
+        if(payQueryOrderResponse == null){
+            return null;
+        }
         Long vipAmount = 0L;
         String payCode = null;
         if (Objects.equals(payQueryOrderResponse.getCode(), "100") && payQueryOrderResponse.getData() != null) {
@@ -1327,8 +1336,15 @@ public class PayServiceImpl {
 //            if (!StringUtils.isEmpty(receiveJsonStr)) {
 //                request.setAccountDivided(receiveJsonStr);
 //            }
-
-            com.freemud.application.sdk.api.base.BaseResponse<PayRefundData> refundNewResponse = omsPaymentClient.payRefund(request);
+            com.freemud.application.sdk.api.base.BaseResponse<PayRefundData>  refundNewResponse = null;
+            try {
+                refundNewResponse = omsPaymentClient.payRefund(request);
+            }catch (Exception e){
+                ErrorLog.errorConvertJson(this.getClass(), "paymentcenter/refund error", e);
+            }
+            if(refundNewResponse == null){
+                return null;
+            }
             if (Objects.equals(refundNewResponse.getCode(), "100")) {
                 PayRefundData refundData = refundNewResponse.getData();
                 if (null != refundData ) {

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

@@ -96,7 +96,7 @@ public class PaymentHandle {
         }
         BaseResponse<OrderRefundResponse> orderRefundResponse;
 //        orderRefundResponse = standardPaymentService.orderRefund(orderRefundRequest, LogThreadLocal.getTrackingNo());
-        orderRefundResponse = this.orderRefundNew(orderRefundRequest);
+        orderRefundResponse = this.orderPayRefund(orderRefundRequest);
         if (orderRefundResponse == null) {
             throw new OrderServiceException(ResponseResult.REFUND_EXCEPTION);
         }
@@ -119,7 +119,7 @@ public class PaymentHandle {
      * @param orderBean
      * @return
      */
-    public PayRefundResponse newOrderRefund(OrderBeanV1 orderBean, OrderExtInfoDto orderExtInfoDto) {
+    public PayRefundResponse posOrderPayRefund(OrderBeanV1 orderBean, OrderExtInfoDto orderExtInfoDto) {
         PayRefundStatus refundStatus = PayRefundStatus.SUCCESS;
         PayRefundRequestDto refundRequest = paymentSdkAdapter.convert2OrderRefundNewRequest(orderBean, orderExtInfoDto);
         if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
@@ -173,7 +173,7 @@ public class PaymentHandle {
         BaseResponse<OrderRefundResponse> orderRefundResponse;
         try {
 //            orderRefundResponse = standardPaymentService.orderRefund(orderRefundRequest, "");
-            orderRefundResponse = this.orderRefundNew(orderRefundRequest);
+            orderRefundResponse = this.orderPayRefund(orderRefundRequest);
         } catch (Exception ex) {
             ErrorLog.errorConvertJson(this.getClass(), "refundError", ex);
             return handlePayRefundResponse(PayRefundStatus.FAIL, orderRefundRequest.getRefundId());
@@ -229,14 +229,25 @@ public class PaymentHandle {
     }
 
 
-    public BaseResponse<OrderRefundResponse> orderRefundNew(PayRefundRequestDto refundRequest) {
+    /**
+     * 支付退款
+     */
+    public BaseResponse<OrderRefundResponse> orderPayRefund(PayRefundRequestDto refundRequest) {
 
         PaymentQueryOrderRequestDto paymentQueryOrderRequest = new PaymentQueryOrderRequestDto();
 
         paymentQueryOrderRequest.setPartnerId(refundRequest.getPartnerId());
         paymentQueryOrderRequest.setStoreId(refundRequest.getStoreId());
         paymentQueryOrderRequest.setFrontTransId(refundRequest.getOrgTransId());
-        BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse = paymentNewClient.payQueryOrder(paymentQueryOrderRequest);
+        BaseResponse<PaymentQueryOrderResponseDto> payQueryOrderResponse = null;
+        try {
+            payQueryOrderResponse = paymentNewClient.payQueryOrder(paymentQueryOrderRequest);
+        }catch (Exception e){
+            cn.freemud.base.log.ErrorLog.errorConvertJson(this.getClass(), "paymentcenter/queryOrder error", e);
+        }
+        if(payQueryOrderResponse == null){
+            return null;
+        }
         Long vipAmount = 0L;
         String payCode = null;
         if (Objects.equals(payQueryOrderResponse.getCode(), "100") && payQueryOrderResponse.getData() != null) {
@@ -262,7 +273,7 @@ public class PaymentHandle {
         request.setFmId(refundRequest.getOrgPayFmId());
         request.setTotalAmount(refundRequest.getTotalAmount());
         request.setRefundAmount(refundRequest.getRefundAmount());
-        request.setRefundId(refundRequest.getRefundId().toString());
+        request.setRefundId(refundRequest.getRefundId());
         request.setRefundDesc(refundRequest.getRefundDesc());
         request.setNotifyUrl(refundRequest.getNotifyUrl());
         request.setPartnerId(refundRequest.getPartnerId());
@@ -277,7 +288,15 @@ public class PaymentHandle {
 //                request.setAccountDivided(receiveJsonStr);
 //            }
 
-            BaseResponse<PayRefundData> refundNewResponse = paymentNewClient.payRefund(request);
+            BaseResponse<PayRefundData> refundNewResponse = null;
+            try {
+                refundNewResponse = paymentNewClient.payRefund(request);
+            }catch (Exception e){
+                ErrorLog.errorConvertJson(this.getClass(), "paymentcenter/refund error", e);
+            }
+            if(refundNewResponse == null){
+                return null;
+            }
             if (Objects.equals(refundNewResponse.getCode(), "100")) {
                 PayRefundData refundData = refundNewResponse.getData();
                 if (null != refundData) {

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

@@ -356,7 +356,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(order.getExtInfo(), OrderExtInfoDto.class) == null ? new OrderExtInfoDto() : JSONObject.parseObject(order.getExtInfo(), OrderExtInfoDto.class);
         //支付退款
         if (orderExtInfoDto != null  && orderExtInfoDto.getSvcAmount()!= null && StringUtils.isNotEmpty(orderExtInfoDto.getSvcCardCode())  && order.getPayStatus() > 1){
-            PayRefundResponse refundResponse = paymentHandle.newOrderRefund(order, orderExtInfoDto);
+            PayRefundResponse refundResponse = paymentHandle.posOrderPayRefund(order, orderExtInfoDto);
             if(ObjectUtils.equals(PayRefundStatus.SUCCESS,refundResponse.getPayRefundStatus())){
                 return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
             }