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 |   10 ++++++----
 1 files changed, 6 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 452882e..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
@@ -123,7 +123,7 @@
     }
 
     /**
-     * 鐗╁搧鍙戞斁
+     * 鐗╁搧鍙戞斁(鐗╁搧鍙戞斁涔嬪悗鐩存帴鍒颁釜浜烘墜涓�)
      * {"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":""}]}
@@ -204,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();
@@ -219,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