commit commit

src/main/java/com/example/afrishop_v3/controllers/ItemController.java

@@ -56,7 +56,7 @@ public class ItemController {
                                       @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize,
                                       @RequestParam(value = "order", required = false) String order) {
 
-        return new Result<>(repository.findAllByItemCategorytwoOrderByCreateTimeDesc(typeTwoId, PageRequest.of(pageNum,pageSize,sort(order))));
+        return new Result<>(repository.findAllByItemCategorytwoOrderByCreateTimeDesc(typeTwoId, PageRequest.of(pageNum,pageSize,getSort(order))));
     }
 
     @GetMapping("/queryCategoryTwoByCid/{categoryId}")
@@ -123,9 +123,10 @@ public class ItemController {
     }
 
     @GetMapping("/queryItemByDescription/{descriptionId}")
-    public Result queryItemByDescription(@PathVariable("descriptionId") String descriptionId) {
+    public Result queryItemByDescription(@PathVariable("descriptionId") String descriptionId,
+                                         @RequestParam(value = "order", required = false) String order) {
 
-        return new Result<>(repository.findAllByItemDescritionId(descriptionId));
+        return new Result<>(repository.findAllByItemDescritionId(descriptionId,getSort(order)));
     }
 
     @GetMapping("/queryItemsByTypeThree")
@@ -133,11 +134,18 @@ public class ItemController {
                                          @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                                         @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize,
                                         @RequestParam(value = "order", required = false) String order) {
-        return new Result<>(repository.findAllByItemDescritionIdOrderByCreateTimeDesc(typeThreeId, PageRequest.of(pageNum,pageSize,sort(order))));
+        return new Result<>(repository.findAllByItemDescritionIdOrderByCreateTimeDesc(typeThreeId, PageRequest.of(pageNum,pageSize,getSort(order))));
     }
 
+    private Sort getSort(String order){
+        return "priceUp".equals(order) ? sort("asc") : "priceDown".equals(order) ? sort("desc") : sort(order,"createTime");
+    }
     private Sort sort(String order){
         String col = "discountPrice";
+        return sort(order,col);
+    }
+
+    private Sort sort(String order,String col){
         return Sort.by(order(order,col));
     }
 
@@ -161,7 +169,7 @@ public class ItemController {
                                     @RequestParam(value = "pageNum", defaultValue = "0") Integer pageNum,
                                     @RequestParam(value = "pageSize", defaultValue = "6") Integer pageSize,
                                     @RequestParam(value = "order", required = false) String order) {
-        return new Result<>(repository.findAllByItemLabelContaining(label, PageRequest.of(pageNum,pageSize,sort(order))));
+        return new Result<>(repository.findAllByItemLabelContaining(label, PageRequest.of(pageNum,pageSize,getSort(order))));
     }
 
 

src/main/java/com/example/afrishop_v3/repository/TbCfStationItemRepository.java

@@ -34,7 +34,7 @@ public interface TbCfStationItemRepository extends PagingAndSortingRepository<Tb
 
     Page<TbCfStationItem> findByItemCategory(String itemName, Pageable pageable);
 
-    List<TbCfStationItem> findAllByItemDescritionId(String id);
+    List<TbCfStationItem> findAllByItemDescritionId(String id,Sort sort);
 
     @Query(value = "select i from #{#entityName} i inner join AdvertisementItem a on i.itemId=a.itemId where a.adId=?1 order by a.sort")
     Page<TbCfStationItem> getAdvertisementItem(String adId, Pageable pageable);