From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/api/PurchaseApi.java | 4 +++-
1 files changed, 3 insertions(+), 1 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
old mode 100644
new mode 100755
index fe160c4..272f12c
--- a/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
+++ b/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
@@ -18,7 +18,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
@RestController
@@ -71,6 +70,7 @@
for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
resourceStore.remove("price");//閲囪喘浠锋牸榛樿绌�
+ resourceStore.put("originalStock",resourceStore.get("stock"));
PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
purchaseApplyDetailPos.add(purchaseApplyDetailPo);
@@ -138,6 +138,7 @@
PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
purchaseApplyDetailPo.setRemark("鐩存帴閲囪喘鍏ュ簱");
+ purchaseApplyDetailPo.setOriginalStock(resourceStore.get("stock").toString());
purchaseApplyDetailPo.setQuantity(purchaseApplyDetailPo.getPurchaseQuantity());
purchaseApplyDetailPos.add(purchaseApplyDetailPo);
//澧炲姞搴撳瓨
@@ -145,6 +146,7 @@
resourceStorePo.setPurchasePrice(purchaseApplyDetailPo.getPrice());
resourceStorePo.setResId(purchaseApplyDetailPo.getResId());
resourceStorePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
+ resourceStorePo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
}
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
--
Gitblit v1.8.0