新增 未接单的退款售后处理逻辑

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

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

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -206,6 +206,7 @@ public enum ResponseResult {
      */
     PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常","Abnormal payment transaction"),
     PAY_SVC_CONFIG_ERROR("58004", "不支持储值卡支付",""),
+    PAY_REFUND_ERROR("58005", "退款已受理,请等待",""),
     /**
      * 优惠券活动
      */

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

@@ -2018,9 +2018,9 @@ public class OrderServiceImpl implements Orderservice {
                 BaseResponse baseResponse = partnerNoTakeOrder(orderRefundVo, orderBean, orderId, AfterSalesType.USER_CANCEL, isRefundDeliveryFee);
                 if (baseResponse != null) {
                     return baseResponse;
-                }
-                // 删除订单 通知活动添加商品库存
+                }   // 删除订单 通知活动添加商品库存
                 orderQueueService.backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(), orderBean.getPayStatus());
+
             } else {
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
@@ -2074,50 +2074,24 @@ public class OrderServiceImpl implements Orderservice {
         String partnerId = orderBean.getCompanyId();
         int state = PayRefundStatus.SUCCESS.getCode();
         if (orderBean.getAmount() != 0) {
-            if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
-                //调用支付退款
-                MultiOrderRefundRequest multiOrderRefundRequest = orderAdapter.getMultiOrderPayRefundRequest(orderBean, refundId);
-                MultiOrderRefundResponse multiOrderRefundResponse = payServiceImpl.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())) {
-                    return ResponseUtil.error(ResponseResult.MULTIORDER__ERRORREFUND.getCode(), "multiOrderRefund_failed");
-                }
-                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);
-                }
-                //获取支付返回退款状态
-                state = PayRefundStatus.SUCCESS.getCode();
-            } else {
-                OrderExtendedReq ext = orderBean.getOrderExtended();
-                if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
-                    //代付人信息不为空  并且和订单创建人不一样，表示代付单
-                    PayRefundResponse resp = paymentHandle.agentPayRefund(orderBean);
-                    state = resp.getPayRefundStatus().getCode();
-                } else {
-                    //调用支付退款
-                    PayRefundRequestDto orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
-                    //抖音支付退款必传
-                    orderPayRefundRequest.setRefundDesc(orderRefundVo.getReason() == null ? "用户退款" : orderRefundVo.getReason());
-                    response = payServiceImpl.orderRefund(orderPayRefundRequest);
-                    if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
-                        return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
-                    }
-                    //获取支付返回退款状态
-                    state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
-                }
-            }
+            OrderManagerRequest orderManagerRequest = new OrderManagerRequest();
+            orderManagerRequest.setReason(orderRefundVo.getReason());
+            PayRefundResponse refundResponse = paymentHandle.getCommonPayRefundResponse(orderManagerRequest, orderBean);
+            state = refundResponse.getPayRefundStatus().getCode();
         }
 
         CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
                 partnerId, afterSalesType, orderRefundVo.getReason(), LogThreadLocal.getTrackingNo(), refundId.toString());
         cancelOrderRequest.setOperator(orderBean.getUserName());
         cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
-        if (Objects.equals(PayRefundStatus.RUNNING.getCode(), state)) {
+        if (Objects.equals(PayRefundStatus.FAIL.getCode(), state)) {
             // 退款中
             cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.RETURN_COMPLETE.getCreateEvent());
         } else if (Objects.equals(PayRefundStatus.SUCCESS.getCode(), state)) {
             //退款成功
             cancelOrderRequest.setCreateEvent(AfterSalesOrderCreateEventEnum.REFUND_COMPLETE.getCreateEvent());
+        } else if (Objects.equals(PayRefundStatus.RUNNING.getCode(), state)) {
+            cancelOrderRequest.setCreateEvent(null);
         }
         cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
         cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
