xiaoyong931011
2022-04-02 28b56dbf572ce6563ca4f7e4a83db86bfefb9620
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -550,12 +550,17 @@
//        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
//                && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
                    && BooleanEnum.TRUE.getValue().equals(shopManageAbleCancelDfkOrder.getParamValue())) {
                    && BooleanEnum.TRUE.getValue() == shopManageAbleCancelDfkOrder.getIntParamValue()) {
            if (!checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DYY)
                    && !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待预约订单");
            }
        }else{
            if (checkProjServices.getState().equals(Dictionary.SERVICE_STATU_FWWC)
                    || checkProjServices.getState().equals(Dictionary.SERVICE_STATU_FFJS)) {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "当前状态无法取消订单");
            }
        }
        return erpCancelOrder(services);
    }