From 6e18ab8df8180ce3996b8db2213df3bbed809412 Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Sat, 16 Dec 2023 22:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3eae447a-3ae1-4be3-aa70-1183cffb0765.xml  | 952 +++++++++---------
 .idea/inspectionProfiles/Project_Default.xml  |   4 +
 .idea/workspace.xml                           |  31 +-
 .../bunny/controller/OrderInfoController.java |  29 +
 .../bunny/mapper/OrderStatisticsMapper.java   |   6 +
 .../cn/bunny/service/OrderInfoService.java    |   9 +
 .../service/impl/OrderInfoServiceImpl.java    |  37 +
 .../mapper/order/OrderStatisticsMapper.xml    |  15 +
 .../model/dto/order/OrderStatisticsDto.java   |   2 +-
 9 files changed, 598 insertions(+), 487 deletions(-)
 create mode 100644 spzx-manager/src/main/java/cn/bunny/controller/OrderInfoController.java
 create mode 100644 spzx-manager/src/main/java/cn/bunny/service/OrderInfoService.java
 create mode 100644 spzx-manager/src/main/java/cn/bunny/service/impl/OrderInfoServiceImpl.java

diff --git a/.idea/dataSources/3eae447a-3ae1-4be3-aa70-1183cffb0765.xml b/.idea/dataSources/3eae447a-3ae1-4be3-aa70-1183cffb0765.xml
index e5cbcc3..2301d98 100644
--- a/.idea/dataSources/3eae447a-3ae1-4be3-aa70-1183cffb0765.xml
+++ b/.idea/dataSources/3eae447a-3ae1-4be3-aa70-1183cffb0765.xml
@@ -91,1046 +91,1046 @@ performance_schema|schema||mysql.session|localhost|SELECT|G
 sys|schema||mysql.sys|localhost|TRIGGER|G</Grants>
       <ServerVersion>8.0.28</ServerVersion>
     </root>
-    <collation id="2" parent="1" name="armscii8_bin">
-      <Charset>armscii8</Charset>
-    </collation>
-    <collation id="3" parent="1" name="armscii8_general_ci">
+    <collation id="2" parent="1" name="armscii8_general_ci">
       <Charset>armscii8</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="4" parent="1" name="ascii_bin">
-      <Charset>ascii</Charset>
+    <collation id="3" parent="1" name="armscii8_bin">
+      <Charset>armscii8</Charset>
     </collation>
-    <collation id="5" parent="1" name="ascii_general_ci">
+    <collation id="4" parent="1" name="ascii_general_ci">
       <Charset>ascii</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="6" parent="1" name="big5_bin">
-      <Charset>big5</Charset>
+    <collation id="5" parent="1" name="ascii_bin">
+      <Charset>ascii</Charset>
     </collation>
-    <collation id="7" parent="1" name="big5_chinese_ci">
+    <collation id="6" parent="1" name="big5_chinese_ci">
       <Charset>big5</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
+    <collation id="7" parent="1" name="big5_bin">
+      <Charset>big5</Charset>
+    </collation>
     <collation id="8" parent="1" name="binary">
       <Charset>binary</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="9" parent="1" name="cp1250_bin">
-      <Charset>cp1250</Charset>
-    </collation>
-    <collation id="10" parent="1" name="cp1250_croatian_ci">
-      <Charset>cp1250</Charset>
-    </collation>
-    <collation id="11" parent="1" name="cp1250_czech_cs">
-      <Charset>cp1250</Charset>
-    </collation>
-    <collation id="12" parent="1" name="cp1250_general_ci">
+    <collation id="9" parent="1" name="cp1250_general_ci">
       <Charset>cp1250</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
+    <collation id="10" parent="1" name="cp1250_czech_cs">
+      <Charset>cp1250</Charset>
+    </collation>
+    <collation id="11" parent="1" name="cp1250_croatian_ci">
+      <Charset>cp1250</Charset>
+    </collation>
+    <collation id="12" parent="1" name="cp1250_bin">
+      <Charset>cp1250</Charset>
+    </collation>
     <collation id="13" parent="1" name="cp1250_polish_ci">
       <Charset>cp1250</Charset>
     </collation>
-    <collation id="14" parent="1" name="cp1251_bin">
+    <collation id="14" parent="1" name="cp1251_bulgarian_ci">
       <Charset>cp1251</Charset>
     </collation>
-    <collation id="15" parent="1" name="cp1251_bulgarian_ci">
+    <collation id="15" parent="1" name="cp1251_ukrainian_ci">
       <Charset>cp1251</Charset>
     </collation>
-    <collation id="16" parent="1" name="cp1251_general_ci">
+    <collation id="16" parent="1" name="cp1251_bin">
+      <Charset>cp1251</Charset>
+    </collation>
+    <collation id="17" parent="1" name="cp1251_general_ci">
       <Charset>cp1251</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="17" parent="1" name="cp1251_general_cs">
+    <collation id="18" parent="1" name="cp1251_general_cs">
       <Charset>cp1251</Charset>
     </collation>
-    <collation id="18" parent="1" name="cp1251_ukrainian_ci">
-      <Charset>cp1251</Charset>
-    </collation>
-    <collation id="19" parent="1" name="cp1256_bin">
-      <Charset>cp1256</Charset>
-    </collation>
-    <collation id="20" parent="1" name="cp1256_general_ci">
+    <collation id="19" parent="1" name="cp1256_general_ci">
       <Charset>cp1256</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="21" parent="1" name="cp1257_bin">
+    <collation id="20" parent="1" name="cp1256_bin">
+      <Charset>cp1256</Charset>
+    </collation>
+    <collation id="21" parent="1" name="cp1257_lithuanian_ci">
       <Charset>cp1257</Charset>
     </collation>
-    <collation id="22" parent="1" name="cp1257_general_ci">
+    <collation id="22" parent="1" name="cp1257_bin">
+      <Charset>cp1257</Charset>
+    </collation>
+    <collation id="23" parent="1" name="cp1257_general_ci">
       <Charset>cp1257</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="23" parent="1" name="cp1257_lithuanian_ci">
-      <Charset>cp1257</Charset>
-    </collation>
-    <collation id="24" parent="1" name="cp850_bin">
-      <Charset>cp850</Charset>
-    </collation>
-    <collation id="25" parent="1" name="cp850_general_ci">
+    <collation id="24" parent="1" name="cp850_general_ci">
       <Charset>cp850</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="26" parent="1" name="cp852_bin">
-      <Charset>cp852</Charset>
+    <collation id="25" parent="1" name="cp850_bin">
+      <Charset>cp850</Charset>
     </collation>
-    <collation id="27" parent="1" name="cp852_general_ci">
+    <collation id="26" parent="1" name="cp852_general_ci">
       <Charset>cp852</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="28" parent="1" name="cp866_bin">
-      <Charset>cp866</Charset>
+    <collation id="27" parent="1" name="cp852_bin">
+      <Charset>cp852</Charset>
     </collation>
-    <collation id="29" parent="1" name="cp866_general_ci">
+    <collation id="28" parent="1" name="cp866_general_ci">
       <Charset>cp866</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="30" parent="1" name="cp932_bin">
-      <Charset>cp932</Charset>
+    <collation id="29" parent="1" name="cp866_bin">
+      <Charset>cp866</Charset>
     </collation>
-    <collation id="31" parent="1" name="cp932_japanese_ci">
+    <collation id="30" parent="1" name="cp932_japanese_ci">
       <Charset>cp932</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="32" parent="1" name="dec8_bin">
-      <Charset>dec8</Charset>
+    <collation id="31" parent="1" name="cp932_bin">
+      <Charset>cp932</Charset>
     </collation>
-    <collation id="33" parent="1" name="dec8_swedish_ci">
+    <collation id="32" parent="1" name="dec8_swedish_ci">
       <Charset>dec8</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="34" parent="1" name="eucjpms_bin">
-      <Charset>eucjpms</Charset>
+    <collation id="33" parent="1" name="dec8_bin">
+      <Charset>dec8</Charset>
     </collation>
