From 2e50e8566bb05279a5a9cb27119a38ef6827a2cc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Mar 2022 18:14:42 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' of http://120.27.238.55:7000/r/beauty-erp into feature/订单服务单代码改造
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 2 +-
1 files changed, 1 insertions(+), 1 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 e39392b..c02f6ee 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
@@ -505,7 +505,7 @@
// 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 (!Dictionary.ORDER_STATU_DFK.equals(order.getStatu())) {
return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待付款订单");
--
Gitblit v1.9.1