From 971023df5fd3795e24d10d4d4d03ee112df12297 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 24 三月 2022 12:17:41 +0800
Subject: [PATCH] 优化查询为空问题
---
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java | 87 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 11 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
old mode 100644
new mode 100755
index 7cd2925..473a4b9
--- 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
@@ -1,9 +1,11 @@
package com.java110.store.smo.impl;
-
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
+import com.java110.dto.file.FileRelDto;
+import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.resourceStore.ResourceStoreDto;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.purchase.ResourceStorePo;
@@ -15,6 +17,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,20 +40,37 @@
@Autowired
private IUserInnerServiceSMO userInnerServiceSMOImpl;
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
@Override
public List<ResourceStoreDto> queryResourceStores(@RequestBody ResourceStoreDto resourceResourceStoreDto) {
-
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-
int page = resourceResourceStoreDto.getPage();
-
if (page != PageDto.DEFAULT_PAGE) {
resourceResourceStoreDto.setPage((page - 1) * resourceResourceStoreDto.getRow());
}
-
List<ResourceStoreDto> resourceResourceStores = BeanConvertUtil.covertBeanList(resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto)), ResourceStoreDto.class);
-
- return resourceResourceStores;
+ //鑾峰彇鍥剧墖鍦板潃
+ List<ResourceStoreDto> resourceStoreDtos = new ArrayList<>();
+ for (ResourceStoreDto resourceStoreDto : resourceResourceStores) {
+ //鑾峰彇璧勬簮id
+ String resId = resourceStoreDto.getResId();
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(resId);
+ //鏌ヨ鏂囦欢琛�
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ List<String> fileUrls = new ArrayList<>();
+ for (FileRelDto fileRel : fileRelDtos) {
+ String url = "/callComponent/download/getFile/file?fileId=" + fileRel.getFileRealName() + "&communityId=-1";
+ fileUrls.add(url);
+ }
+ resourceStoreDto.setFileUrls(fileUrls);
+ }
+ resourceStoreDtos.add(resourceStoreDto);
+ }
+ return resourceStoreDtos;
}
@@ -70,11 +91,35 @@
info.put("resId", resourceStorePo.getResId());
info.put("storeId", resourceStorePo.getStoreId());
List<Map> stores = resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(info);
-
Assert.listOnlyOne(stores, "涓嶅瓨鍦ㄨ鐗╁搧");
- int stock = Integer.parseInt(stores.get(0).get("stock").toString());
- int newStock = Integer.parseInt(resourceStorePo.getStock());
- resourceStorePo.setStock((stock + newStock) + "");
+ 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("搴撳瓨涓嶈冻锛屽弬鏁版湁璇�");
+ }
+ //鍏ュ簱鎿嶄綔 瀵圭墿鍝佽繘琛屽姞鏉冨钩鍧�
+ if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.RES_ORDER_TYPE_ENTER)
+ || (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE))) {
+ //鑾峰彇鍘熷潎浠�
+ Object averageOldPrice = stores.get(0).get("averagePrice");
+ BigDecimal price = new BigDecimal(0);
+ if (averageOldPrice != null) {
+ price = new BigDecimal(averageOldPrice.toString());
+ }
+ //鑾峰彇鐜板湪閲囪喘鐨勪环鏍�
+ 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);
+ resourceStorePo.setAveragePrice(averagePrice.toString());
+ }
+ if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE)) {
+ resourceStorePo.setStock(stock + "");
+ } else {
+ resourceStorePo.setStock(totalStock + "");
+ }
resourceStorePo.setStatusCd("0");
return resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance(BeanConvertUtil.beanCovertMap(resourceStorePo));
} finally {
@@ -82,6 +127,15 @@
}
}
+ /**
+ * 鏂板鐗╁搧
+ *
+ * @param resourceStoreDto
+ */
+ @Override
+ public void saveResourceStore(@RequestBody ResourceStoreDto resourceStoreDto) {
+ resourceResourceStoreServiceDaoImpl.saveResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceStoreDto));
+ }
public IResourceStoreServiceDao getResourceStoreServiceDaoImpl() {
return resourceResourceStoreServiceDaoImpl;
@@ -91,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