From 07dfcba60395f42231a6171c9be8053cb5d332cc Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Sun, 19 Oct 2025 13:40:11 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=88=9D=E5=A7=8B=E5=8C=96sql?=
=?UTF-8?q?=E8=B0=83=E4=BC=98=EF=BC=9B=E5=AE=A2=E6=88=B7=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/ry_20240629.sql | 48 -------------------
.../StoreCustomerProductDiscountMapper.xml | 5 +-
2 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql
index 310a0c4ea..18f3972bf 100644
--- a/sql/ry_20240629.sql
+++ b/sql/ry_20240629.sql
@@ -2020,54 +2020,6 @@ INSERT INTO `sys_dict_data`
VALUES (1055, 5, '不想要了', '不想要了', 'refund_reason', '0', 'admin', '2025-07-18 22:57:09', '', '2025-07-18 22:57:11', NULL,
0, '0');
INSERT INTO `sys_dict_data`
-VALUES (1056, 1, '2017年春季', '2017年春季', 'release_year_season', '0', 'admin', '2025-08-03 20:52:38', '',
- '2025-08-03 20:52:38', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1057, 2, '2017年夏季', '2017年夏季', 'release_year_season', '0', 'admin', '2025-08-03 20:52:46', '',
- '2025-08-03 20:52:46', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1058, 3, '2017年秋季', '2017年秋季', 'release_year_season', '0', 'admin', '2025-08-03 20:52:56', '',
- '2025-08-03 20:52:56', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1059, 4, '2017年冬季', '2017年冬季', 'release_year_season', '0', 'admin', '2025-08-03 20:53:03', '',
- '2025-08-03 20:53:03', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1060, 5, '2018年春季', '2018年春季', 'release_year_season', '0', 'admin', '2025-08-03 20:53:12', '',
- '2025-08-03 20:53:12', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1061, 6, '2018年夏季', '2018年夏季', 'release_year_season', '0', 'admin', '2025-08-03 20:53:21', '',
- '2025-08-03 20:53:21', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1062, 7, '2018年秋季', '2018年秋季', 'release_year_season', '0', 'admin', '2025-08-03 20:53:27', '',
- '2025-08-03 20:53:27', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1063, 8, '2018年冬季', '2018年冬季', 'release_year_season', '0', 'admin', '2025-08-03 20:53:35', '',
- '2025-08-03 20:53:35', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1064, 9, '2019年春季', '2019年春季', 'release_year_season', '0', 'admin', '2025-08-03 20:53:42', '',
- '2025-08-03 20:53:42', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1065, 10, '2019年夏季', '2019年夏季', 'release_year_season', '0', 'admin', '2025-08-03 20:53:49', '',
- '2025-08-03 20:53:49', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1066, 11, '2019年秋季', '2019年秋季', 'release_year_season', '0', 'admin', '2025-08-03 20:53:56', '',
- '2025-08-03 20:53:56', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1067, 12, '2019年冬季', '2019年冬季', 'release_year_season', '0', 'admin', '2025-08-03 20:54:03', '',
- '2025-08-03 20:54:03', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1068, 13, '2020年春季', '2020年春季', 'release_year_season', '0', 'admin', '2025-08-03 20:54:11', '',
- '2025-08-03 20:54:11', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1069, 14, '2020年夏季', '2020年夏季', 'release_year_season', '0', 'admin', '2025-08-03 20:54:26', '',
- '2025-08-03 20:54:26', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1070, 15, '2020年秋季', '2020年秋季', 'release_year_season', '0', 'admin', '2025-08-03 20:54:34', '',
- '2025-08-03 20:54:34', '', 0, '0');
-INSERT INTO `sys_dict_data`
-VALUES (1071, 16, '2020年冬季', '2020年冬季', 'release_year_season', '0', 'admin', '2025-08-03 20:54:42', '',
- '2025-08-03 20:54:42', '', 0, '0');
-INSERT INTO `sys_dict_data`
VALUES (1072, 17, '2021年春季', '2021年春季', 'release_year_season', '0', 'admin', '2025-08-03 20:54:51', '',
'2025-08-03 20:54:51', '', 0, '0');
INSERT INTO `sys_dict_data`
diff --git a/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml b/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml
index f0893f98f..9e1d06315 100644
--- a/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml
+++ b/xkt/src/main/resources/mapper/StoreCustomerProductDiscountMapper.xml
@@ -27,9 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND scpd.store_cus_name like concat('%', #{cusName}, '%')
AND sp.prod_art_num like concat('%', #{prodArtNum}, '%')
ORDER BY
- scpd.store_cus_id,
+ scpd.create_time DESC,
scpd.store_prod_id,
- scpd.store_prod_color_id
+ scpd.store_prod_color_id,
+ scpd.store_cus_id