From 51527a6e817a6ba73b29b07e94a7e879a86f8eaf Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 06 三月 2024 16:29:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml                             |    2 +-
 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java
index 4fe9468..c048c2c 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/CodeFactoryUtil.java
@@ -200,8 +200,8 @@
         String suffixNumber = "0001";
         if(getRedisService().hasKey(prefix)){
             suffixNumberInt = getRedisService().getCacheObject(prefix);
-            suffixNumber = toFillZeroSuffixNumber(suffixNumberInt,ORDER_LENGTH);
             suffixNumberInt = suffixNumberInt + 1;
+            suffixNumber = toFillZeroSuffixNumber(suffixNumberInt,ORDER_LENGTH);
             getRedisService().setCacheObject(prefix, suffixNumberInt, 24L, TimeUnit.HOURS);
         }else{
             getRedisService().setCacheObject(prefix, 1, 24L, TimeUnit.HOURS);
diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 0060848..97c5723 100644
--- a/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -542,7 +542,7 @@
             AND toc.shop_id = #{param.shopId} AND (toc.unbinding_flag = 0 OR (toc.unbinding_flag = 1 AND toc.order_from = 1) OR (toc.unbinding_flag = 1 AND toc.order_from = 2 AND toc.order_status = 3))
         </if>
         <if test="param.shopIds != null and param.shopIds != ''">
-            and toc.order_status = 3 AND FIND_IN_SET(toc.shop_id, #{param.shopIds}) &gt; 0
+            AND FIND_IN_SET(toc.shop_id, #{param.shopIds}) &gt; 0
         </if>
         <if test="param.keyword != null and param.keyword != ''">
             AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR toc.activity_name LIKE CONCAT('%',#{param.keyword},'%') OR FIND_IN_SET(toc.user_id, #{param.userIds}) &gt; 0)

--
Gitblit v1.7.1