From 144670b00b3ce0be5514368123083278d4f512de Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 16 Jan 2025 11:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E8=B0=B1=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=95=86=E5=93=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/canteen/dto/CanteenDailySpuDTO.java | 5 +++++
 .../pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java  | 1 +
 .../pjcloud-upms-biz/src/main/resources/logback-spring.xml   | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/CanteenDailySpuDTO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/CanteenDailySpuDTO.java
index b6be424b4..aafa9744a 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/CanteenDailySpuDTO.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/dto/CanteenDailySpuDTO.java
@@ -58,4 +58,9 @@ public class CanteenDailySpuDTO {
 	private Integer hourType;
 
 
+	@Schema(description = "商户id")
+	@NotNull
+	private Long merchantId;
+
+
 }
\ No newline at end of file
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
index 6b17d8ccc..363c1381d 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenSpuServiceImpl.java
@@ -109,6 +109,7 @@ public class CanteenSpuServiceImpl extends ServiceImpl<CanteenSpuMapper, Canteen
         LambdaQueryWrapper<CanteenDailyMenuEntity> DyWrapper = Wrappers.lambdaQuery();
         DyWrapper.eq(CanteenDailyMenuEntity::getStartTime, canteenDailySpuDTO.getStartTime());
         DyWrapper.eq(CanteenDailyMenuEntity::getHourType, canteenDailySpuDTO.getHourType());
+        DyWrapper.eq(CanteenDailyMenuEntity::getMerchantId, canteenDailySpuDTO.getMerchantId());
         List<CanteenDailyMenuEntity> list = canteenDailyMenuMapper.selectList(DyWrapper);
 
         List<Long> spuIds = list.stream().map(CanteenDailyMenuEntity::getSpuId).distinct().collect(java.util.stream.Collectors.toList());
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml
index 20ed663e5..9a84839f0 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/logback-spring.xml
@@ -26,7 +26,7 @@
 	</appender>
 
 	<!-- Log file debug output -->
-	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${log.path}/debug.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>