开放锁单

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

@@ -191,9 +191,9 @@ public interface AssetRepo extends JpaRepository<Asset, Long>, JpaSpecificationE
 
     Asset findByNameAndStatusAndCategoryAndDel(String name, AssetStatus status, String categroy, boolean del);
 
-    int countAllByPrefixNameAndStatusAndDel(String prefixName, AssetStatus assetStatus, boolean del);
+    int countAllByPrefixNameInAndStatusAndDel(Set<String> prefixName, AssetStatus assetStatus, boolean del);
 
-    int countAllByPrefixNameAndStatusAndConsignmentAndDel(String prefixName, AssetStatus assetStatus, boolean consignment, boolean del);
+    int countAllByPrefixNameInAndStatusAndConsignmentAndDel(Set<String> prefixName, AssetStatus assetStatus, boolean consignment, boolean del);
 
-    int countAllByPrefixNameAndStatusAndConsignmentAndPublicShowAndDel(String prefixName, AssetStatus assetStatus, boolean consignment, boolean publicShow, boolean del);
+    int countAllByPrefixNameInAndStatusAndConsignmentAndPublicShowAndDel(Set<String> prefixName, AssetStatus assetStatus, boolean consignment, boolean publicShow, boolean del);
 }

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

@@ -14,10 +14,7 @@ import org.springframework.data.jpa.repository.Query;
 import javax.transaction.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 public interface OrderRepo extends JpaRepository<Order, Long>, JpaSpecificationExecutor<Order> {
     @Query("update Order t set t.del = true where t.id = ?1")
@@ -129,6 +126,6 @@ public interface OrderRepo extends JpaRepository<Order, Long>, JpaSpecificationE
 
     List<Order> findAllByParentOrderId(Long id);
 
-    @Query("select o from Order o join Asset a on o.id = a.id where o.status = 'FINISH' and a.prefixName = ?1 order by o.payTime desc ")
-    Page<Order> queryDomainOrder(String prefixName, Pageable pageable);
+    @Query("select o from Order o join Asset a on o.id = a.id where o.status = 'FINISH' and a.prefixName in ?1 order by o.payTime desc ")
+    Page<Order> queryDomainOrder(Set<String> prefixName, Pageable pageable);
 }

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

@@ -1263,15 +1263,37 @@ public class OrderService {
         }).get();
     }
 
-    public Map<String, Object> domainTransferInfo(String prefixName) {
+    public Map<String, Object> domainTransferInfo(int type) {
+        Set<String> prefixNames = new HashSet<>();
+        switch (type) {
+            case 0:
+                prefixNames.add("RIDCX");
+                break;
+            case 1:
+                prefixNames.add("RID");
+                prefixNames.add("RID1");
+                prefixNames.add("RID2");
+                prefixNames.add("RID3");
+                prefixNames.add("RID4");
+                prefixNames.add("RID5");
+                break;
+            case 2:
+                prefixNames.add("RIDN1");
+                prefixNames.add("RIDN2");
+                prefixNames.add("RIDN3");
+                prefixNames.add("RIDN4");
+                prefixNames.add("RIDN5");
+                prefixNames.add("RIDN6");
+                break;
+        }
         //流通量
-        int transferringCount = assetRepo.countAllByPrefixNameAndStatusAndDel(prefixName, AssetStatus.NORMAL, false);
+        int transferringCount = assetRepo.countAllByPrefixNameInAndStatusAndDel(prefixNames, AssetStatus.NORMAL, false);
         //寄售中
         int consignment = assetRepo
-                .countAllByPrefixNameAndStatusAndConsignmentAndDel(prefixName, AssetStatus.NORMAL, true, false);
+                .countAllByPrefixNameInAndStatusAndConsignmentAndDel(prefixNames, AssetStatus.NORMAL, true, false);
         //仅展示
         int publicShow = assetRepo
-                .countAllByPrefixNameAndStatusAndConsignmentAndPublicShowAndDel(prefixName, AssetStatus.NORMAL, false, true, false);
+                .countAllByPrefixNameInAndStatusAndConsignmentAndPublicShowAndDel(prefixNames, AssetStatus.NORMAL, false, true, false);
         Map<String, Object> result = new HashMap<>();
         result.put("transferringCount", transferringCount);
         result.put("consignment", consignment);
@@ -1279,8 +1301,30 @@ public class OrderService {
         return result;
     }
 
-    public Page<DomainOrderDTO> newestDomainTransfer(String prefix, Pageable pageable) {
-        Page<Order> orders = orderRepo.queryDomainOrder(prefix, pageable);
+    public Page<DomainOrderDTO> newestDomainTransfer(int type, Pageable pageable) {
+        Set<String> prefixNames = new HashSet<>();
+        switch (type) {
+            case 0:
+                prefixNames.add("RIDCX");
+                break;
+            case 1:
+                prefixNames.add("RID");
+                prefixNames.add("RID1");
+                prefixNames.add("RID2");
+                prefixNames.add("RID3");
+                prefixNames.add("RID4");
+                prefixNames.add("RID5");
+                break;
+            case 2:
+                prefixNames.add("RIDN1");
+                prefixNames.add("RIDN2");
+                prefixNames.add("RIDN3");
+                prefixNames.add("RIDN4");
+                prefixNames.add("RIDN5");
+                prefixNames.add("RIDN6");
+                break;
+        }
+        Page<Order> orders = orderRepo.queryDomainOrder(prefixNames, pageable);
         List<Order> orderContent = orders.getContent();
         List<DomainOrderDTO> domainOrderDTOS = new ArrayList<>();
         orderContent.forEach(order -> {

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

@@ -250,13 +250,13 @@ public class OrderController extends BaseController {
     }
 
     @PostMapping("/domainOrderStatistic")
-    public Map<String, Object> domainOrderStatistic(String prefixName) {
-        return orderService.domainTransferInfo(prefixName);
+    public Map<String, Object> domainOrderStatistic(int type) {
+        return orderService.domainTransferInfo(type);
     }
 
     @PostMapping("/newestOrder")
-    public Page<DomainOrderDTO> domainOrderStatistic(String prefixName, Pageable pageable) {
-        return orderService.newestDomainTransfer(prefixName, pageable);
+    public Page<DomainOrderDTO> domainOrderStatistic(int type, Pageable pageable) {
+        return orderService.newestDomainTransfer(type, pageable);
     }
 }