From 3452637c997bb40966a94375fe027be84218e36d Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 29 Aug 2025 11:51:38 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=8E=A8=E5=B9=BF=E8=90=A5?= =?UTF-8?q?=E9=94=80=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20=E9=A3=8E?= =?UTF-8?q?=E6=A0=BCtype=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/quartz/DailySaleMapper.xml | 2 +- sql/ry_20240629.sql | 1 + xkt/src/main/java/com/ruoyi/xkt/domain/AdvertRound.java | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml index 97bb8ce1d..0a1f499fc 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml @@ -15,7 +15,7 @@ COALESCE(SUM(sps.quantity), 0) AS storageNum FROM store_sale ss - LEFT JOIN store_sale_detail ssd ON ss.id = ssd.store_sale_id + JOIN store_sale_detail ssd ON ss.id = ssd.store_sale_id LEFT JOIN store_product_storage sps ON ss.store_id = sps.store_id WHERE ss.del_flag = 0 AND ss.voucher_date = #{voucherDate} diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index e13a0efcd..2bec06943 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -106,6 +106,7 @@ CREATE TABLE `advert_round` `prod_id_str` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品ID字符串', `pic_design_type` int UNSIGNED NULL DEFAULT NULL COMMENT '图片设计(自主设计、平台设计)', `sys_intercept` int UNSIGNED NULL DEFAULT NULL COMMENT '系统拦截(0 未拦截 1已拦截)', + `style_type` int UNSIGNED NULL DEFAULT NULL COMMENT '风格榜风格ID', `version` bigint UNSIGNED NULL DEFAULT NULL COMMENT '版本号', `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志(0代表存在 2代表删除)', `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/AdvertRound.java b/xkt/src/main/java/com/ruoyi/xkt/domain/AdvertRound.java index 61739a6a0..6d6ba85b1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/AdvertRound.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/AdvertRound.java @@ -123,5 +123,9 @@ public class AdvertRound extends XktBaseEntity { * 拒绝理由 */ private String rejectReason; + /** + * 风格榜风格ID + */ + private Integer styleType; }