From 0ce777a6080b7aac54acd3d3be19d8677565bafc Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Sat, 25 Oct 2025 18:38:42 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E6=8C=87=E5=AE=9A=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 24 +++++++++++++++++++
 .../src/main/resources/application.yml        |  3 +--
 .../mapper/quartz/DailySaleProductMapper.xml  |  2 ++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 153629dc1..d6e4fb0da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,6 +320,30 @@
     </modules>
     <packaging>pom</packaging>
 
+    <profiles>
+        <profile>
+            <id>local</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>local</spring.profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <spring.profiles.active>prod</spring.profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 43e4ffde2..55f514180 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -1,4 +1,3 @@
 spring:
   profiles:
-    active: local
-#    active: prod
+    active: @spring.profiles.active@
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml
index d6fe3863d..7df9553fb 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleProductMapper.xml
@@ -98,6 +98,7 @@
 
     <select id="prodSale1000List" resultType="com.ruoyi.xkt.dto.dailyStoreTag.DailyStoreTagDTO">
         SELECT
+            store_id,
             store_prod_id,
             SUM(IFNULL( sale_num, 0 )) AS count
         FROM
@@ -105,6 +106,7 @@
         WHERE
             voucher_date BETWEEN #{oneMonthAgo} AND #{yesterday}
         GROUP BY
+            store_id,
             store_prod_id
         HAVING
             count >= 1000