展示

src/main/java/com/izouma/nineth/dto/oasis/OasisDistrictCollectionDTO.java

@@ -16,5 +16,5 @@ public class OasisDistrictCollectionDTO {
     private BigDecimal sellPrice;
     private String     status;
     private String     owner;
-
+    private boolean    salable;
 }

src/main/java/com/izouma/nineth/dto/oasis/OasisDistrictDTO.java

@@ -32,6 +32,7 @@ public class OasisDistrictDTO {
     private int                      total;
     private BigDecimal               price;
     private BigDecimal               originalPrice;
+
     private int                      maxCount;
     @Convert(converter = PropertyListConverter.class)
     @ApiModelProperty("特性")

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

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

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

@@ -95,10 +95,10 @@ public class CompanyCollectionService {
         companyCollectionRepo.save(companyCollection);
     }
 
-    public List<OasisDistrictCollectionDTO> oasisSearch(List<Long> oasisIds, boolean salable) {
+    public List<OasisDistrictCollectionDTO> oasisSearch(List<Long> oasisIds) {
         List<OasisDistrictCollectionDTO> oasisDistrictCollectionDTOS = new ArrayList<>();
         List<Collection> collections = collectionRepo
-                .findAllByOasisIdInAndStockGreaterThanAndSalable(oasisIds, 0, salable);
+                .findAllByOasisIdInAndStockGreaterThan(oasisIds, 0);
         List<CompanyCollection> companyCollections = companyCollectionRepo
                 .findAllByOasisIdInAndStatusNot(oasisIds, CollectionStatus.SUCCESS);
 
@@ -107,6 +107,7 @@ public class CompanyCollectionService {
             oasisDistrictCollectionDTO.setOasisId(collection.getOasisId());
             oasisDistrictCollectionDTO.setCollectionName(collection.getName());
             oasisDistrictCollectionDTO.setOriginPrice(collection.getPrice());
+            oasisDistrictCollectionDTO.setSalable(collection.isSalable());
             oasisDistrictCollectionDTO.setOwner(collection.getOwner());
             if (collection.getSource() != CollectionSource.TRANSFER) {
                 oasisDistrictCollectionDTO.setStatus("官方库存");
@@ -122,6 +123,7 @@ public class CompanyCollectionService {
             oasisDistrictCollectionDTO.setCollectionName(companyCollection.getName());
             oasisDistrictCollectionDTO.setOriginPrice(companyCollection.getPrice());
             oasisDistrictCollectionDTO.setOwner(companyCollection.getMinter());
+            oasisDistrictCollectionDTO.setSalable(false);
             oasisDistrictCollectionDTO.setStatus("平台审核");
             oasisDistrictCollectionDTOS.add(oasisDistrictCollectionDTO);
         });

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, @RequestParam boolean salable) {
-        return companyCollectionService.oasisSearch(oasisIds,salable);
+    public List<OasisDistrictCollectionDTO> oasisSearch(@RequestBody List<Long> oasisIds) {
+        return companyCollectionService.oasisSearch(oasisIds);
     }