Merge remote-tracking branch 'origin/luxinyun_v3_dev' into luxinyun_v3_dev

product-service/src/main/java/com/ssy/lingxi/product/serviceImpl/CommodityServiceImpl.java

@@ -2098,12 +2098,12 @@ public class CommodityServiceImpl implements ICommodityService {
             }
 
             //排序
-            Order publishTimeOrder = criteriaBuilder.desc(root.get("publishTime"));
-            Order checkTimeOrder = criteriaBuilder.desc(root.get("checkTime"));
-            Order applyTimeOrder = criteriaBuilder.desc(root.get("applyTime"));
+//            Order publishTimeOrder = criteriaBuilder.desc(root.get("publishTime"));
+//            Order checkTimeOrder = criteriaBuilder.desc(root.get("checkTime"));
+//            Order applyTimeOrder = criteriaBuilder.desc(root.get("applyTime"));
             Order idOrder = criteriaBuilder.desc(root.get("id"));
 
-            return  query.distinct(true).orderBy(publishTimeOrder, checkTimeOrder, applyTimeOrder, idOrder).where(finalConditions).getRestriction();
+            return  query.distinct(true).orderBy(idOrder).where(finalConditions).getRestriction();
         };
     }