From 4e134e61ede1f8574189af45c810ca365c7c7f9a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 18:33:14 +0800
Subject: [PATCH] 优化代码
---
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 e3e8398..473a4b9 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
@@ -92,10 +92,11 @@
info.put("storeId", resourceStorePo.getStoreId());
List<Map> stores = resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(info);
Assert.listOnlyOne(stores, "涓嶅瓨鍦ㄨ鐗╁搧");
- Double stock = Double.parseDouble(stores.get(0).get("stock").toString());
- Double newStock = Double.parseDouble(resourceStorePo.getStock());
- Double totalStock = stock + newStock;
- if (totalStock < 0) {
+ 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) {
throw new IllegalArgumentException("搴撳瓨涓嶈冻锛屽弬鏁版湁璇�");
}
//鍏ュ簱鎿嶄綔 瀵圭墿鍝佽繘琛屽姞鏉冨钩鍧�
@@ -103,18 +104,16 @@
|| (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE))) {
//鑾峰彇鍘熷潎浠�
Object averageOldPrice = stores.get(0).get("averagePrice");
- Double price = 0.0;
+ BigDecimal price = new BigDecimal(0);
if (averageOldPrice != null) {
- price = Double.parseDouble(averageOldPrice.toString());
+ price = new BigDecimal(averageOldPrice.toString());
}
//鑾峰彇鐜板湪閲囪喘鐨勪环鏍�
- Double newPrice = Double.parseDouble(resourceStorePo.getPurchasePrice());
+ BigDecimal newPrice = new BigDecimal(resourceStorePo.getPurchasePrice());
//鑾峰彇鍧囦环
- double averagePrice = ((newPrice * newStock) + (price * stock)) / totalStock;
- BigDecimal b0 = new BigDecimal(averagePrice);
- //鍥涜垗浜斿叆淇濈暀涓や綅
- double f0 = b0.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
- resourceStorePo.setAveragePrice(String.valueOf(f0));
+ BigDecimal averagePriceTotal = ((newPrice.multiply(newStock)).add(price.multiply(stock)));
+ 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)) {
resourceStorePo.setStock(stock + "");
@@ -146,6 +145,17 @@
this.resourceResourceStoreServiceDaoImpl = resourceResourceStoreServiceDaoImpl;
}
+ @Override
+ public String queryResourceStoresTotalPrice(@RequestBody ResourceStoreDto resourceResourceStoreDto) {
+ //鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
+ int page = resourceResourceStoreDto.getPage();
+ if (page != PageDto.DEFAULT_PAGE) {
+ resourceResourceStoreDto.setPage((page - 1) * resourceResourceStoreDto.getRow());
+ }
+ return resourceResourceStoreServiceDaoImpl.queryResourceStoresTotalPrice(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto));
+
+ }
+
public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
return userInnerServiceSMOImpl;
}
--
Gitblit v1.8.0