From 28e7d3937f819a3486b22bfa1c84aee172aaccb4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 17:46:42 +0800
Subject: [PATCH] 优化代码
---
service-store/src/main/java/com/java110/store/api/CollectionApi.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/CollectionApi.java b/service-store/src/main/java/com/java110/store/api/CollectionApi.java
index 5e7c602..8748d6f 100755
--- a/service-store/src/main/java/com/java110/store/api/CollectionApi.java
+++ b/service-store/src/main/java/com/java110/store/api/CollectionApi.java
@@ -110,6 +110,7 @@
@RequestMapping(value = "/getCollectionAuditOrder", method = RequestMethod.GET)
public ResponseEntity<String> getCollectionAuditOrder(@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
+ @RequestParam(value = "communityId") String communityId,
@RequestHeader(value = "user-id") String userId,
@RequestHeader(value = "store-id") String storeId) {
AuditUser auditUser = new AuditUser();
@@ -117,11 +118,12 @@
auditUser.setPage(page);
auditUser.setRow(row);
auditUser.setStoreId(storeId);
+ auditUser.setCommunityId(communityId);
return getCollectionAuditOrderBMOImpl.auditOrder(auditUser);
}
/**
- * 鐗╁搧鍙戞斁
+ * 鐗╁搧鍙戞斁(鐗╁搧鍙戞斁涔嬪悗鐩存帴鍒颁釜浜烘墜涓�)
* {"resourceOuts":[],"applyOrderId":"152020071665420001","taskId":"237506","resOrderType":"20000",
* "purchaseApplyDetailVo":[{"applyOrderId":"152020071665420001","id":"152020071690120002","price":"","quantity":"1",
* "resCode":"002","resId":"852020070239060001","resName":"姘存�х瑪","stock":"2","purchaseQuantity":"2","purchaseRemark":""}]}
@@ -202,7 +204,7 @@
resourceStoreDto.setResId(purchaseApplyDetailPo.getResId());
List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
if (resourceStoreDtos == null || resourceStoreDtos.size() < 1) {
- continue;
+ throw new IllegalArgumentException("鏈煡璇㈠埌鐗╁搧璧勬簮淇℃伅锛�");
}
//鑾峰彇鐗╁搧鍗曚綅
String unitCode = resourceStoreDtos.get(0).getUnitCode();
@@ -217,12 +219,14 @@
userStorehousePo.setResName(resourceStoreDtos.get(0).getResName());
userStorehousePo.setStoreId(resourceStoreDtos.get(0).getStoreId());
userStorehousePo.setUserId(purchaseApplyPo.getUserId());
- //鏌ヨ鐗╁搧 鏄惁宸茬粡瀛樺湪
+
+ //鏌ヨ涓汉鐗╁搧浠撳簱涓� 鏄惁宸茬粡瀛樺湪鍟嗗搧
UserStorehouseDto userStorehouseDto = new UserStorehouseDto();
- userStorehouseDto.setResId(resourceStoreDtos.get(0).getResId());
+ userStorehouseDto.setResCode(resourceStoreDtos.get(0).getResCode());
userStorehouseDto.setUserId(purchaseApplyPo.getUserId());
userStorehouseDto.setStoreId(resourceStoreDtos.get(0).getStoreId());
List<UserStorehouseDto> userStorehouseDtos = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouseDto);
+ userStorehousePo.setResCode(resourceStoreDtos.get(0).getResCode());
if (userStorehouseDtos == null || userStorehouseDtos.size() < 1) {
userStorehousePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
if (!StringUtil.isEmpty(unitCode) && !StringUtil.isEmpty(miniUnitCode) && !StringUtil.isEmpty(miniUnitStock) && !unitCode.equals(miniUnitCode)) {
--
Gitblit v1.8.0