Merge branch 'KA-新增同意退款回调逻辑处理' into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/PayRefundStatus.java

@@ -20,7 +20,7 @@ public enum PayRefundStatus {
      * 额外状态码 用于判断逻辑,
      */
     NOT_SUFFICIENT_FUNDS(8200201,"余额不足"),
-    COMPATIBILITY_STATUS(9999999,"兼容爱马哥报错");
+    COMPATIBILITY_STATUS(9999999,"退款异常");
 
     private Integer code;
     private String desc;

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

@@ -2088,14 +2088,15 @@ public class OrderServiceImpl implements Orderservice {
                 partnerId, afterSalesType, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
         cancelOrderRequest.setOperator(orderBean.getUserName());
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
-        if (Objects.equals(PayRefundStatus.FAIL.getCode(), state)) {
-            // 退款中
-            cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.RETURN_COMPLETE.getCreateEvent());
-        } else if (Objects.equals(PayRefundStatus.SUCCESS.getCode(), state)) {
+
+        if (Objects.equals(PayRefundStatus.SUCCESS.getCode(), state)) {
             //退款成功
             cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
         } else if (Objects.equals(PayRefundStatus.RUNNING.getCode(), state)) {
             cancelOrderRequest.setCreateEvent(null);
+        }else {
+            // 其他退款失败的情况 不生成售后单
+            return ResponseUtil.error(ResponseResult.MULTIORDER__ERRORREFUND.getCode(), "multiOrderRefund_failed");
         }
         cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
         cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);

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

@@ -102,7 +102,7 @@ public class PaymentHandle {
                     refundResponse = this.refund(request, orderBean);
                 }
             }
-        } catch (OrderServiceException orderEx) { // 爱马哥兼容，不抛错
+        } catch (OrderServiceException orderEx) {
             ResponseResult result = orderEx.getResult();
             refundResponse = new PayRefundResponse();
             refundResponse.setPayRefundStatus(PayRefundStatus.COMPATIBILITY_STATUS);
@@ -376,25 +376,26 @@ public class PaymentHandle {
         if (multiOrderRefundResponse == null || multiOrderRefundResponse.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.ORDER_PAY_RESPONSE_SUCCESS.equals(multiOrderRefundResponse.getCode())) {
             // fisherman 退款异常 也当做 退款中处理
             refundStatus = PayRefundStatus.RUNNING;
-        }
-        List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
-        if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
-            redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
-        }
-        if (CollectionUtils.isNotEmpty(refundPlatformResponseList)) {
-            long refundError = refundPlatformResponseList.stream()
-                    .filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) != 0
-                            && s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUND_SUCCESS) != 0)
-                    .count();
-            if (refundError > 0L) {
-                refundStatus = PayRefundStatus.FAIL;
+        }else {
+            List<MultiOrderRefundResponse.RefundPlatformResponse> refundPlatformResponseList = multiOrderRefundResponse.getData().refundPlatformResponseList;
+            if (null != refundPlatformResponseList && refundPlatformResponseList.size() > 0) {
+                redisCache.save(RedisUtil.getPaymentTransIdSequenceKey(refundPlatformResponseList.get(0).getTransId()), orderBean.getOid(), 1L, TimeUnit.DAYS);
             }
-            // 退款中
-            long refunded = refundPlatformResponseList.stream()
-                    .filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) == 0)
-                    .count();
-            if (refunded > 0L) {
-                refundStatus = PayRefundStatus.RUNNING;
+            if (CollectionUtils.isNotEmpty(refundPlatformResponseList)) {
+                long refundError = refundPlatformResponseList.stream()
+                        .filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) != 0
+                                && s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUND_SUCCESS) != 0)
+                        .count();
+                if (refundError > 0L) {
+                    refundStatus = PayRefundStatus.FAIL;
+                }
+                // 退款中
+                long refunded = refundPlatformResponseList.stream()
+                        .filter(s -> s.getResultCode().compareTo(MultiOrderRefundResponse.RefundPlatformResponse.REFUNDED_RESULTCODE) == 0)
+                        .count();
+                if (refunded > 0L) {
+                    refundStatus = PayRefundStatus.RUNNING;
+                }
             }
         }
         return handlePayRefundResponse(refundStatus, multiOrderRefundRequest.getRefundTradeNo());

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

@@ -244,12 +244,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         deliveryHandle.cancelDelivery(orderBean, request);
         //支付退款
         PayRefundResponse refundResponse = this.getPayRefundResponse(request, orderBean);
-        // 爱马哥报错
+        // 退款异常
         if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.COMPATIBILITY_STATUS.getCode()) == 0) {
             return ResponseUtil.error(refundResponse.getResult());
         }
-        // fisherman --> 退款中的状态 阻止后续流程 等待支付回调
-        if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.RUNNING.getCode()) == 0) {
+        // fisherman --> 退款中的状态 阻止后续流程 等待支付回调  不是退款成功 都终止下面的退款流程
+        if (refundResponse.getPayRefundStatus().getCode().compareTo(PayRefundStatus.SUCCESS.getCode()) != 0) {
             return ResponseUtil.error(ResponseResult.REFUND_FAIL_WAIT_CALLBACK);
         }