Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop

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

@@ -1134,11 +1134,11 @@ 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(), "申请取消配送单失败，退款失败");
+                return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "取消配送单失败，退款失败");
             }
         }