-    <collation id="35" parent="1" name="eucjpms_japanese_ci">
+    <collation id="34" parent="1" name="eucjpms_japanese_ci">
       <Charset>eucjpms</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="36" parent="1" name="euckr_bin">
-      <Charset>euckr</Charset>
+    <collation id="35" parent="1" name="eucjpms_bin">
+      <Charset>eucjpms</Charset>
     </collation>
-    <collation id="37" parent="1" name="euckr_korean_ci">
+    <collation id="36" parent="1" name="euckr_korean_ci">
       <Charset>euckr</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="38" parent="1" name="gb18030_bin">
-      <Charset>gb18030</Charset>
+    <collation id="37" parent="1" name="euckr_bin">
+      <Charset>euckr</Charset>
     </collation>
-    <collation id="39" parent="1" name="gb18030_chinese_ci">
+    <collation id="38" parent="1" name="gb18030_chinese_ci">
       <Charset>gb18030</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
+    <collation id="39" parent="1" name="gb18030_bin">
+      <Charset>gb18030</Charset>
+    </collation>
     <collation id="40" parent="1" name="gb18030_unicode_520_ci">
       <Charset>gb18030</Charset>
     </collation>
-    <collation id="41" parent="1" name="gb2312_bin">
-      <Charset>gb2312</Charset>
-    </collation>
-    <collation id="42" parent="1" name="gb2312_chinese_ci">
+    <collation id="41" parent="1" name="gb2312_chinese_ci">
       <Charset>gb2312</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="43" parent="1" name="gbk_bin">
-      <Charset>gbk</Charset>
+    <collation id="42" parent="1" name="gb2312_bin">
+      <Charset>gb2312</Charset>
     </collation>
-    <collation id="44" parent="1" name="gbk_chinese_ci">
+    <collation id="43" parent="1" name="gbk_chinese_ci">
       <Charset>gbk</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="45" parent="1" name="geostd8_bin">
-      <Charset>geostd8</Charset>
+    <collation id="44" parent="1" name="gbk_bin">
+      <Charset>gbk</Charset>
     </collation>
-    <collation id="46" parent="1" name="geostd8_general_ci">
+    <collation id="45" parent="1" name="geostd8_general_ci">
       <Charset>geostd8</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="47" parent="1" name="greek_bin">
-      <Charset>greek</Charset>
+    <collation id="46" parent="1" name="geostd8_bin">
+      <Charset>geostd8</Charset>
     </collation>
-    <collation id="48" parent="1" name="greek_general_ci">
+    <collation id="47" parent="1" name="greek_general_ci">
       <Charset>greek</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="49" parent="1" name="hebrew_bin">
-      <Charset>hebrew</Charset>
+    <collation id="48" parent="1" name="greek_bin">
+      <Charset>greek</Charset>
     </collation>
-    <collation id="50" parent="1" name="hebrew_general_ci">
+    <collation id="49" parent="1" name="hebrew_general_ci">
       <Charset>hebrew</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="51" parent="1" name="hp8_bin">
-      <Charset>hp8</Charset>
+    <collation id="50" parent="1" name="hebrew_bin">
+      <Charset>hebrew</Charset>
     </collation>
-    <collation id="52" parent="1" name="hp8_english_ci">
+    <collation id="51" parent="1" name="hp8_english_ci">
       <Charset>hp8</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="53" parent="1" name="keybcs2_bin">
-      <Charset>keybcs2</Charset>
+    <collation id="52" parent="1" name="hp8_bin">
+      <Charset>hp8</Charset>
     </collation>
-    <collation id="54" parent="1" name="keybcs2_general_ci">
+    <collation id="53" parent="1" name="keybcs2_general_ci">
       <Charset>keybcs2</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="55" parent="1" name="koi8r_bin">
-      <Charset>koi8r</Charset>
+    <collation id="54" parent="1" name="keybcs2_bin">
+      <Charset>keybcs2</Charset>
     </collation>
-    <collation id="56" parent="1" name="koi8r_general_ci">
+    <collation id="55" parent="1" name="koi8r_general_ci">
       <Charset>koi8r</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="57" parent="1" name="koi8u_bin">
-      <Charset>koi8u</Charset>
+    <collation id="56" parent="1" name="koi8r_bin">
+      <Charset>koi8r</Charset>
     </collation>
-    <collation id="58" parent="1" name="koi8u_general_ci">
+    <collation id="57" parent="1" name="koi8u_general_ci">
       <Charset>koi8u</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="59" parent="1" name="latin1_bin">
+    <collation id="58" parent="1" name="koi8u_bin">
+      <Charset>koi8u</Charset>
+    </collation>
+    <collation id="59" parent="1" name="latin1_german1_ci">
       <Charset>latin1</Charset>
     </collation>
-    <collation id="60" parent="1" name="latin1_danish_ci">
-      <Charset>latin1</Charset>
-    </collation>
-    <collation id="61" parent="1" name="latin1_general_ci">
-      <Charset>latin1</Charset>
-    </collation>
-    <collation id="62" parent="1" name="latin1_general_cs">
-      <Charset>latin1</Charset>
-    </collation>
-    <collation id="63" parent="1" name="latin1_german1_ci">
-      <Charset>latin1</Charset>
-    </collation>
-    <collation id="64" parent="1" name="latin1_german2_ci">
-      <Charset>latin1</Charset>
-    </collation>
-    <collation id="65" parent="1" name="latin1_spanish_ci">
-      <Charset>latin1</Charset>
-    </collation>
-    <collation id="66" parent="1" name="latin1_swedish_ci">
+    <collation id="60" parent="1" name="latin1_swedish_ci">
       <Charset>latin1</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="67" parent="1" name="latin2_bin">
+    <collation id="61" parent="1" name="latin1_danish_ci">
+      <Charset>latin1</Charset>
+    </collation>
+    <collation id="62" parent="1" name="latin1_german2_ci">
+      <Charset>latin1</Charset>
+    </collation>
+    <collation id="63" parent="1" name="latin1_bin">
+      <Charset>latin1</Charset>
+    </collation>
+    <collation id="64" parent="1" name="latin1_general_ci">
+      <Charset>latin1</Charset>
+    </collation>
+    <collation id="65" parent="1" name="latin1_general_cs">
+      <Charset>latin1</Charset>
+    </collation>
+    <collation id="66" parent="1" name="latin1_spanish_ci">
+      <Charset>latin1</Charset>
+    </collation>
+    <collation id="67" parent="1" name="latin2_czech_cs">
       <Charset>latin2</Charset>
     </collation>
-    <collation id="68" parent="1" name="latin2_croatian_ci">
-      <Charset>latin2</Charset>
-    </collation>
-    <collation id="69" parent="1" name="latin2_czech_cs">
-      <Charset>latin2</Charset>
-    </collation>
-    <collation id="70" parent="1" name="latin2_general_ci">
+    <collation id="68" parent="1" name="latin2_general_ci">
       <Charset>latin2</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="71" parent="1" name="latin2_hungarian_ci">
+    <collation id="69" parent="1" name="latin2_hungarian_ci">
       <Charset>latin2</Charset>
     </collation>
-    <collation id="72" parent="1" name="latin5_bin">
-      <Charset>latin5</Charset>
+    <collation id="70" parent="1" name="latin2_croatian_ci">
+      <Charset>latin2</Charset>
     </collation>
-    <collation id="73" parent="1" name="latin5_turkish_ci">
+    <collation id="71" parent="1" name="latin2_bin">
+      <Charset>latin2</Charset>
+    </collation>
+    <collation id="72" parent="1" name="latin5_turkish_ci">
       <Charset>latin5</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="74" parent="1" name="latin7_bin">
+    <collation id="73" parent="1" name="latin5_bin">
+      <Charset>latin5</Charset>
+    </collation>
+    <collation id="74" parent="1" name="latin7_estonian_cs">
       <Charset>latin7</Charset>
     </collation>
