Commit 6d444e68 by zhiheng.zhang

Merge branch 'feature/20210610-开放平台取消订单接口移动-张志恒' into qa

parents b89083e6 22e603da
...@@ -250,7 +250,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService { ...@@ -250,7 +250,7 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType()); executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
} else if (OrderSourceType.MEAL.getCode().equals(orderBean.getSource())) { } else if (OrderSourceType.MEAL.getCode().equals(orderBean.getSource())) {
if (OldOrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()) || PayType.CASH_ON_DELIVERY.getCode() == orderBean.getPayType()) { 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())); executeCancel(request,orderBean, PayRefundStatus.SUCCESS.getCode(), AfterSalesType.USER_SALE_RETURN.getIndex(), Integer.valueOf(orderBean.getOrderClient()));
} else { } else {
executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType()); executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment