申请取消配送单

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -1074,7 +1074,6 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                 isRefundDeliveryFee = false;
             }
 
-            System.out.println(JSON.toJSONString(orderBean));
             //申请取消配送单/取消配送单
             BaseResponseDto deliveryBaseResponse = new BaseResponseDto();
             if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
@@ -1195,11 +1194,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     .reviewId(orderBean.getOid().substring(0, 20))
                     .build();
             CancelDeliveryResponseDto deliveryBaseResponse = deliveryFeiginMCCafeClient.cancelRequest(cancelDeliveryRequest);
+            baseResponseDto.setErrcode(deliveryBaseResponse.getCode());
+            baseResponseDto.setErrmsg(deliveryBaseResponse.getMsg());
 
             if (deliveryBaseResponse == null || !ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getCode())) {
                 LogUtil.error("申请取消配送单失败", cancelDeliveryRequest, deliveryBaseResponse);
-                baseResponseDto.setErrcode(deliveryBaseResponse.getCode());
-                baseResponseDto.setErrmsg(deliveryBaseResponse.getMsg());
                 return baseResponseDto;
             }
         }