-    <collation id="75" parent="1" name="latin7_estonian_cs">
-      <Charset>latin7</Charset>
-    </collation>
-    <collation id="76" parent="1" name="latin7_general_ci">
+    <collation id="75" parent="1" name="latin7_general_ci">
       <Charset>latin7</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="77" parent="1" name="latin7_general_cs">
+    <collation id="76" parent="1" name="latin7_general_cs">
       <Charset>latin7</Charset>
     </collation>
-    <collation id="78" parent="1" name="macce_bin">
-      <Charset>macce</Charset>
+    <collation id="77" parent="1" name="latin7_bin">
+      <Charset>latin7</Charset>
     </collation>
-    <collation id="79" parent="1" name="macce_general_ci">
+    <collation id="78" parent="1" name="macce_general_ci">
       <Charset>macce</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="80" parent="1" name="macroman_bin">
-      <Charset>macroman</Charset>
+    <collation id="79" parent="1" name="macce_bin">
+      <Charset>macce</Charset>
     </collation>
-    <collation id="81" parent="1" name="macroman_general_ci">
+    <collation id="80" parent="1" name="macroman_general_ci">
       <Charset>macroman</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="82" parent="1" name="sjis_bin">
-      <Charset>sjis</Charset>
+    <collation id="81" parent="1" name="macroman_bin">
+      <Charset>macroman</Charset>
     </collation>
-    <collation id="83" parent="1" name="sjis_japanese_ci">
+    <collation id="82" parent="1" name="sjis_japanese_ci">
       <Charset>sjis</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="84" parent="1" name="swe7_bin">
-      <Charset>swe7</Charset>
+    <collation id="83" parent="1" name="sjis_bin">
+      <Charset>sjis</Charset>
     </collation>
-    <collation id="85" parent="1" name="swe7_swedish_ci">
+    <collation id="84" parent="1" name="swe7_swedish_ci">
       <Charset>swe7</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="86" parent="1" name="tis620_bin">
-      <Charset>tis620</Charset>
+    <collation id="85" parent="1" name="swe7_bin">
+      <Charset>swe7</Charset>
     </collation>
-    <collation id="87" parent="1" name="tis620_thai_ci">
+    <collation id="86" parent="1" name="tis620_thai_ci">
       <Charset>tis620</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="88" parent="1" name="ucs2_bin">
-      <Charset>ucs2</Charset>
+    <collation id="87" parent="1" name="tis620_bin">
+      <Charset>tis620</Charset>
     </collation>
-    <collation id="89" parent="1" name="ucs2_croatian_ci">
-      <Charset>ucs2</Charset>
-    </collation>
-    <collation id="90" parent="1" name="ucs2_czech_ci">
-      <Charset>ucs2</Charset>
-    </collation>
-    <collation id="91" parent="1" name="ucs2_danish_ci">
-      <Charset>ucs2</Charset>
-    </collation>
-    <collation id="92" parent="1" name="ucs2_esperanto_ci">
-      <Charset>ucs2</Charset>
-    </collation>
-    <collation id="93" parent="1" name="ucs2_estonian_ci">
-      <Charset>ucs2</Charset>
-    </collation>
-    <collation id="94" parent="1" name="ucs2_general_ci">
+    <collation id="88" parent="1" name="ucs2_general_ci">
       <Charset>ucs2</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="95" parent="1" name="ucs2_general_mysql500_ci">
+    <collation id="89" parent="1" name="ucs2_bin">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="96" parent="1" name="ucs2_german2_ci">
+    <collation id="90" parent="1" name="ucs2_unicode_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="97" parent="1" name="ucs2_hungarian_ci">
+    <collation id="91" parent="1" name="ucs2_icelandic_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="98" parent="1" name="ucs2_icelandic_ci">
+    <collation id="92" parent="1" name="ucs2_latvian_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="99" parent="1" name="ucs2_latvian_ci">
+    <collation id="93" parent="1" name="ucs2_romanian_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="100" parent="1" name="ucs2_lithuanian_ci">
+    <collation id="94" parent="1" name="ucs2_slovenian_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="101" parent="1" name="ucs2_persian_ci">
+    <collation id="95" parent="1" name="ucs2_polish_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="102" parent="1" name="ucs2_polish_ci">
+    <collation id="96" parent="1" name="ucs2_estonian_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="103" parent="1" name="ucs2_roman_ci">
+    <collation id="97" parent="1" name="ucs2_spanish_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="104" parent="1" name="ucs2_romanian_ci">
+    <collation id="98" parent="1" name="ucs2_swedish_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="105" parent="1" name="ucs2_sinhala_ci">
+    <collation id="99" parent="1" name="ucs2_turkish_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="106" parent="1" name="ucs2_slovak_ci">
+    <collation id="100" parent="1" name="ucs2_czech_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="107" parent="1" name="ucs2_slovenian_ci">
+    <collation id="101" parent="1" name="ucs2_danish_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="108" parent="1" name="ucs2_spanish2_ci">
+    <collation id="102" parent="1" name="ucs2_lithuanian_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="109" parent="1" name="ucs2_spanish_ci">
+    <collation id="103" parent="1" name="ucs2_slovak_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="110" parent="1" name="ucs2_swedish_ci">
+    <collation id="104" parent="1" name="ucs2_spanish2_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="111" parent="1" name="ucs2_turkish_ci">
+    <collation id="105" parent="1" name="ucs2_roman_ci">
+      <Charset>ucs2</Charset>
+    </collation>
+    <collation id="106" parent="1" name="ucs2_persian_ci">
+      <Charset>ucs2</Charset>
+    </collation>
+    <collation id="107" parent="1" name="ucs2_esperanto_ci">
+      <Charset>ucs2</Charset>
+    </collation>
+    <collation id="108" parent="1" name="ucs2_hungarian_ci">
+      <Charset>ucs2</Charset>
+    </collation>
+    <collation id="109" parent="1" name="ucs2_sinhala_ci">
+      <Charset>ucs2</Charset>
+    </collation>
+    <collation id="110" parent="1" name="ucs2_german2_ci">
+      <Charset>ucs2</Charset>
+    </collation>
+    <collation id="111" parent="1" name="ucs2_croatian_ci">
       <Charset>ucs2</Charset>
     </collation>
     <collation id="112" parent="1" name="ucs2_unicode_520_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="113" parent="1" name="ucs2_unicode_ci">
+    <collation id="113" parent="1" name="ucs2_vietnamese_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="114" parent="1" name="ucs2_vietnamese_ci">
+    <collation id="114" parent="1" name="ucs2_general_mysql500_ci">
       <Charset>ucs2</Charset>
     </collation>
-    <collation id="115" parent="1" name="ujis_bin">
-      <Charset>ujis</Charset>
-    </collation>
-    <collation id="116" parent="1" name="ujis_japanese_ci">
+    <collation id="115" parent="1" name="ujis_japanese_ci">
       <Charset>ujis</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="117" parent="1" name="utf16_bin">
-      <Charset>utf16</Charset>
+    <collation id="116" parent="1" name="ujis_bin">
+      <Charset>ujis</Charset>
     </collation>
-    <collation id="118" parent="1" name="utf16_croatian_ci">
-      <Charset>utf16</Charset>
-    </collation>
-    <collation id="119" parent="1" name="utf16_czech_ci">
-      <Charset>utf16</Charset>
-    </collation>
-    <collation id="120" parent="1" name="utf16_danish_ci">
-      <Charset>utf16</Charset>
-    </collation>
-    <collation id="121" parent="1" name="utf16_esperanto_ci">
-      <Charset>utf16</Charset>
-    </collation>
-    <collation id="122" parent="1" name="utf16_estonian_ci">
-      <Charset>utf16</Charset>
-    </collation>
-    <collation id="123" parent="1" name="utf16_general_ci">
+    <collation id="117" parent="1" name="utf16_general_ci">
       <Charset>utf16</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="124" parent="1" name="utf16_german2_ci">
