From 997831bb8c314d781e6cc5533898ffbe077dd3b6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 06 Apr 2021 11:19:56 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index 6c2af22..0b5c95a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -1,5 +1,6 @@
package com.matrix.system.hive.action;
+import cn.hutool.core.collection.CollUtil;
import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
@@ -95,10 +96,8 @@
RabiitMqTemplate rabiitMqTemplate;
@Autowired
- private SysProjUseDao sysProjUseDao;
+ private SysProjServicesDao sysProjServicesDao;
- @Autowired
- private SysProjServicesService projServicesService;
@Value("${evn}")
private String evn;
@@ -448,8 +447,10 @@
if(orderVo.getId()!=null){
WebUtil.getRequest().setAttribute("orderParam", orderVo.getId());
+ WebUtil.getRequest().setAttribute("orderId", orderVo.getId());
}else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
WebUtil.getRequest().setAttribute("orderParam", orderVo.getOrderNo());
+ WebUtil.getRequest().setAttribute("orderNo", orderVo.getOrderNo());
}
return "admin/hive/beautySalon/orderXq-form";
}
@@ -479,8 +480,14 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "订单不存在！");
}
-// SysProjServices sysProjServices = new SysProjServices();
-// projServicesService.findByModel()
+ List<SysOrderItem> items = orderItemDao.selectByOrderId(id);
+ for (SysOrderItem item : items) {
+ List<SysProjServices> sysProjServices = sysProjServicesDao.selectProjServicesByOrderItemId(item.getId());
+ if (CollUtil.isNotEmpty(sysProjServices)) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "订单存在进行中的服务单无法取消/删除");
+ }
+ }
+
orderService.cancelOrder(id);
// if (del > 0) {
// orderService.removeById(id);
--
Gitblit v1.9.1