@@ -2130,6 +2104,11 @@ public class OrderServiceImpl implements Orderservice {
         if (baseOrderResponse == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");
         }
+
+        if (state == PayRefundStatus.RUNNING.getCode().intValue()) {
+            // 如果退款中, 直接来个申请记录,  退款回调进行处理
+            return ResponseUtil.error(ResponseResult.PAY_REFUND_ERROR);
+        }
         return null;
     }
 
@@ -2336,7 +2315,7 @@ public class OrderServiceImpl implements Orderservice {
             messageTemplateRequest.setMessageEventType(messageEventType);
             com.freemud.application.sdk.api.base.BaseResponse baseResponse = this.messageTemplatePushService.sendTemplateMsg(messageTemplateRequest);
             if (!Objects.equals(baseResponse.getCode(), ResponseResultEnum.SUCCESS.getCode())) {
-                AppLogUtil.errorLog("发送支付成功模板消息 失败",orderBean.getOid(),JSON.toJSONString(baseResponse),null);
+                AppLogUtil.errorLog("发送支付成功模板消息 失败", orderBean.getOid(), JSON.toJSONString(baseResponse), null);
             }
         } catch (Exception e) {
             AppLogUtil.errorLog("sendTemplateMsg_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(messageTemplateRequest), e);
@@ -3592,7 +3571,7 @@ public class OrderServiceImpl implements Orderservice {
                 } else {
                     resultMap.put(orderCode, resp.getMessage());
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 resultMap.put(orderCode, e.getMessage());
             }
         });
@@ -3623,7 +3602,7 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "订单已取消，无法退款");
         }
         // fisherman 仅仅支持 餐饮类订单进行操作
-        if (BizTypeEnum.ORDINARY.getBizType().compareTo(orderBean.getBizType()) !=0) {
+        if (BizTypeEnum.ORDINARY.getBizType().compareTo(orderBean.getBizType()) != 0) {
             return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "仅支持餐饮订单操作");
         }
 
@@ -3682,9 +3661,9 @@ public class OrderServiceImpl implements Orderservice {
                         Long bLong = Long.valueOf(o2.getCreateTime());
                         if (bLong > aLong) {
                             return 1;
-                        }else if (bLong < aLong){
+                        } else if (bLong < aLong) {
                             return -1;
-                        }else {
+                        } else {
                             return 0;
                         }
                     });
@@ -3931,5 +3910,4 @@ public class OrderServiceImpl implements Orderservice {
     }
 
 
-
 }

order-management/src/main/java/cn/freemud/management/entities/dto/response/pay/PayRefundResponse.java

 package cn.freemud.management.entities.dto.response.pay;
 
+import cn.freemud.management.enums.ResponseResult;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import lombok.Data;
 
@@ -28,4 +29,9 @@ public class PayRefundResponse {
      * 退款序列号
      */
     private String refundId;
+
+    /**
+     *  兼容爱马哥退款报错的字段 ,其他场景不会有值
+     */
+    private ResponseResult result;
 }

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -11,6 +11,7 @@ import cn.freemud.management.service.handle.OrderVerifyHandle;
 import cn.freemud.management.util.ResponseUtil;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