+    <collation id="118" parent="1" name="utf16_bin">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="125" parent="1" name="utf16_hungarian_ci">
+    <collation id="119" parent="1" name="utf16_unicode_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="126" parent="1" name="utf16_icelandic_ci">
+    <collation id="120" parent="1" name="utf16_icelandic_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="127" parent="1" name="utf16_latvian_ci">
+    <collation id="121" parent="1" name="utf16_latvian_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="128" parent="1" name="utf16_lithuanian_ci">
+    <collation id="122" parent="1" name="utf16_romanian_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="129" parent="1" name="utf16_persian_ci">
+    <collation id="123" parent="1" name="utf16_slovenian_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="130" parent="1" name="utf16_polish_ci">
+    <collation id="124" parent="1" name="utf16_polish_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="131" parent="1" name="utf16_roman_ci">
+    <collation id="125" parent="1" name="utf16_estonian_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="132" parent="1" name="utf16_romanian_ci">
+    <collation id="126" parent="1" name="utf16_spanish_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="133" parent="1" name="utf16_sinhala_ci">
+    <collation id="127" parent="1" name="utf16_swedish_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="134" parent="1" name="utf16_slovak_ci">
+    <collation id="128" parent="1" name="utf16_turkish_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="135" parent="1" name="utf16_slovenian_ci">
+    <collation id="129" parent="1" name="utf16_czech_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="136" parent="1" name="utf16_spanish2_ci">
+    <collation id="130" parent="1" name="utf16_danish_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="137" parent="1" name="utf16_spanish_ci">
+    <collation id="131" parent="1" name="utf16_lithuanian_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="138" parent="1" name="utf16_swedish_ci">
+    <collation id="132" parent="1" name="utf16_slovak_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="139" parent="1" name="utf16_turkish_ci">
+    <collation id="133" parent="1" name="utf16_spanish2_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="140" parent="1" name="utf16_unicode_520_ci">
+    <collation id="134" parent="1" name="utf16_roman_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="141" parent="1" name="utf16_unicode_ci">
+    <collation id="135" parent="1" name="utf16_persian_ci">
+      <Charset>utf16</Charset>
+    </collation>
+    <collation id="136" parent="1" name="utf16_esperanto_ci">
+      <Charset>utf16</Charset>
+    </collation>
+    <collation id="137" parent="1" name="utf16_hungarian_ci">
+      <Charset>utf16</Charset>
+    </collation>
+    <collation id="138" parent="1" name="utf16_sinhala_ci">
+      <Charset>utf16</Charset>
+    </collation>
+    <collation id="139" parent="1" name="utf16_german2_ci">
+      <Charset>utf16</Charset>
+    </collation>
+    <collation id="140" parent="1" name="utf16_croatian_ci">
+      <Charset>utf16</Charset>
+    </collation>
+    <collation id="141" parent="1" name="utf16_unicode_520_ci">
       <Charset>utf16</Charset>
     </collation>
     <collation id="142" parent="1" name="utf16_vietnamese_ci">
       <Charset>utf16</Charset>
     </collation>
-    <collation id="143" parent="1" name="utf16le_bin">
-      <Charset>utf16le</Charset>
-    </collation>
-    <collation id="144" parent="1" name="utf16le_general_ci">
+    <collation id="143" parent="1" name="utf16le_general_ci">
       <Charset>utf16le</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="145" parent="1" name="utf32_bin">
-      <Charset>utf32</Charset>
+    <collation id="144" parent="1" name="utf16le_bin">
+      <Charset>utf16le</Charset>
     </collation>
-    <collation id="146" parent="1" name="utf32_croatian_ci">
-      <Charset>utf32</Charset>
-    </collation>
-    <collation id="147" parent="1" name="utf32_czech_ci">
-      <Charset>utf32</Charset>
-    </collation>
-    <collation id="148" parent="1" name="utf32_danish_ci">
-      <Charset>utf32</Charset>
-    </collation>
-    <collation id="149" parent="1" name="utf32_esperanto_ci">
-      <Charset>utf32</Charset>
-    </collation>
-    <collation id="150" parent="1" name="utf32_estonian_ci">
-      <Charset>utf32</Charset>
-    </collation>
-    <collation id="151" parent="1" name="utf32_general_ci">
+    <collation id="145" parent="1" name="utf32_general_ci">
       <Charset>utf32</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="152" parent="1" name="utf32_german2_ci">
+    <collation id="146" parent="1" name="utf32_bin">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="153" parent="1" name="utf32_hungarian_ci">
+    <collation id="147" parent="1" name="utf32_unicode_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="154" parent="1" name="utf32_icelandic_ci">
+    <collation id="148" parent="1" name="utf32_icelandic_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="155" parent="1" name="utf32_latvian_ci">
+    <collation id="149" parent="1" name="utf32_latvian_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="156" parent="1" name="utf32_lithuanian_ci">
+    <collation id="150" parent="1" name="utf32_romanian_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="157" parent="1" name="utf32_persian_ci">
+    <collation id="151" parent="1" name="utf32_slovenian_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="158" parent="1" name="utf32_polish_ci">
+    <collation id="152" parent="1" name="utf32_polish_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="159" parent="1" name="utf32_roman_ci">
+    <collation id="153" parent="1" name="utf32_estonian_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="160" parent="1" name="utf32_romanian_ci">
+    <collation id="154" parent="1" name="utf32_spanish_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="161" parent="1" name="utf32_sinhala_ci">
+    <collation id="155" parent="1" name="utf32_swedish_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="162" parent="1" name="utf32_slovak_ci">
+    <collation id="156" parent="1" name="utf32_turkish_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="163" parent="1" name="utf32_slovenian_ci">
+    <collation id="157" parent="1" name="utf32_czech_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="164" parent="1" name="utf32_spanish2_ci">
+    <collation id="158" parent="1" name="utf32_danish_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="165" parent="1" name="utf32_spanish_ci">
+    <collation id="159" parent="1" name="utf32_lithuanian_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="166" parent="1" name="utf32_swedish_ci">
+    <collation id="160" parent="1" name="utf32_slovak_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="167" parent="1" name="utf32_turkish_ci">
+    <collation id="161" parent="1" name="utf32_spanish2_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="168" parent="1" name="utf32_unicode_520_ci">
+    <collation id="162" parent="1" name="utf32_roman_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="169" parent="1" name="utf32_unicode_ci">
+    <collation id="163" parent="1" name="utf32_persian_ci">
+      <Charset>utf32</Charset>
+    </collation>
+    <collation id="164" parent="1" name="utf32_esperanto_ci">
+      <Charset>utf32</Charset>
+    </collation>
+    <collation id="165" parent="1" name="utf32_hungarian_ci">
+      <Charset>utf32</Charset>
+    </collation>
+    <collation id="166" parent="1" name="utf32_sinhala_ci">
+      <Charset>utf32</Charset>
+    </collation>
+    <collation id="167" parent="1" name="utf32_german2_ci">
+      <Charset>utf32</Charset>
+    </collation>
+    <collation id="168" parent="1" name="utf32_croatian_ci">
+      <Charset>utf32</Charset>
+    </collation>
+    <collation id="169" parent="1" name="utf32_unicode_520_ci">
       <Charset>utf32</Charset>
     </collation>
     <collation id="170" parent="1" name="utf32_vietnamese_ci">
       <Charset>utf32</Charset>
     </collation>
-    <collation id="171" parent="1" name="utf8_bin">
-      <Charset>utf8</Charset>
-    </collation>
-    <collation id="172" parent="1" name="utf8_croatian_ci">
-      <Charset>utf8</Charset>
-    </collation>
-    <collation id="173" parent="1" name="utf8_czech_ci">
-      <Charset>utf8</Charset>
-    </collation>
-    <collation id="174" parent="1" name="utf8_danish_ci">
-      <Charset>utf8</Charset>
-    </collation>
-    <collation id="175" parent="1" name="utf8_esperanto_ci">
-      <Charset>utf8</Charset>
-    </collation>
-    <collation id="176" parent="1" name="utf8_estonian_ci">
-      <Charset>utf8</Charset>
-    </collation>
-    <collation id="177" parent="1" name="utf8_general_ci">
+    <collation id="171" parent="1" name="utf8_general_ci">
       <Charset>utf8</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="178" parent="1" name="utf8_general_mysql500_ci">
