From 62bf99d419e470f5556f21682d0d8ee8b9e20412 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 12 Mar 2021 16:24:04 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 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 bd6e51b..e1f1896 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;
@@ -42,7 +43,6 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Date;
import java.util.List;
/**
@@ -94,6 +94,10 @@
@Autowired
RabiitMqTemplate rabiitMqTemplate;
+
+ @Autowired
+ private SysProjServicesDao sysProjServicesDao;
+
@Value("${evn}")
private String evn;
@@ -131,6 +135,7 @@
SysUsers user = getMe();
sysOrder.setShopId(user.getShopId());
sysOrder.setOrderType(SysOrder.ORDER_TYPE_SEAL);
+ sysOrder.setIsHasRefund(SysOrder.IS_HAS_REFUND_N);
//校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
sysOrder = orderService.checkAndSaveOrder(sysOrder);
orderService.updateReceiptMoney(sysOrder);
@@ -154,7 +159,6 @@
*/
@RequestMapping(value = "/refundOrder")
@ResponseBody
- @Transactional(rollbackFor = Exception.class)
public AjaxResult refundOrder(@RequestBody SysOrder sysOrder) {
//储值卡订单不能通过退款渠道退款
if(CollectionUtils.isNotEmpty(sysOrder.getItems())){
@@ -165,30 +169,6 @@
}
}
}
- SysUsers user = getMe();
- sysOrder.setStaffId(user.getSuId());
- sysOrder.setCompanyId(user.getCompanyId());
- sysOrder.setShopId(user.getShopId());
- sysOrder.setStatu(Dictionary.ORDER_STATU_TK);
- sysOrder.setOrderTime(new Date());
- sysOrder.setOrderNo(codeService.getRefundOrderNo());
- //新增订单
- sysOrderDao.insert(sysOrder);
- //插入明细
- for (SysOrderItem item : sysOrder.getItems()) {
- SysOrderItem oldItem=orderItemDao.selectById(item.getId());
- item.setType(oldItem.getType());
- // 取负数
- item.setStatus(Dictionary.ORDER_STATU_TK);
- item.setCount(-item.getCount());
- item.setOrderId(sysOrder.getId());
- item.setId(null);
- orderItemDao.insert(item);
- }
-
-
-
-
orderService.refundOrderMoney(sysOrder);
//处理用户购买的产品
return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单退款成功");
@@ -497,13 +477,22 @@
if (order == null) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "订单不存在！");
}
- orderService.cancelOrder(id);
- if (del > 0) {
- orderService.removeById(id);
- result.setInfo("删除成功！");
- } else {
- result.setInfo("取消成功！");
+
+ 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);
+// result.setInfo("删除成功！");
+// } else {
+ result.setInfo("取消成功！");
+// }
result.setStatus(AjaxResult.STATUS_SUCCESS);
return result;
--
Gitblit v1.9.1