From eefc5643ec31277ce1efc82891d9f16c1eb5640c Mon Sep 17 00:00:00 2001
From: qian <2269112473@qq.com>
Date: Mon, 16 Dec 2024 15:07:37 +0800
Subject: [PATCH] 2

---
 .idea/workspace.xml                           | 14 +----------
 .../cn/edu/hust/session/CategorySortKey.java  | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 680a1a1..b486bca 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a7505764-040b-48e2-b2fc-8c5b579e595f" name="Default" comment="1">
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hust/conf/ConfigurationManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hust/conf/ConfigurationManager.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/cn/edu/hust/session/CategorySortKey.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/edu/hust/session/CategorySortKey.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -304,17 +302,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
-      <option name="arquillianRunConfiguration">
-        <value>
-          <option name="containerStateName" value="" />
-        </value>
-      </option>
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="ParamUtilsTest.test2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="UserActionAnalyzePlatform" />
       <extension name="coverage">
@@ -451,6 +438,7 @@
       <workItem from="1734329526803" duration="27000" />
       <workItem from="1734329908221" duration="92000" />
       <workItem from="1734330015246" duration="240000" />
+      <workItem from="1734332367675" duration="415000" />
     </task>
     <task id="LOCAL-00001" summary="1.环境搭建完成&#10;2.相关的工具类编写完成&#10;3.配置文件管理类编写完成">
       <created>1529592741848</created>
diff --git a/src/main/java/cn/edu/hust/session/CategorySortKey.java b/src/main/java/cn/edu/hust/session/CategorySortKey.java
index 7952ec0..bc9461a 100644
--- a/src/main/java/cn/edu/hust/session/CategorySortKey.java
+++ b/src/main/java/cn/edu/hust/session/CategorySortKey.java
@@ -1,6 +1,5 @@
 package cn.edu.hust.session;
 
-
 import scala.math.Ordered;
 
 public class CategorySortKey implements Ordered<CategorySortKey>, java.io.Serializable {
@@ -26,21 +25,26 @@ public class CategorySortKey implements Ordered<CategorySortKey>, java.io.Serial
             return (int) (payCount-categorySortKey.getPayCount());
         return 0;// 如果点击数、订单数和支付数都相等，则返回 0，表示相等
     }
-//11
     @Override
     public boolean $less(CategorySortKey categorySortKey) {
-        if(clickCount<categorySortKey.getClickCount())
-        {
-            return true;
-        }else if(clickCount==categorySortKey.getClickCount()&&orderCount<categorySortKey.getOrderCount())
-        {
-            return true;
+        // 首先，比较点击数。如果当前对象的点击数小于传入对象的点击数，则当前对象"小于"传入对象
+        if (clickCount < categorySortKey.getClickCount()) {
+            return true;  // 返回true，表示当前对象小于传入对象
         }
-        else if(clickCount==categorySortKey.getClickCount()&&orderCount==categorySortKey.getOrderCount()&&payCount<categorySortKey.getPayCount())
-            return true;
+        // 如果点击数相等，则比较订单数。如果当前对象的订单数小于传入对象的订单数，则当前对象"小于"传入对象
+        else if (clickCount == categorySortKey.getClickCount() && orderCount < categorySortKey.getOrderCount()) {
+            return true;  // 返回true，表示当前对象小于传入对象
+        }
+        // 如果点击数和订单数都相等，则比较支付数。如果当前对象的支付数小于传入对象的支付数，则当前对象"小于"传入对象
+        else if (clickCount == categorySortKey.getClickCount() && orderCount == categorySortKey.getOrderCount() && payCount < categorySortKey.getPayCount()) {
+            return true;  // 返回true，表示当前对象小于传入对象
+        }
+
+        // 如果上述条件都不满足，则说明当前对象不小于传入对象，返回false
         return false;
     }
 
+
     @Override
     public boolean $greater(CategorySortKey categorySortKey) {
         if(clickCount>categorySortKey.getClickCount())