+    <collation id="172" parent="1" name="utf8_tolower_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="179" parent="1" name="utf8_german2_ci">
+    <collation id="173" parent="1" name="utf8_bin">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="180" parent="1" name="utf8_hungarian_ci">
+    <collation id="174" parent="1" name="utf8_unicode_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="181" parent="1" name="utf8_icelandic_ci">
+    <collation id="175" parent="1" name="utf8_icelandic_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="182" parent="1" name="utf8_latvian_ci">
+    <collation id="176" parent="1" name="utf8_latvian_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="183" parent="1" name="utf8_lithuanian_ci">
+    <collation id="177" parent="1" name="utf8_romanian_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="184" parent="1" name="utf8_persian_ci">
+    <collation id="178" parent="1" name="utf8_slovenian_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="185" parent="1" name="utf8_polish_ci">
+    <collation id="179" parent="1" name="utf8_polish_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="186" parent="1" name="utf8_roman_ci">
+    <collation id="180" parent="1" name="utf8_estonian_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="187" parent="1" name="utf8_romanian_ci">
+    <collation id="181" parent="1" name="utf8_spanish_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="188" parent="1" name="utf8_sinhala_ci">
+    <collation id="182" parent="1" name="utf8_swedish_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="189" parent="1" name="utf8_slovak_ci">
+    <collation id="183" parent="1" name="utf8_turkish_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="190" parent="1" name="utf8_slovenian_ci">
+    <collation id="184" parent="1" name="utf8_czech_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="191" parent="1" name="utf8_spanish2_ci">
+    <collation id="185" parent="1" name="utf8_danish_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="192" parent="1" name="utf8_spanish_ci">
+    <collation id="186" parent="1" name="utf8_lithuanian_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="193" parent="1" name="utf8_swedish_ci">
+    <collation id="187" parent="1" name="utf8_slovak_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="194" parent="1" name="utf8_tolower_ci">
+    <collation id="188" parent="1" name="utf8_spanish2_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="195" parent="1" name="utf8_turkish_ci">
+    <collation id="189" parent="1" name="utf8_roman_ci">
+      <Charset>utf8</Charset>
+    </collation>
+    <collation id="190" parent="1" name="utf8_persian_ci">
+      <Charset>utf8</Charset>
+    </collation>
+    <collation id="191" parent="1" name="utf8_esperanto_ci">
+      <Charset>utf8</Charset>
+    </collation>
+    <collation id="192" parent="1" name="utf8_hungarian_ci">
+      <Charset>utf8</Charset>
+    </collation>
+    <collation id="193" parent="1" name="utf8_sinhala_ci">
+      <Charset>utf8</Charset>
+    </collation>
+    <collation id="194" parent="1" name="utf8_german2_ci">
+      <Charset>utf8</Charset>
+    </collation>
+    <collation id="195" parent="1" name="utf8_croatian_ci">
       <Charset>utf8</Charset>
     </collation>
     <collation id="196" parent="1" name="utf8_unicode_520_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="197" parent="1" name="utf8_unicode_ci">
+    <collation id="197" parent="1" name="utf8_vietnamese_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="198" parent="1" name="utf8_vietnamese_ci">
+    <collation id="198" parent="1" name="utf8_general_mysql500_ci">
       <Charset>utf8</Charset>
     </collation>
-    <collation id="199" parent="1" name="utf8mb4_0900_ai_ci">
+    <collation id="199" parent="1" name="utf8mb4_general_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="200" parent="1" name="utf8mb4_bin">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="201" parent="1" name="utf8mb4_unicode_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="202" parent="1" name="utf8mb4_icelandic_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="203" parent="1" name="utf8mb4_latvian_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="204" parent="1" name="utf8mb4_romanian_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="205" parent="1" name="utf8mb4_slovenian_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="206" parent="1" name="utf8mb4_polish_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="207" parent="1" name="utf8mb4_estonian_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="208" parent="1" name="utf8mb4_spanish_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="209" parent="1" name="utf8mb4_swedish_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="210" parent="1" name="utf8mb4_turkish_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="211" parent="1" name="utf8mb4_czech_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="212" parent="1" name="utf8mb4_danish_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="213" parent="1" name="utf8mb4_lithuanian_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="214" parent="1" name="utf8mb4_slovak_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="215" parent="1" name="utf8mb4_spanish2_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="216" parent="1" name="utf8mb4_roman_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="217" parent="1" name="utf8mb4_persian_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="218" parent="1" name="utf8mb4_esperanto_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="219" parent="1" name="utf8mb4_hungarian_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="220" parent="1" name="utf8mb4_sinhala_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="221" parent="1" name="utf8mb4_german2_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="222" parent="1" name="utf8mb4_croatian_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="223" parent="1" name="utf8mb4_unicode_520_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="224" parent="1" name="utf8mb4_vietnamese_ci">
+      <Charset>utf8mb4</Charset>
+    </collation>
+    <collation id="225" parent="1" name="utf8mb4_0900_ai_ci">
       <Charset>utf8mb4</Charset>
       <DefaultForCharset>1</DefaultForCharset>
     </collation>
