开放平台取消订单

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

@@ -244,12 +244,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         List<Integer> oldOrderStatusList = Arrays.asList(OldOrderStatus.RECEIPT.getCode(),OldOrderStatus.COMPLETE.getCode(),OldOrderStatus.COMPLETE_MAKE.getCode());
         List<String> sourceList = Arrays.asList(OrderSourceType.SAAS.getCode(),OrderSourceType.ALIPAY.getCode(),OrderSourceType.APP.getCode());
         if (sourceList.contains(orderBean.getSource()) && oldOrderStatusList.contains(orderBean.getStatus())) {
-            executeRefund(request,orderBean, OperateType.ORDER_AGREE_REFUND.getOpType());
+            executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
         } else if (OrderSourceType.MEAL.getCode().equals(orderBean.getSource())) {
             if (OldOrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()) || PayType.CASH_ON_DELIVERY.getCode() == orderBean.getPayType()) {
                 executeCancel(request,orderBean, RefundStatus.COMPLETE_REFUND.getCode(), AfterSalesType.USER_SALE_RETURN.getIndex(), Integer.valueOf(orderBean.getOrderClient()));
             } else {
-                executeRefund(request,orderBean, OperateType.ORDER_AGREE_REFUND.getOpType());
+                executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
             }
         } else if (OrderSourceType.POS.getCode().equals(orderBean.getSource())) {
             return posCancel(orderBean);
@@ -272,22 +272,13 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
         }
         BaseResponse<OrderManagerResponse> baseResponse = null;
         //调用oms拒绝订单
-        if (operationType.equalsIgnoreCase(OperateType.ORDER_REJECT_REFUND.getOpType())) {
+        if (operationType.equalsIgnoreCase(OperateType.ORDER_REJECT.getOpType())) {
             baseResponse = this.orderReject(request, orderBean);
         }
-        //调用oms同意退款
-        if (operationType.equalsIgnoreCase(OperateType.ORDER_AGREE_REFUND.getOpType())) {
-            // 同意退款在支付退款后的退款/退货完成操作
-            baseResponse = this.orderAgreeRefund(request, orderBean);
-        }
         if(null == baseResponse || !ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))){
             emailAlertService.sendEmailAlert("商家取消订单失败", "请求json:" + JSONObject.toJSONString(orderBean) + "返回msg:" + baseResponse.getMessage());
             return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
         }
-        baseResponse = executeCancel(request,orderBean, RefundStatus.COMPLETE_REFUND.getCode(), AfterSalesType.USER_SALE_RETURN.getIndex(), Integer.valueOf(orderBean.getOrderClient()));
-        if(null == baseResponse || !ObjectUtils.equals(SUCCESS,Integer.valueOf(baseResponse.getCode()))){
-            return ResponseUtil.error(ResponseResult.PARTNER_ORDER_CANCEL_ERROR);
-        }
         return ResponseUtil.success();
     }