From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/bmo/collection/impl/ResourceOutBMOImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/collection/impl/ResourceOutBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/collection/impl/ResourceOutBMOImpl.java
index c2a83d7..5128397 100755
--- a/service-store/src/main/java/com/java110/store/bmo/collection/impl/ResourceOutBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/collection/impl/ResourceOutBMOImpl.java
@@ -2,9 +2,9 @@
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.purchaseApply.PurchaseApplyDto;
-import com.java110.dto.resourceStore.ResourceStoreDto;
-import com.java110.dto.userStorehouse.UserStorehouseDto;
+import com.java110.dto.purchase.PurchaseApplyDto;
+import com.java110.dto.resource.ResourceStoreDto;
+import com.java110.dto.user.UserStorehouseDto;
import com.java110.intf.store.IPurchaseApplyDetailInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
@@ -12,7 +12,7 @@
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.po.purchase.ResourceStorePo;
-import com.java110.po.userStorehouse.UserStorehousePo;
+import com.java110.po.user.UserStorehousePo;
import com.java110.store.bmo.collection.IResourceOutBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
@@ -74,6 +74,9 @@
BigDecimal applyQuantity = purchaseQuantity.multiply(miniUnitStock1);
//璁＄畻鐗╁搧棰嗙敤鍚庡墿浣欑殑鏈�灏忚閲忔�绘暟
BigDecimal newMiniStock = miniStock1.subtract(applyQuantity);
+ if (newMiniStock.compareTo(BigDecimal.ZERO) == -1) {
+ throw new IllegalArgumentException("鐗╁搧搴撳瓨宸茬粡涓嶈冻锛岃纭鐗╁搧搴撳瓨锛�");
+ }
resourceStorePo.setMiniStock(String.valueOf(newMiniStock));
resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
@@ -93,12 +96,13 @@
UserStorehousePo userStorehousePo = new UserStorehousePo();
userStorehousePo.setUsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));
userStorehousePo.setResId(resourceStoreDtos.get(0).getResId());
+ userStorehousePo.setResCode(resourceStoreDtos.get(0).getResCode());
userStorehousePo.setResName(resourceStoreDtos.get(0).getResName());
userStorehousePo.setStoreId(resourceStoreDtos.get(0).getStoreId());
userStorehousePo.setUserId(purchaseApplyDtos.get(0).getUserId());
//鏌ヨ鐗╁搧 鏄惁宸茬粡瀛樺湪
UserStorehouseDto userStorehouseDto = new UserStorehouseDto();
- userStorehouseDto.setResId(resourceStoreDtos.get(0).getResId());
+ userStorehouseDto.setResCode(resourceStoreDtos.get(0).getResCode());
userStorehouseDto.setUserId(purchaseApplyDtos.get(0).getUserId());
userStorehouseDto.setStoreId(resourceStoreDtos.get(0).getStoreId());
List<UserStorehouseDto> userStorehouseDtos = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouseDto);
--
Gitblit v1.8.0