-    <collation id="200" parent="1" name="utf8mb4_0900_as_ci">
+    <collation id="226" parent="1" name="utf8mb4_de_pb_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="201" parent="1" name="utf8mb4_0900_as_cs">
+    <collation id="227" parent="1" name="utf8mb4_is_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="202" parent="1" name="utf8mb4_0900_bin">
+    <collation id="228" parent="1" name="utf8mb4_lv_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="203" parent="1" name="utf8mb4_bin">
+    <collation id="229" parent="1" name="utf8mb4_ro_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="204" parent="1" name="utf8mb4_croatian_ci">
+    <collation id="230" parent="1" name="utf8mb4_sl_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="205" parent="1" name="utf8mb4_cs_0900_ai_ci">
+    <collation id="231" parent="1" name="utf8mb4_pl_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="206" parent="1" name="utf8mb4_cs_0900_as_cs">
+    <collation id="232" parent="1" name="utf8mb4_et_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="207" parent="1" name="utf8mb4_czech_ci">
+    <collation id="233" parent="1" name="utf8mb4_es_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="208" parent="1" name="utf8mb4_da_0900_ai_ci">
+    <collation id="234" parent="1" name="utf8mb4_sv_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="209" parent="1" name="utf8mb4_da_0900_as_cs">
+    <collation id="235" parent="1" name="utf8mb4_tr_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="210" parent="1" name="utf8mb4_danish_ci">
+    <collation id="236" parent="1" name="utf8mb4_cs_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="211" parent="1" name="utf8mb4_de_pb_0900_ai_ci">
+    <collation id="237" parent="1" name="utf8mb4_da_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="212" parent="1" name="utf8mb4_de_pb_0900_as_cs">
+    <collation id="238" parent="1" name="utf8mb4_lt_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="213" parent="1" name="utf8mb4_eo_0900_ai_ci">
+    <collation id="239" parent="1" name="utf8mb4_sk_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="214" parent="1" name="utf8mb4_eo_0900_as_cs">
+    <collation id="240" parent="1" name="utf8mb4_es_trad_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="215" parent="1" name="utf8mb4_es_0900_ai_ci">
+    <collation id="241" parent="1" name="utf8mb4_la_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="216" parent="1" name="utf8mb4_es_0900_as_cs">
+    <collation id="242" parent="1" name="utf8mb4_eo_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="217" parent="1" name="utf8mb4_es_trad_0900_ai_ci">
+    <collation id="243" parent="1" name="utf8mb4_hu_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="218" parent="1" name="utf8mb4_es_trad_0900_as_cs">
+    <collation id="244" parent="1" name="utf8mb4_hr_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="219" parent="1" name="utf8mb4_esperanto_ci">
+    <collation id="245" parent="1" name="utf8mb4_vi_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="220" parent="1" name="utf8mb4_estonian_ci">
+    <collation id="246" parent="1" name="utf8mb4_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="221" parent="1" name="utf8mb4_et_0900_ai_ci">
+    <collation id="247" parent="1" name="utf8mb4_de_pb_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="222" parent="1" name="utf8mb4_et_0900_as_cs">
+    <collation id="248" parent="1" name="utf8mb4_is_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="223" parent="1" name="utf8mb4_general_ci">
+    <collation id="249" parent="1" name="utf8mb4_lv_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="224" parent="1" name="utf8mb4_german2_ci">
+    <collation id="250" parent="1" name="utf8mb4_ro_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="225" parent="1" name="utf8mb4_hr_0900_ai_ci">
+    <collation id="251" parent="1" name="utf8mb4_sl_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="226" parent="1" name="utf8mb4_hr_0900_as_cs">
+    <collation id="252" parent="1" name="utf8mb4_pl_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="227" parent="1" name="utf8mb4_hu_0900_ai_ci">
+    <collation id="253" parent="1" name="utf8mb4_et_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="228" parent="1" name="utf8mb4_hu_0900_as_cs">
+    <collation id="254" parent="1" name="utf8mb4_es_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="229" parent="1" name="utf8mb4_hungarian_ci">
+    <collation id="255" parent="1" name="utf8mb4_sv_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="230" parent="1" name="utf8mb4_icelandic_ci">
+    <collation id="256" parent="1" name="utf8mb4_tr_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="231" parent="1" name="utf8mb4_is_0900_ai_ci">
+    <collation id="257" parent="1" name="utf8mb4_cs_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="232" parent="1" name="utf8mb4_is_0900_as_cs">
+    <collation id="258" parent="1" name="utf8mb4_da_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="233" parent="1" name="utf8mb4_ja_0900_as_cs">
+    <collation id="259" parent="1" name="utf8mb4_lt_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="234" parent="1" name="utf8mb4_ja_0900_as_cs_ks">
+    <collation id="260" parent="1" name="utf8mb4_sk_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="235" parent="1" name="utf8mb4_la_0900_ai_ci">
+    <collation id="261" parent="1" name="utf8mb4_es_trad_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="236" parent="1" name="utf8mb4_la_0900_as_cs">
+    <collation id="262" parent="1" name="utf8mb4_la_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="237" parent="1" name="utf8mb4_latvian_ci">
+    <collation id="263" parent="1" name="utf8mb4_eo_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="238" parent="1" name="utf8mb4_lithuanian_ci">
+    <collation id="264" parent="1" name="utf8mb4_hu_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="239" parent="1" name="utf8mb4_lt_0900_ai_ci">
+    <collation id="265" parent="1" name="utf8mb4_hr_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="240" parent="1" name="utf8mb4_lt_0900_as_cs">
+    <collation id="266" parent="1" name="utf8mb4_vi_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="241" parent="1" name="utf8mb4_lv_0900_ai_ci">
+    <collation id="267" parent="1" name="utf8mb4_ja_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="242" parent="1" name="utf8mb4_lv_0900_as_cs">
+    <collation id="268" parent="1" name="utf8mb4_ja_0900_as_cs_ks">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="243" parent="1" name="utf8mb4_persian_ci">
+    <collation id="269" parent="1" name="utf8mb4_0900_as_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="244" parent="1" name="utf8mb4_pl_0900_ai_ci">
+    <collation id="270" parent="1" name="utf8mb4_ru_0900_ai_ci">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="245" parent="1" name="utf8mb4_pl_0900_as_cs">
+    <collation id="271" parent="1" name="utf8mb4_ru_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="246" parent="1" name="utf8mb4_polish_ci">
+    <collation id="272" parent="1" name="utf8mb4_zh_0900_as_cs">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="247" parent="1" name="utf8mb4_ro_0900_ai_ci">
+    <collation id="273" parent="1" name="utf8mb4_0900_bin">
       <Charset>utf8mb4</Charset>
     </collation>
-    <collation id="248" parent="1" name="utf8mb4_ro_0900_as_cs">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="249" parent="1" name="utf8mb4_roman_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="250" parent="1" name="utf8mb4_romanian_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="251" parent="1" name="utf8mb4_ru_0900_ai_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="252" parent="1" name="utf8mb4_ru_0900_as_cs">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="253" parent="1" name="utf8mb4_sinhala_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="254" parent="1" name="utf8mb4_sk_0900_ai_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="255" parent="1" name="utf8mb4_sk_0900_as_cs">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="256" parent="1" name="utf8mb4_sl_0900_ai_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="257" parent="1" name="utf8mb4_sl_0900_as_cs">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="258" parent="1" name="utf8mb4_slovak_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="259" parent="1" name="utf8mb4_slovenian_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="260" parent="1" name="utf8mb4_spanish2_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="261" parent="1" name="utf8mb4_spanish_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="262" parent="1" name="utf8mb4_sv_0900_ai_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="263" parent="1" name="utf8mb4_sv_0900_as_cs">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="264" parent="1" name="utf8mb4_swedish_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="265" parent="1" name="utf8mb4_tr_0900_ai_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="266" parent="1" name="utf8mb4_tr_0900_as_cs">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="267" parent="1" name="utf8mb4_turkish_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="268" parent="1" name="utf8mb4_unicode_520_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="269" parent="1" name="utf8mb4_unicode_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="270" parent="1" name="utf8mb4_vi_0900_ai_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="271" parent="1" name="utf8mb4_vi_0900_as_cs">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="272" parent="1" name="utf8mb4_vietnamese_ci">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <collation id="273" parent="1" name="utf8mb4_zh_0900_as_cs">
-      <Charset>utf8mb4</Charset>
-    </collation>
-    <schema id="274" parent="1" name="db_spzx">
+    <schema id="274" parent="1" name="mysql">
+      <CollationName>utf8mb4_0900_ai_ci</CollationName>
+    </schema>
+    <schema id="275" parent="1" name="information_schema">
+      <CollationName>utf8_general_ci</CollationName>
+    </schema>
+    <schema id="276" parent="1" name="performance_schema">
+      <CollationName>utf8mb4_0900_ai_ci</CollationName>
+    </schema>
+    <schema id="277" parent="1" name="sys">
+      <CollationName>utf8mb4_0900_ai_ci</CollationName>
+    </schema>
+    <schema id="278" parent="1" name="easybbs">
+      <CollationName>utf8mb4_0900_ai_ci</CollationName>
+    </schema>
+    <schema id="279" parent="1" name="db_spzx">
       <Current>1</Current>
       <IntrospectionTimestamp>2023-12-16.23:57:15</IntrospectionTimestamp>
       <LocalIntrospectionTimestamp>2023-12-16.07:57:14</LocalIntrospectionTimestamp>
       <CollationName>utf8_general_ci</CollationName>
     </schema>
-    <schema id="275" parent="1" name="easybbs">
-      <CollationName>utf8mb4_0900_ai_ci</CollationName>
-    </schema>
-    <schema id="276" parent="1" name="information_schema">
-      <CollationName>utf8_general_ci</CollationName>
-    </schema>
-    <schema id="277" parent="1" name="mysql">
-      <CollationName>utf8mb4_0900_ai_ci</CollationName>
-    </schema>
-    <schema id="278" parent="1" name="performance_schema">
-      <CollationName>utf8mb4_0900_ai_ci</CollationName>
-    </schema>
-    <schema id="279" parent="1" name="sys">
-      <CollationName>utf8mb4_0900_ai_ci</CollationName>
-    </schema>
     <user id="280" parent="1" name="gitea">
       <Plugin>caching_sha2_password</Plugin>
     </user>
