展示

src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -166,4 +166,6 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
             "and c.salable = true " +
             "and c.stock > 0 ", nativeQuery = true)
     String lowestPrice(String search);
+
+    List<Collection> findAllByOasisIdInAndStockGreaterThanAndSalable(List<Long> oasisIds, int stock, boolean salable);
 }

src/main/java/com/izouma/nineth/service/CompanyCollectionService.java

@@ -95,9 +95,10 @@ public class CompanyCollectionService {
         companyCollectionRepo.save(companyCollection);
     }
 
-    public List<OasisDistrictCollectionDTO> oasisSearch(List<Long> oasisIds) {
+    public List<OasisDistrictCollectionDTO> oasisSearch(List<Long> oasisIds, boolean salable) {
         List<OasisDistrictCollectionDTO> oasisDistrictCollectionDTOS = new ArrayList<>();
-        List<Collection> collections = collectionRepo.findAllByOasisIdInAndStockGreaterThan(oasisIds, 0);
+        List<Collection> collections = collectionRepo
+                .findAllByOasisIdInAndStockGreaterThanAndSalable(oasisIds, 0, salable);
         List<CompanyCollection> companyCollections = companyCollectionRepo
                 .findAllByOasisIdInAndStatusNot(oasisIds, CollectionStatus.SUCCESS);
 

src/main/java/com/izouma/nineth/web/CompanyCollectionController.java

@@ -101,8 +101,8 @@ public class CompanyCollectionController extends BaseController {
     //oasis创建地块接口
     @PreAuthorize("hasAnyRole('ADMIN','COMPANY')")
     @PostMapping("/oasisSearch")
-    public List<OasisDistrictCollectionDTO> oasisSearch(@RequestBody List<Long> oasisIds) {
-        return companyCollectionService.oasisSearch(oasisIds);
+    public List<OasisDistrictCollectionDTO> oasisSearch(@RequestBody List<Long> oasisIds, @RequestParam boolean salable) {
+        return companyCollectionService.oasisSearch(oasisIds,salable);
     }