麦咖啡取消订单

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -163,7 +163,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         if (reviewStatus!=null && reviewStatus.equals(DeliveryReviewStatus.AGREE.getCode())){
             orderManagerRequest.setOperateType(OperateType.ORDER_AGREE_REFUND.getOpType());
             orderManagerRequest.setReason("配送回调-同意退款");
-            return orderManagerAdapter.orderAgreeRefund(orderManagerRequest);
+            return orderManagerAdapter.orderPayRefund(orderManagerRequest);
         }
         if (reviewStatus!=null && reviewStatus.equals(DeliveryReviewStatus.REJECT.getCode())){
             orderManagerRequest.setOperateType(OperateType.ORDER_REJECT_REFUND.getOpType());

order-management/src/main/java/cn/freemud/management/service/OrderManagerService.java

@@ -81,5 +81,12 @@ public interface OrderManagerService {
         return ResponseUtil.success();
     }
 
+    /**
+     * 取消订单
+     */
+    default BaseResponse<OrderManagerResponse> orderCancel(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean){
+        return ResponseUtil.success();
+    }
+
 
 }

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

@@ -148,6 +148,26 @@ public class OrderManagerAdapter {
     }
 
     /**
+     * 同意退款或者取消订单
+     */
+    public BaseResponse orderPayRefund(OrderManagerRequest request) {
+        //查询订单
+        QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(request.getOrderId());
+        if(CollectionUtils.isNotEmpty(orderBean.getRefundList())){
+            //订单接单参数校验
+            BaseResponse verifyResponse = orderVerifyHandle.orderAgreeRefundMCCafe(orderBean, request);
+            if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
+                return handleResponse(request,orderBean,verifyResponse);
+            }
+            BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderAgreeRefund(request, orderBean);
+            return handleResponse(request,orderBean,orderManagerResponse);
+        }else {
+            BaseResponse<OrderManagerResponse> orderManagerResponse = orderBeanFactory.getOrderManagerService(orderBean).orderCancel(request, orderBean);
+            return handleResponse(request,orderBean,orderManagerResponse);
+        }
+    }
+
+    /**
      * 拒绝退款
      * @param request
      * @return

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

@@ -183,5 +183,18 @@ public class SaasOrderHandle {
         return ResponseUtil.success();
     }
 
+    /**
+     * 取消订单
+     */
+    public BaseResponse orderCancel(OrderManagerRequest request, PayRefundResponse refundResponse,QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        //作废订单
+        CancelOrderRequest cancelOrderRequest = orderSdkAdapter.getCancelOrderRequest(request.getOperator(), request.getReason(), refundResponse.getPayRefundStatus(), refundResponse.getRefundId(), orderBean);
+        BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
+        if (baseOrderResponse == null || ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
+            return ResponseUtil.error(ResponseResult.AFFIRM_ORDER_FAIL);
+        }
+        return ResponseUtil.success();
+    }
+
 
 }

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

@@ -188,4 +188,20 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
         saasOrderHandle.refundReject(request,orderBean);
         return ResponseUtil.success();
     }
+
+
+    /**
+     * 商家取消
+     */
+    @Override
+    public BaseResponse<OrderManagerResponse> orderCancel(OrderManagerRequest request, QueryOrdersResponse.DataBean.OrderBean orderBean) {
+        //支付退款
+        PayRefundResponse refund = paymentHandle.refund(request, orderBean);
+        //订单拒单
+        saasOrderHandle.orderCancel(request,refund, orderBean);
+        //冲正库存
+        stockHandle.revert(request, orderBean);
+        return ResponseUtil.success();
+    }
+
 }