diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index b26911b..af673e7 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,7 @@
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec3e4b2..680a1a1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,11 @@
-
+
+
+
@@ -31,6 +33,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
@@ -287,6 +304,17 @@
+
+
+
+
+
+
+
@@ -418,6 +446,11 @@
+
+
+
+
+
1529592741848
@@ -433,7 +466,21 @@
1529593229553
-
+
+ 1734279501402
+
+
+
+ 1734279501402
+
+
+ 1734329453407
+
+
+
+ 1734329453407
+
+
@@ -543,7 +590,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -552,7 +626,9 @@
-
+
+
+
diff --git a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
index e9a7acf..bc827ba 100644
--- a/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
+++ b/src/main/java/cn/edu/hust/conf/ConfigurationManager.java
@@ -40,7 +40,6 @@ public class ConfigurationManager {
* 获取整数变量
* @param key
* @return
- * 11111
*/
public static Integer getInteger(String key)
{
diff --git a/src/main/java/cn/edu/hust/session/CategorySortKey.java b/src/main/java/cn/edu/hust/session/CategorySortKey.java
index 2449cff..7952ec0 100644
--- a/src/main/java/cn/edu/hust/session/CategorySortKey.java
+++ b/src/main/java/cn/edu/hust/session/CategorySortKey.java
@@ -23,8 +23,8 @@ public class CategorySortKey implements Ordered, java.io.Serial
}
// 如果点击数和订单数都相等,再比较支付数
else if(clickCount-categorySortKey.getClickCount()==0&&orderCount-categorySortKey.getOrderCount()==0&&payCount-categorySortKey.getPayCount()!=0)
- return (int) (payCount-categorySortKey.getPayCount());// 如果点击数、订单数和支付数都相等,则返回 0,表示相等
- return 0;
+ return (int) (payCount-categorySortKey.getPayCount());
+ return 0;// 如果点击数、订单数和支付数都相等,则返回 0,表示相等
}
//11
@Override