外卖单取消配送单

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

@@ -1085,10 +1085,12 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             } else {
 
                 //申请取消配送单
+                if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
                     BaseResponseDto deliveryBaseResponse = cancelDelivery(orderBean, ReceiveOrderEnum.RECEIVED_ORDER.getDesc());
                     if(!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getErrcode())) {
                         return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "申请取消配送单失败，退款失败");
                     }
+                }
 
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
@@ -1132,11 +1134,13 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         String partnerId = orderBean.getCompanyId();
         int state = PayRefundStatus.SUCCESS.getCode();
 
-        //取消配送单
+        //申请取消配送单
+        if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
             BaseResponseDto deliveryBaseResponse = cancelDelivery(orderBean, ReceiveOrderEnum.NOT_RECEIVE_ORDER.getDesc());
             if(!ResponseConstant.SUCCESS_RESPONSE_CODE.equals(deliveryBaseResponse.getErrcode())) {
                 return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "申请取消配送单失败，退款失败");
             }
+        }
 
         if (orderBean.getAmount() != 0) {
             //调用支付退款