+import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1;
@@ -58,11 +59,12 @@ public class OrderManagerAdapter {
             }
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderConfirm(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
      * 制作完成
+     *
      * @param request
      * @return
      */
@@ -75,14 +77,15 @@ public class OrderManagerAdapter {
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.orderDoneVerify(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return handleResponse(request,orderBean,verifyResponse);
+            return handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderDone(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
      * 送出
+     *
      * @param request
      * @return
      */
@@ -101,19 +104,20 @@ public class OrderManagerAdapter {
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.orderDeliveryVerify(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return StringUtils.equals(verifyResponse.getCode(), ResponseResult.ORDER_IS_COMPLETE_CAN_NOT_DELIVERY.getCode()) ? handleResponse(request,orderBean,ResponseUtil.success()) : handleResponse(request,orderBean,verifyResponse);
+            return StringUtils.equals(verifyResponse.getCode(), ResponseResult.ORDER_IS_COMPLETE_CAN_NOT_DELIVERY.getCode()) ? handleResponse(request, orderBean, ResponseUtil.success()) : handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderDelivery(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
      * 完成
+     *
      * @param request
      * @return
      */
-    public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request,OrderBeanV1 orderBean) {
-        if (orderBean==null){
+    public BaseResponse<OrderManagerResponse> orderAffirm(OrderManagerRequest request, OrderBeanV1 orderBean) {
+        if (orderBean == null) {
             //查询订单
             orderBean = orderBaseService.getByOrderCode(request.getOrderId());
             if (null == orderBean) {
@@ -123,10 +127,10 @@ public class OrderManagerAdapter {
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.orderAffirmVerify(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return handleResponse(request,orderBean,verifyResponse);
+            return handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAffirm(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
@@ -143,9 +147,9 @@ public class OrderManagerAdapter {
         }
         //订单接单参数校验
         BaseResponse verifyResponse;
-        if(BizTypeEnum.MALL.getBizType().compareTo(orderBean.getBizType()) == 0){
+        if (BizTypeEnum.MALL.getBizType().compareTo(orderBean.getBizType()) == 0) {
             verifyResponse = orderVerifyHandle.mallOrderRejectVerify(orderBean, request);
-        }else {
+        } else {
             if (!macCafePartnerId.equals(orderBean.getCompanyId())) {
                 verifyResponse = orderVerifyHandle.orderRejectVerify(orderBean, request);
             } else {
@@ -153,14 +157,15 @@ public class OrderManagerAdapter {
             }
         }
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return handleResponse(request,orderBean,verifyResponse);
+            return handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderReject(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
      * 同意退款
+     *
      * @param request
      * @return
      */
@@ -172,16 +177,16 @@ public class OrderManagerAdapter {
         }
         //订单接单参数校验
         BaseResponse verifyResponse;
-        if(BizTypeEnum.MALL.getBizType()==orderBean.getBizType()){
+        if (BizTypeEnum.MALL.getBizType() == orderBean.getBizType()) {
             verifyResponse = orderVerifyHandle.mallOrderAgreeRefund(orderBean, request);
-        }else{
+        } else {
             verifyResponse = orderVerifyHandle.orderAgreeRefund(orderBean, request);
         }
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return handleResponse(request,orderBean,verifyResponse);
+            return handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAgreeRefund(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
@@ -193,22 +198,23 @@ public class OrderManagerAdapter {
         if (null == orderBean) {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
-        if(CollectionUtils.isNotEmpty(orderBean.getRefundList())){
+        if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
             //订单接单参数校验
             BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefundMCCafe(orderBean, request);
             if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-                return handleResponse(request,orderBean,verifyResponse);
+                return handleResponse(request, orderBean, verifyResponse);
             }
             BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAgreeRefund(request, orderBean);
-            return handleResponse(request,orderBean,orderManagerResponse);
-        }else {
+            return handleResponse(request, orderBean, orderManagerResponse);
+        } else {
             BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean);
-            return handleResponse(request,orderBean,orderManagerResponse);
+            return handleResponse(request, orderBean, orderManagerResponse);
         }
     }
 
     /**
      * 拒绝退款
+     *
      * @param request
      * @return
      */
@@ -220,22 +226,23 @@ public class OrderManagerAdapter {
         }
         //订单接单参数校验
         BaseResponse verifyResponse;
-        if(BizTypeEnum.MALL.getBizType()==orderBean.getBizType()){
+        if (BizTypeEnum.MALL.getBizType() == orderBean.getBizType()) {
             verifyResponse = orderVerifyHandle.mallOrderRejectRefund(orderBean, request);
-        }else{
+        } else {
             verifyResponse = orderVerifyHandle.orderRejectRefund(orderBean, request);
         }
 
 
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return handleResponse(request,orderBean,verifyResponse);
+            return handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderRejectRefund(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
      * 取消订单
+     *
      * @param request
      * @return
      */
@@ -246,11 +253,12 @@ public class OrderManagerAdapter {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
      * 拒绝退款
+     *
      * @param request
      * @return
      */
@@ -263,20 +271,20 @@ public class OrderManagerAdapter {
         //订单接单参数校验
         BaseResponse verifyResponse = orderVerifyHandle.mcCafeOrderRejectRefund(orderBean, request);
         if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
-            return handleResponse(request,orderBean,verifyResponse);
+            return handleResponse(request, orderBean, verifyResponse);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderRejectRefund(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
 
-    private BaseResponse<OrderManagerResponse> handleResponse(OrderManagerRequest request, OrderBeanV1 orderBean,BaseResponse result) {
-        if (orderBean==null){
+    private BaseResponse<OrderManagerResponse> handleResponse(OrderManagerRequest request, OrderBeanV1 orderBean, BaseResponse result) {
+        if (orderBean == null) {
             return result;
         }
         RefundStatusV1 refundStatus = CollectionUtils.isNotEmpty(orderBean.getRefundList()) ? RefundStatusV1.getRefundStatusByCodeV1(orderBean.getRefundList().get(0).getStatus()) : null;
         OrderStatusV1 orderStatus = OrderStatusV1.getByCode(orderBean.getStatus());
-        if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(),result.getCode())){
+        if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(), result.getCode())) {
             OperateType byOpType = OperateType.getByOpType(request.getOperateType());
             if (byOpType != null) {
                 switch (byOpType) {
@@ -303,14 +311,15 @@ public class OrderManagerAdapter {
                     default:
                 }
             }
-            return ResponseUtil.success(new OrderManagerResponse(orderStatus,refundStatus));
+            return ResponseUtil.success(new OrderManagerResponse(orderStatus, refundStatus));
         }
-        result.setResult(new OrderManagerResponse(orderStatus,refundStatus));
+        result.setResult(new OrderManagerResponse(orderStatus, refundStatus));
         return result;
     }
 
     /**
      * 创建配送单
+     *
      * @param request
      * @return
      */
@@ -326,10 +335,10 @@ public class OrderManagerAdapter {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCreateDelivery(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
-    private BaseResponse<OrderBeanV1> getOrderBean(String orderId){
+    private BaseResponse<OrderBeanV1> getOrderBean(String orderId) {
         //查询订单
         OrderBeanV1 orderBean = orderBaseService.getByOrderCode(orderId);
         // 防止NPE
@@ -341,6 +350,7 @@ public class OrderManagerAdapter {
 
     /**
      * 取消配送
+     *
      * @param request
      * @return
      */
@@ -352,14 +362,14 @@ public class OrderManagerAdapter {
         }
         OrderBeanV1 orderBean = orderBeanResp.getResult();
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancelDelivery(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
     /**
-     * @see OrderManagerAdapter#orderAgreeRefund(cn.freemud.management.entities.dto.request.order.OrderManagerRequest)
      * @param request
      * @return 改操作 无需校验订单参数 直接退款
      * 使用该方法 请先进行报备, 因为不暴露给外部使用, 不属于业务代码
+     * @see OrderManagerAdapter#orderAgreeRefund(cn.freemud.management.entities.dto.request.order.OrderManagerRequest)
      */
     public BaseResponse developRefund(OrderManagerRequest request) {
         //查询订单
@@ -368,9 +378,9 @@ public class OrderManagerAdapter {
             return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
         }
         // 设置退款金额
-        orderBean.setAmount(orderVerifyHandle.getRefundAmount(orderBean,false).longValue());
+        orderBean.setAmount(orderVerifyHandle.getRefundAmount(orderBean, false).longValue());
         BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAgreeRefund(request, orderBean);
-        return handleResponse(request,orderBean,orderManagerResponse);
+        return handleResponse(request, orderBean, orderManagerResponse);
     }
 
 

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

@@ -21,6 +21,7 @@ import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
 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.response.OrderBaseResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
@@ -85,6 +86,32 @@ public class PaymentHandle {
     @Autowired
     private LogUtil logUtil;
 
+    public PayRefundResponse getCommonPayRefundResponse(OrderManagerRequest request, OrderBeanV1 orderBean) {
+        PayRefundResponse refundResponse;
+        try {
+            if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
+                //  payment/application/refund
+                refundResponse = this.multiRefund(orderBean);
+            } else {
+                OrderExtendedReq ext = orderBean.getOrderExtended();
+                if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
+                    //代付人信息不为空  并且和订单创建人不一样，表示代付单   payment/application/agentRefund
+                    refundResponse = this.agentPayRefund(orderBean);
+                } else {
+                    //正常订单现金退款  paymentcenter/refund
+                    refundResponse = this.refund(request, orderBean);
+                }
+            }
+        } catch (OrderServiceException orderEx) { // 爱马哥兼容，不抛错
+            ResponseResult result = orderEx.getResult();
+            refundResponse = new PayRefundResponse();
+            refundResponse.setPayRefundStatus(PayRefundStatus.COMPATIBILITY_STATUS);
+            refundResponse.setResult(result);
+            return refundResponse;
+        }
+        return refundResponse;
+    }
+
     /**
      * 退款
      *

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

@@ -243,25 +243,11 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         //取消配送单
         deliveryHandle.cancelDelivery(orderBean, request);
         //支付退款
-        PayRefundResponse refundResponse;
-        try {
-            if (null != orderBean.getOrderPayItem() && orderBean.getOrderPayItem().size() > 0) {
-                //  payment/application/refund
-                refundResponse = paymentHandle.multiRefund(orderBean);
-            } else {
-                OrderExtendedReq ext = orderBean.getOrderExtended();
-                if (StringUtils.isNotBlank(ext.getAgentPayerId()) && !Objects.equals(ext.getAgentPayerId(), orderBean.getUserId())) {
-                    //代付人信息不为空  并且和订单创建人不一样，表示代付单   payment/application/agentRefund
-                    refundResponse = paymentHandle.agentPayRefund(orderBean);
-                } else {
-                    //正常订单现金退款  paymentcenter/refund
-                    refundResponse = paymentHandle.refund(request, orderBean);
-                }
-            }
-        } catch (OrderServiceException orderEx) { // 爱马哥兼容，不抛错
-            return ResponseUtil.error(orderEx.getResult());
+        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) {
             return ResponseUtil.error(ResponseResult.REFUND_FAIL_WAIT_CALLBACK);
@@ -278,6 +264,17 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
     }
 
     /**
+     * 提出 退款公共代码
+     *
+     * @param request
+     * @param orderBean
+     * @return
+     */
+    private PayRefundResponse getPayRefundResponse(OrderManagerRequest request, OrderBeanV1 orderBean) {
+        return paymentHandle.getCommonPayRefundResponse(request, orderBean);
+    }
+
+    /**
      * 拒绝退款
      *
      * @param request
@@ -449,7 +446,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
 
         String refundStatus = request.getRefundStatus();
         PayRefundStatus payRefundStatus = PayRefundStatus.SUCCESS;
-        if (!Objects.equals(refundStatus,"100")) {
+        if (!Objects.equals(refundStatus, "100")) {
             payRefundStatus = PayRefundStatus.FAIL;
         }
         refundResponse.setPayRefundStatus(payRefundStatus);
@@ -459,9 +456,10 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         omRequest.setReason(reason);
         omRequest.setOperator("支付退款回调系统补偿");
         saasOrderHandle.refundAgree(omRequest, refundResponse, orderBean);
-        // 推送pos、微信消息中心
-
+        // 推送pos、微信消息中心  未接单前 不需要推送pos
+        if (!NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderBean.getStatusV2())) {
             orderBaseService.sendMessage(orderBean, ORDER_AGREE_REFUND, reason);
+        }
         //todo  可以考虑基于订单回调异步实现
         //冲正库存
         stockHandle.revert(omRequest, orderBean);