-    <user id="281" parent="1" name="mysql.infoschema">
+    <user id="281" parent="1" name="root">
+      <Plugin>caching_sha2_password</Plugin>
+    </user>
+    <user id="282" parent="1" name="mysql.infoschema">
       <CanLogin>0</CanLogin>
       <Host>localhost</Host>
       <Plugin>caching_sha2_password</Plugin>
     </user>
-    <user id="282" parent="1" name="mysql.session">
+    <user id="283" parent="1" name="mysql.session">
       <CanLogin>0</CanLogin>
       <Host>localhost</Host>
       <Plugin>caching_sha2_password</Plugin>
     </user>
-    <user id="283" parent="1" name="mysql.sys">
+    <user id="284" parent="1" name="mysql.sys">
       <CanLogin>0</CanLogin>
       <Host>localhost</Host>
       <Plugin>caching_sha2_password</Plugin>
     </user>
-    <user id="284" parent="1" name="root">
-      <Plugin>caching_sha2_password</Plugin>
-    </user>
-    <table id="285" parent="274" name="brand">
+    <table id="285" parent="279" name="brand">
       <Comment>分类品牌</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="286" parent="274" name="category">
+    <table id="286" parent="279" name="category">
       <Comment>商品分类</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="287" parent="274" name="category_brand">
+    <table id="287" parent="279" name="category_brand">
       <Comment>分类品牌</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="288" parent="274" name="coupon_info">
+    <table id="288" parent="279" name="coupon_info">
       <Comment>优惠券信息</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="289" parent="274" name="coupon_range">
+    <table id="289" parent="279" name="coupon_range">
       <Comment>优惠券范围表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="290" parent="274" name="coupon_user">
+    <table id="290" parent="279" name="coupon_user">
       <Comment>优惠券领用表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="291" parent="274" name="order_info">
+    <table id="291" parent="279" name="order_info">
       <Comment>订单</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="292" parent="274" name="order_item">
+    <table id="292" parent="279" name="order_item">
       <Comment>订单项信息</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="293" parent="274" name="order_log">
+    <table id="293" parent="279" name="order_log">
       <Comment>订单操作日志记录</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="294" parent="274" name="order_statistics">
+    <table id="294" parent="279" name="order_statistics">
       <Comment>订单统计</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="295" parent="274" name="payment_info">
+    <table id="295" parent="279" name="payment_info">
       <Comment>付款信息表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="296" parent="274" name="product">
+    <table id="296" parent="279" name="product">
       <Comment>商品</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="297" parent="274" name="product_attr">
+    <table id="297" parent="279" name="product_attr">
       <Comment>商品属性表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="298" parent="274" name="product_details">
+    <table id="298" parent="279" name="product_details">
       <Comment>商品sku属性表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="299" parent="274" name="product_sku">
+    <table id="299" parent="279" name="product_sku">
       <Comment>商品sku</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="300" parent="274" name="product_spec">
+    <table id="300" parent="279" name="product_spec">
       <Comment>商品规格</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="301" parent="274" name="product_unit">
+    <table id="301" parent="279" name="product_unit">
       <Comment>商品单位</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="302" parent="274" name="region">
+    <table id="302" parent="279" name="region">
       <Comment>地区信息表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="303" parent="274" name="sys_login_log">
+    <table id="303" parent="279" name="sys_login_log">
       <Comment>系统用户登录记录</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="304" parent="274" name="sys_menu">
+    <table id="304" parent="279" name="sys_menu">
       <Comment>菜单表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="305" parent="274" name="sys_oper_log">
+    <table id="305" parent="279" name="sys_oper_log">
       <Comment>操作日志记录</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="306" parent="274" name="sys_role">
+    <table id="306" parent="279" name="sys_role">
       <Comment>角色</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="307" parent="274" name="sys_role_menu">
+    <table id="307" parent="279" name="sys_role_menu">
       <Comment>角色菜单</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="308" parent="274" name="sys_user">
+    <table id="308" parent="279" name="sys_user">
       <Comment>用户表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="309" parent="274" name="sys_user_role">
+    <table id="309" parent="279" name="sys_user_role">
       <Comment>用户角色</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8_general_ci</CollationName>
     </table>
-    <table id="310" parent="274" name="user_address">
+    <table id="310" parent="279" name="user_address">
       <Comment>用户地址表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="311" parent="274" name="user_browse_history">
+    <table id="311" parent="279" name="user_browse_history">
       <Comment>用户浏览记录表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="312" parent="274" name="user_collect">
+    <table id="312" parent="279" name="user_collect">
       <Comment>用户收藏表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
     </table>
-    <table id="313" parent="274" name="user_info">
+    <table id="313" parent="279" name="user_info">
       <Comment>会员表</Comment>
       <Engine>InnoDB</Engine>
       <CollationName>utf8mb4_0900_ai_ci</CollationName>
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index a147371..5afb336 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -4,6 +4,10 @@
     <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,com.github.pagehelper.page.PageMethod,startPage" />
     </inspection_tool>
+    <inspection_tool class="IgnoreResultOfCall" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="m_reportAllNonLibraryCalls" value="false" />
+      <option name="callCheckString" value="java.io.File,.*,java.io.InputStream,read|skip|available|markSupported,java.io.Reader,read|skip|ready|markSupported,java.lang.AbstractStringBuilder,capacity|codePointAt|codePointBefore|codePointCount|indexOf|lastIndexOf|offsetByCodePoints|substring|subSequence,java.lang.Boolean,.*,java.lang.Byte,.*,java.lang.Character,.*,java.lang.Double,.*,java.lang.Float,.*,java.lang.Integer,.*,java.lang.Long,.*,java.lang.Math,.*,java.lang.Object,equals|hashCode|toString,java.lang.Short,.*,java.lang.StrictMath,.*,java.lang.String,.*,java.lang.Thread,interrupted,java.math.BigDecimal,.*,java.math.BigInteger,.*,java.net.InetAddress,.*,java.net.URI,.*,java.nio.channels.AsynchronousChannelGroup,.*,java.nio.channels.Channel,isOpen,java.nio.channels.FileChannel,open|map|lock|tryLock|write,java.nio.channels.ScatteringByteChannel,read,java.nio.channels.SocketChannel,open|socket|isConnected|isConnectionPending,java.util.Arrays,.*,java.util.Collections,(?!addAll).*,java.util.List,of,java.util.Map,of|ofEntries|entry,java.util.Set,of,java.util.UUID,.*,java.util.concurrent.BlockingQueue,offer|remove,java.util.concurrent.CountDownLatch,await|getCount,java.util.concurrent.ExecutorService,awaitTermination|isShutdown|isTerminated,java.util.concurrent.ForkJoinPool,awaitQuiescence,java.util.concurrent.Semaphore,tryAcquire|availablePermits|isFair|hasQueuedThreads|getQueueLength|getQueuedThreads,java.util.concurrent.locks.Condition,await|awaitNanos|awaitUntil,java.util.concurrent.locks.Lock,tryLock|newCondition,java.util.regex.Matcher,pattern|toMatchResult|start|end|group|groupCount|matches|find|lookingAt|quoteReplacement|replaceAll|replaceFirst|regionStart|regionEnd|hasTransparentBounds|hasAnchoringBounds|hitEnd|requireEnd,java.util.regex.Pattern,.*,java.util.stream.BaseStream,.*,java.util.stream.DoubleStream,.*,java.util.stream.IntStream,.*,java.util.stream.LongStream,.*,java.util.stream.Stream,.*" />
+    </inspection_tool>
     <inspection_tool class="RawUseOfParameterizedType" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f65d4c6..a7c58c5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="94fab532-0084-41f1-bb0f-d2d2811915a7" name="Changes" comment="商品管理完成">
