From 258462c89d68e6f9926f3bda3741b8c2d9de3b8e Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Sun, 28 Sep 2025 19:40:47 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9FBUG=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/ry_20240629.sql | 4 ++--
xkt/src/main/java/com/ruoyi/xkt/enums/EProductStatus.java | 2 +-
xkt/src/main/resources/mapper/StoreProductColorMapper.xml | 1 -
xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql
index 60b5c4834..f0b9cf67f 100644
--- a/sql/ry_20240629.sql
+++ b/sql/ry_20240629.sql
@@ -3883,7 +3883,7 @@ CREATE TABLE `store_sale`
`code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据编号',
`round_off` decimal(10, 2) UNSIGNED NULL DEFAULT NULL COMMENT '抹零金额',
`voucher_date` date NOT NULL COMMENT '单据日期',
- `quantity` int UNSIGNED NOT NULL COMMENT '数量',
+ `quantity` int NOT NULL COMMENT '数量',
`amount` decimal(10, 2) UNSIGNED NOT NULL COMMENT '总金额',
`pay_way` tinyint UNSIGNED NOT NULL COMMENT '支付方式（1支付宝、2微信、3现金、4欠款）',
`payment_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '结款状态（已结清、欠款）',
@@ -3950,7 +3950,7 @@ CREATE TABLE `store_sale_refund_record`
`sale_type` int UNSIGNED NOT NULL COMMENT '销售类型（销售、退货、销售/退货）',
`code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '单据编号',
`voucher_date` date NOT NULL COMMENT '单据日期',
- `quantity` int UNSIGNED NOT NULL COMMENT '数量',
+ `quantity` int NOT NULL COMMENT '数量',
`amount` decimal(10, 2) UNSIGNED NOT NULL COMMENT '总金额',
`payment_status` int UNSIGNED NULL DEFAULT NULL COMMENT '结款状态（已结清、欠款）',
`operator_id` bigint UNSIGNED NOT NULL COMMENT '当前操作人ID sys_user.id',
diff --git a/xkt/src/main/java/com/ruoyi/xkt/enums/EProductStatus.java b/xkt/src/main/java/com/ruoyi/xkt/enums/EProductStatus.java
index 95c63b593..fd22a6215 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/enums/EProductStatus.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/enums/EProductStatus.java
@@ -13,7 +13,7 @@ import lombok.Getter;
@AllArgsConstructor
public enum EProductStatus {
- UN_PUBLISHED(1, "未发布"),
+ UN_PUBLISHED(1, "待发布"),
ON_SALE(2, "在售"),
TAIL_GOODS(3, "尾货"),
OFF_SALE(4, "已下架"),
diff --git a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml
index 56b7cdd4a..c273badcd 100644
--- a/xkt/src/main/resources/mapper/StoreProductColorMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreProductColorMapper.xml
@@ -8,7 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
UPDATE store_product_color SET del_flag = 2 WHERE store_prod_id = #{storeProdId}
-