From 3818d03e7e911a02531806241b34b0c51b277944 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Mar 2022 15:33:04 +0800
Subject: [PATCH] 20220324

---
 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..473e1a4 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() == Integer.parseInt(shopManageAbleCancelDfkOrder.getParamValue())) {
 
             if (!Dictionary.ORDER_STATU_DFK.equals(order.getStatu())) {
                 return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待付款订单");

--
Gitblit v1.9.1