-      <change afterPath="$PROJECT_DIR$/spzx-manager/src/main/java/cn/bunny/mapper/OrderInfoMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/spzx-manager/src/main/java/cn/bunny/task/OrderStatisticsTask.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/spzx-manager/src/main/resources/mapper/order/OrderInfoMapper.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml" afterDir="false" />
+    <list default="true" id="94fab532-0084-41f1-bb0f-d2d2811915a7" name="Changes" comment="订单数据统计-每天两点统计-定时任务">
+      <change afterPath="$PROJECT_DIR$/spzx-manager/src/main/java/cn/bunny/controller/OrderInfoController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/spzx-manager/src/main/java/cn/bunny/service/OrderInfoService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/spzx-manager/src/main/java/cn/bunny/service/impl/OrderInfoServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java" beforeDir="false" afterPath="$PROJECT_DIR$/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -20,9 +22,9 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Mybatis" />
         <option value="Interface" />
         <option value="Class" />
-        <option value="Mybatis" />
       </list>
     </option>
   </component>
@@ -111,7 +113,7 @@
       <option name="presentableId" value="Default" />
       <updated>1702710124940</updated>
       <workItem from="1702710126987" duration="661000" />
-      <workItem from="1702713203759" duration="15273000" />
+      <workItem from="1702713203759" duration="17069000" />
     </task>
     <task id="LOCAL-00001" summary="商品管理查询分页">
       <option name="closed" value="true" />
@@ -137,7 +139,15 @@
       <option name="project" value="LOCAL" />
       <updated>1702731251043</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="订单数据统计-每天两点统计-定时任务">
+      <option name="closed" value="true" />
+      <created>1702735339646</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1702735339646</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -147,7 +157,8 @@
     <MESSAGE value="商品管理查询分页" />
     <MESSAGE value="商品管理添加删除" />
     <MESSAGE value="商品管理完成" />
-    <option name="LAST_COMMIT_MESSAGE" value="商品管理完成" />
+    <MESSAGE value="订单数据统计-每天两点统计-定时任务" />
+    <option name="LAST_COMMIT_MESSAGE" value="订单数据统计-每天两点统计-定时任务" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/spzx-manager/src/main/java/cn/bunny/controller/OrderInfoController.java b/spzx-manager/src/main/java/cn/bunny/controller/OrderInfoController.java
new file mode 100644
index 0000000..d6fee27
--- /dev/null
+++ b/spzx-manager/src/main/java/cn/bunny/controller/OrderInfoController.java
@@ -0,0 +1,29 @@
+package cn.bunny.controller;
+
+import cn.bunny.common.spzx.model.dto.order.OrderStatisticsDto;
+import cn.bunny.common.spzx.model.vo.common.Result;
+import cn.bunny.common.spzx.model.vo.common.ResultCodeEnum;
+import cn.bunny.common.spzx.model.vo.order.OrderStatisticsVo;
+import cn.bunny.service.OrderInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "统计查询")
+@RestController
+@RequestMapping("/admin/order/orderInfo")
+public class OrderInfoController {
+    @Autowired
+    private OrderInfoService orderInfoService;
+
+    @Operation(summary = "统计查询", description = "统计查询")
+    @GetMapping("getOrderStatisticsData")
+    public Result getOrderStatisticsData(OrderStatisticsDto orderStatisticsDto) {
+        OrderStatisticsVo orderStatisticsVo = orderInfoService.getOrderStatisticsData(orderStatisticsDto);
+
+        return Result.build(orderStatisticsVo, ResultCodeEnum.SUCCESS);
+    }
+}
diff --git a/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java b/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java
index 2bcbed4..e2b48b9 100644
--- a/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java
+++ b/spzx-manager/src/main/java/cn/bunny/mapper/OrderStatisticsMapper.java
@@ -1,10 +1,16 @@
 package cn.bunny.mapper;
 
+import cn.bunny.common.spzx.model.dto.order.OrderStatisticsDto;
 import cn.bunny.common.spzx.model.entity.order.OrderStatistics;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface OrderStatisticsMapper {
     // 将统计结果保存到数据库
     void insert(OrderStatistics orderStatistics);
+
+    // 统计查询
+    List<OrderStatistics> selectList(OrderStatisticsDto orderStatisticsDto);
 }
diff --git a/spzx-manager/src/main/java/cn/bunny/service/OrderInfoService.java b/spzx-manager/src/main/java/cn/bunny/service/OrderInfoService.java
new file mode 100644
index 0000000..c6a4ef0
--- /dev/null
+++ b/spzx-manager/src/main/java/cn/bunny/service/OrderInfoService.java
@@ -0,0 +1,9 @@
+package cn.bunny.service;
+
+import cn.bunny.common.spzx.model.dto.order.OrderStatisticsDto;
+import cn.bunny.common.spzx.model.vo.order.OrderStatisticsVo;
+
+public interface OrderInfoService {
+    // 统计查询
+    OrderStatisticsVo getOrderStatisticsData(OrderStatisticsDto orderStatisticsDto);
+}
diff --git a/spzx-manager/src/main/java/cn/bunny/service/impl/OrderInfoServiceImpl.java b/spzx-manager/src/main/java/cn/bunny/service/impl/OrderInfoServiceImpl.java
new file mode 100644
index 0000000..bf017f6
--- /dev/null
+++ b/spzx-manager/src/main/java/cn/bunny/service/impl/OrderInfoServiceImpl.java
@@ -0,0 +1,37 @@
+package cn.bunny.service.impl;
+
+import cn.bunny.common.spzx.model.dto.order.OrderStatisticsDto;
+import cn.bunny.common.spzx.model.entity.order.OrderStatistics;
+import cn.bunny.common.spzx.model.vo.order.OrderStatisticsVo;
+import cn.bunny.mapper.OrderStatisticsMapper;
+import cn.bunny.service.OrderInfoService;
+import cn.hutool.core.date.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+@Service
+public class OrderInfoServiceImpl implements OrderInfoService {
+    @Autowired
+    private OrderStatisticsMapper orderStatisticsMapper;
+
+    // 统计查询
+    @Override
+    public OrderStatisticsVo getOrderStatisticsData(OrderStatisticsDto orderStatisticsDto) {
+        List<OrderStatistics> orderStatisticsList = orderStatisticsMapper.selectList(orderStatisticsDto);
+
+        List<String> dateList = orderStatisticsList.stream().map(OrderStatistics -> DateUtil.format(OrderStatistics.getOrderDate(), "yyyy-MM-dd")).toList();
+        List<BigDecimal> decimalList = orderStatisticsList.stream().map(OrderStatistics::getTotalAmount).toList();
+
+        OrderStatisticsVo orderStatisticsVo = new OrderStatisticsVo();
+        orderStatisticsVo.setDateList(dateList);
+        orderStatisticsVo.setAmountList(decimalList);
+
+        return orderStatisticsVo;
+    }
+}
diff --git a/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml b/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml
index 1bc11cc..ee06f09 100644
--- a/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml
+++ b/spzx-manager/src/main/resources/mapper/order/OrderStatisticsMapper.xml
@@ -18,4 +18,19 @@
                 #{totalAmount},
                 #{totalNum})
     </insert>
+
+    <!-- 统计查询 -->
+    <select id="selectList" resultType="cn.bunny.common.spzx.model.entity.order.OrderStatistics">
+        select <include refid="columns" />
+        from order_statistics
+        <where>
+            <if test="createTimeBegin != null and createTimeBegin != ''">
+                and order_date >= #{createTimeBegin}
+            </if>
+            <if test="createTimeEnd != null and createTimeEnd != ''">
+                and order_date &lt;= #{createTimeEnd}
+            </if>
+        </where>
+        order by order_date
+    </select>
 </mapper>
diff --git a/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java b/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java
index ed7efeb..9987ef4 100644
--- a/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java
+++ b/spzx-model/src/main/java/cn/bunny/common/spzx/model/dto/order/OrderStatisticsDto.java
@@ -5,7 +5,7 @@ import lombok.Data;
 
 @Data
 @Schema(description = "搜索条件实体类")
-public class OrderStatisticsDto {
+public class  OrderStatisticsDto {
     @Schema(description = "开始时间")
     private String createTimeBegin;
     @Schema(description = "结束时间")