Skip to content

O
order-group
Commit af9640d7 by 徐康
Options

bug日志

parent c76e15de
Showing with 2 additions and 1 deletions
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -1074,6 +1074,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1074,6 +1074,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
isRefundDeliveryFee = false; isRefundDeliveryFee = false;
} }
System.out.println(JSON.toJSONString(orderBean));
//申请取消配送单/取消配送单 //申请取消配送单/取消配送单
BaseResponseDto deliveryBaseResponse = new BaseResponseDto(); BaseResponseDto deliveryBaseResponse = new BaseResponseDto();
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) { if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
...@@ -1085,7 +1086,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1085,7 +1086,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
// //
if ((OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType()) && CancelDeliveryResponseDto.notCollectMsg.equals(deliveryBaseResponse.getErrmsg())) if ((OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType()) && CancelDeliveryResponseDto.notCollectMsg.equals(deliveryBaseResponse.getErrmsg()))
|| OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType()) || OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType())
|| OldOrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) { || OldOrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
//商家未接单逻辑处理 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口 //商家未接单逻辑处理 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
BaseResponse baseResponse = partnerNoTakeOrder(orderRefundVo, orderBean, orderId,AfterSalesType.USER_CANCEL,isRefundDeliveryFee); BaseResponse baseResponse = partnerNoTakeOrder(orderRefundVo, orderBean, orderId,AfterSalesType.USER_CANCEL,isRefundDeliveryFee);
......
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