Skip to content

O
order-group
Commit 0fb6f27e by 徐康
Options

外卖单取消配送单

parent 34717f08
Showing with 11 additions and 7 deletions
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -1085,9 +1085,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1085,9 +1085,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
} else { } else {
//申请取消配送单 //申请取消配送单
BaseResponseDto deliveryBaseResponse = cancelDelivery(orderBean, ReceiveOrderEnum.RECEIVED_ORDER.getDesc()); if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
if(!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getErrcode())) { BaseResponseDto deliveryBaseResponse = cancelDelivery(orderBean, ReceiveOrderEnum.RECEIVED_ORDER.getDesc());
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "申请取消配送单失败，退款失败"); if(!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "申请取消配送单失败，退款失败");
}
} }
CancelOrderRequest cancelOrderRequest = new CancelOrderRequest(); CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
...@@ -1132,10 +1134,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1132,10 +1134,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
String partnerId = orderBean.getCompanyId(); String partnerId = orderBean.getCompanyId();
int state = PayRefundStatus.SUCCESS.getCode(); int state = PayRefundStatus.SUCCESS.getCode();
//取消配送单 //申请取消配送单
BaseResponseDto deliveryBaseResponse = cancelDelivery(orderBean, ReceiveOrderEnum.NOT_RECEIVE_ORDER.getDesc()); if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
if(!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getErrcode())) { BaseResponseDto deliveryBaseResponse = cancelDelivery(orderBean, ReceiveOrderEnum.NOT_RECEIVE_ORDER.getDesc());
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "申请取消配送单失败，退款失败"); if(!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "申请取消配送单失败，退款失败");
}
} }
if (orderBean.getAmount() != 0) { if (orderBean.getAmount() != 0) {
......
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