From eb706a988e747b624fda0d44e0aaf6a4ee5e20eb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 26 May 2022 11:27:03 +0800
Subject: [PATCH] fix saveOrder zkPrice is null
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 2f6ffce..cd34e93 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,6 +1,5 @@
package com.matrix.system.hive.action;
-import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.matrix.component.asyncmessage.AsyncMessageManager;
import com.matrix.core.exception.GlobleException;
@@ -21,8 +20,10 @@
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
+import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.enums.OperationButtonEnum;
import com.matrix.system.enums.OperationFunctionEnum;
+import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
@@ -180,7 +181,7 @@
}
}
}
- orderService.refundOrderMoney(sysOrder);
+ orderService.orderTk(sysOrder);
//处理用户购买的产品
return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单退款成功");
}
@@ -218,6 +219,7 @@
if (!DataAuthUtil.hasAllShopAuth()) {
sysOrder.setShopId(getMe().getShopId());
}
+ sysOrder.setCompanyId(getMe().getCompanyId());
return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
orderService.findTotal(sysOrder));
}
@@ -478,13 +480,7 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "订单不存在！");
}
- 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);
@@ -506,8 +502,11 @@
SysOrder order = orderService.findById(id);
BusParameterSettings shopManageAbleCancelDfkOrder = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER, order.getCompanyId());
+// if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
+// && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
- && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
+ && BooleanEnum.TRUE.getValue() == shopManageAbleCancelDfkOrder.getIntParamValue()) {
+
if (!Dictionary.ORDER_STATU_DFK.equals(order.getStatu())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待付款订单");
}
--
Gitblit v1.9.1