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 | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 bccf08d..272f12c 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
@@ -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);
@@ -97,6 +97,7 @@
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
return resourceEnterBMOImpl.enter(purchaseApplyPo);
}
+
/**
* 鐩存帴鍏ュ簱鎿嶄綔
* <p>
@@ -109,9 +110,9 @@
*/
@RequestMapping(value = "/purchaseStorage", method = RequestMethod.POST)
public ResponseEntity<String> purchaseStorage(@RequestBody JSONObject reqJson,
- @RequestHeader(value = "user-id") String userId,
- @RequestHeader(value = "user-name") String userName,
- @RequestHeader(value = "store-id") String storeId) {
+ @RequestHeader(value = "user-id") String userId,
+ @RequestHeader(value = "user-name") String userName,
+ @RequestHeader(value = "store-id") String storeId) {
Assert.hasKeyAndValue(reqJson, "resourceStores", "蹇呭～锛岃濉啓鐢宠閲囪喘鐨勭墿璧�");
Assert.hasKeyAndValue(reqJson, "description", "蹇呭～锛岃濉啓閲囪喘鐢宠璇存槑");
Assert.hasKeyAndValue(reqJson, "resOrderType", "蹇呭～锛岃濉啓鐢宠绫诲瀷");
@@ -124,7 +125,7 @@
purchaseApplyPo.setEndUserTel(reqJson.getString("endUserTel"));
purchaseApplyPo.setStoreId(storeId);
purchaseApplyPo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
- purchaseApplyPo.setState(PurchaseApplyDto.STATE_AUDITED);
+ purchaseApplyPo.setState(PurchaseApplyDto.STATE_END);
purchaseApplyPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
purchaseApplyPo.setDescription("鐩存帴閲囪喘鍏ュ簱");
purchaseApplyPo.setCreateUserId(userId);
@@ -137,12 +138,15 @@
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);
//澧炲姞搴撳瓨
ResourceStorePo resourceStorePo = new ResourceStorePo();
+ 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