From dece32aeb6b9053e345fda5991a1671463e35e4d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 31 八月 2021 00:33:32 +0800
Subject: [PATCH] 优化代码
---
service-store/src/main/java/com/java110/store/api/PurchaseApi.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/PurchaseApi.java b/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
index ef94d2e..a027737 100755
--- a/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
+++ b/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
@@ -23,6 +23,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.*;
@RestController
@@ -106,6 +107,13 @@
@RequestMapping(value = "/resourceEnter", method = RequestMethod.POST)
public ResponseEntity<String> resourceEnter(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "applyOrderId", "璁㈠崟ID涓虹┖");
+ PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
+ purchaseApplyDto.setApplyOrderId(reqJson.getString("applyOrderId"));
+ purchaseApplyDto.setStatusCd("0");
+ List<PurchaseApplyDto> purchaseApplyDtoList = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto);
+ if(purchaseApplyDtoList!=null && PurchaseApplyDto.STATE_AUDITED.equals(purchaseApplyDtoList.get(0).getState())){
+ throw new IllegalArgumentException("璇ヨ鍗曞凡缁忓鐞嗭紝璇峰埛鏂扮‘璁よ鍗曠姸鎬侊紒");
+ }
JSONArray purchaseApplyDetails = reqJson.getJSONArray("purchaseApplyDetailVo");
List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
for (int detailIndex = 0; detailIndex < purchaseApplyDetails.size(); detailIndex++) {
@@ -173,20 +181,20 @@
resourceStorePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
resourceStorePo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
//鑾峰彇閲囪喘鏁伴噺
- double purchaseQuantity = Double.parseDouble(purchaseApplyDetailPo.getPurchaseQuantity());
+ BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());
//鑾峰彇鍘熸湁鏈�灏忚閲忔�绘暟
- double miniStock = Double.parseDouble(resourceStore.getString("miniStock"));
+ BigDecimal miniStock = new BigDecimal(resourceStore.getString("miniStock"));
//鑾峰彇鏈�灏忓崟浣嶆暟閲�
- double newMiniStock = 0.0;
+ BigDecimal newMiniStock = new BigDecimal(0);
if (StringUtil.isEmpty(resourceStore.getString("miniUnitStock"))) {
throw new IllegalArgumentException("鏈�灏忚閲忓崟浣嶆暟閲忎笉鑳戒负绌猴紒");
}
- double miniUnitStock = Double.parseDouble(resourceStore.getString("miniUnitStock"));
+ BigDecimal miniUnitStock = new BigDecimal(resourceStore.getString("miniUnitStock"));
//璁＄畻鏈�灏忚閲忔�绘暟
if (StringUtil.isEmpty(resourceStore.getString("miniStock"))) {
- newMiniStock = purchaseQuantity * miniUnitStock;
+ newMiniStock = purchaseQuantity.multiply(miniUnitStock);
} else {
- newMiniStock = (purchaseQuantity * miniUnitStock) + miniStock;
+ newMiniStock = (purchaseQuantity.multiply(miniUnitStock)).add(miniStock);
}
resourceStorePo.setMiniStock(String.valueOf(newMiniStock));
resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
@@ -225,7 +233,7 @@
throw new IllegalArgumentException("鏄犲皠鍊间负绌猴紒");
}
int number = Integer.parseInt(value);
- if (count > number) {
+ if (count >= number) {
throw new IllegalArgumentException("鏈湀绱ф�ラ噰璐鏁板凡瓒呰繃" + number + "娆★紝璇蜂笅鏈堝啀浣跨敤锛�");
}
PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
@@ -327,19 +335,19 @@
resourceStorePo1.setResOrderType(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT);
resourceStorePo1.setOperationType(PurchaseApplyDto.WEIGHTED_MEAN_FALSE);
//鑾峰彇绱ф�ラ噰璐暟閲�
- double purchaseQuantity = Double.parseDouble(purchaseApplyDetailPo.getQuantity());
+ BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getQuantity());
//鑾峰彇鍘熸湁鏈�灏忚閲忔�绘暟
- if(StringUtil.isEmpty(resourceStoreDtos.get(0).getMiniStock())){
+ if (StringUtil.isEmpty(resourceStoreDtos.get(0).getMiniStock())) {
throw new IllegalArgumentException("鏈�灏忚閲忔�绘暟涓嶈兘涓虹┖锛�");
}
- double miniStock = Double.parseDouble(resourceStoreDtos.get(0).getMiniStock());
+ BigDecimal miniStock = new BigDecimal(resourceStoreDtos.get(0).getMiniStock());
//鑾峰彇鏈�灏忚閲忓崟浣嶆暟閲�
if (StringUtil.isEmpty(resourceStoreDtos.get(0).getMiniUnitStock())) {
throw new IllegalArgumentException("鏈�灏忚閲忓崟浣嶆暟閲忎笉鑳戒负绌猴紒");
}
- double miniUnitStock = Double.parseDouble(resourceStoreDtos.get(0).getMiniUnitStock());
+ BigDecimal miniUnitStock = new BigDecimal(resourceStoreDtos.get(0).getMiniUnitStock());
//璁＄畻鏈�灏忚閲忔�绘暟
- double newMiniStock = (purchaseQuantity * miniUnitStock) + miniStock;
+ BigDecimal newMiniStock = purchaseQuantity.multiply(miniUnitStock).add(miniStock);
resourceStorePo1.setMiniStock(String.valueOf(newMiniStock));
resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo1);
} else if (resourceStoreDtos != null && resourceStoreDtos.size() > 1) {
@@ -390,14 +398,14 @@
resourceStoreDto1.setStock(purchaseApplyDetailPo.getQuantity());
resourceStoreDto1.setCreateTime(new Date());
//鑾峰彇绱ф�ラ噰璐暟閲�
- double purchaseQuantity = Double.parseDouble(purchaseApplyDetailPo.getQuantity());
+ BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getQuantity());
//鑾峰彇鏈�灏忚閲忓崟浣嶆暟閲�
if (StringUtil.isEmpty(resourceStore.getString("miniUnitStock"))) {
throw new IllegalArgumentException("鏈�灏忚閲忓崟浣嶆暟閲忎笉鑳戒负绌猴紒");
}
- double miniUnitStock = Double.parseDouble(resourceStore.getString("miniUnitStock"));
+ BigDecimal miniUnitStock = new BigDecimal(resourceStore.getString("miniUnitStock"));
//璁＄畻鏈�灏忚閲忔�绘暟
- double miniStock = purchaseQuantity * miniUnitStock;
+ BigDecimal miniStock = purchaseQuantity.multiply(miniUnitStock);
resourceStoreDto1.setMiniStock(String.valueOf(miniStock));
resourceStoreInnerServiceSMOImpl.saveResourceStore(resourceStoreDto1);
}
--
Gitblit v1.8.0