From b73bfc782e8751ce8ae7a7f429d3b49fb35e2441 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 19 一月 2023 05:37:59 +0800
Subject: [PATCH] 优化查询记录数限制
---
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
index 3b4be8f..e43412a 100755
--- a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
@@ -78,20 +78,24 @@
resourceStoreDtos.add(resourceStoreDto);
}
+ if (resourceResourceStores == null || resourceResourceStores.size() < 1 || resourceResourceStores.size() > 15) {
+ return resourceResourceStores;
+ }
+
ResourceStoreTimesDto resourceStoreTimesDto = new ResourceStoreTimesDto();
resourceStoreTimesDto.setStoreId(resourceResourceStoreDto.getStoreId());
resourceStoreTimesDto.setResCodes(resCodes.toArray(new String[resCodes.size()]));
List<ResourceStoreTimesDto> resourceStoreTimesDtos = resourceStoreTimesV1InnerServiceSMOImpl.queryResourceStoreTimess(resourceStoreTimesDto);
- if(resourceStoreTimesDtos == null || resourceStoreTimesDtos.size()< 1){
+ if (resourceStoreTimesDtos == null || resourceStoreTimesDtos.size() < 1) {
return resourceStoreDtos;
}
List<ResourceStoreTimesDto> times = null;
for (ResourceStoreDto resourceStoreDto : resourceResourceStores) {
times = new ArrayList<>();
- for(ResourceStoreTimesDto tmpResourceStoreTimesDto: resourceStoreTimesDtos){
- if(resourceStoreDto.getResCode().equals(tmpResourceStoreTimesDto.getResCode())){
+ for (ResourceStoreTimesDto tmpResourceStoreTimesDto : resourceStoreTimesDtos) {
+ if (resourceStoreDto.getResCode().equals(tmpResourceStoreTimesDto.getResCode())) {
times.add(tmpResourceStoreTimesDto);
}
}
@@ -122,8 +126,8 @@
BigDecimal stock = new BigDecimal(stores.get(0).get("stock").toString());
BigDecimal newStock = new BigDecimal(resourceStorePo.getStock().toString());
BigDecimal totalStock = stock.add(newStock);
- BigDecimal zeroStock = new BigDecimal (0);
- if (totalStock.compareTo(zeroStock)== -1) {
+ BigDecimal zeroStock = new BigDecimal(0);
+ if (totalStock.compareTo(zeroStock) == -1) {
throw new IllegalArgumentException("搴撳瓨涓嶈冻锛屽弬鏁版湁璇�");
}
//鍏ュ簱鎿嶄綔 瀵圭墿鍝佽繘琛屽姞鏉冨钩鍧�
@@ -139,7 +143,7 @@
BigDecimal newPrice = new BigDecimal(resourceStorePo.getPurchasePrice());
//鑾峰彇鍧囦环
BigDecimal averagePriceTotal = ((newPrice.multiply(newStock)).add(price.multiply(stock)));
- BigDecimal averagePrice=averagePriceTotal.divide(totalStock,2,BigDecimal.ROUND_HALF_UP);
+ BigDecimal averagePrice = averagePriceTotal.divide(totalStock, 2, BigDecimal.ROUND_HALF_UP);
resourceStorePo.setAveragePrice(averagePrice.toString());
}
if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE)) {
--
Gitblit v1.8.0