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 | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 7 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 12a7554..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
@@ -1,16 +1,18 @@
package com.java110.store.api;
-
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.po.purchase.ResourceStorePo;
import com.java110.store.bmo.purchase.IPurchaseApplyBMO;
+import com.java110.store.bmo.purchase.IResourceEnterBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +26,12 @@
@Autowired
private IPurchaseApplyBMO purchaseApplyBMOImpl;
+
+ @Autowired
+ private IResourceEnterBMO resourceEnterBMOImpl;
+
+ @Autowired
+ private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
/**
* 閲囪喘鐢宠
@@ -40,11 +48,9 @@
@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", "蹇呭～锛岃濉啓鐢宠绫诲瀷");
-
PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
purchaseApplyPo.setApplyOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
purchaseApplyPo.setDescription(reqJson.getString("description"));
@@ -54,19 +60,96 @@
purchaseApplyPo.setEndUserTel(reqJson.getString("endUserTel"));
purchaseApplyPo.setStoreId(storeId);
purchaseApplyPo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
- purchaseApplyPo.setState(PurchaseApplyDto.STATE_DEALING);
-
+ purchaseApplyPo.setState(PurchaseApplyDto.STATE_WAIT_DEAL);
+ purchaseApplyPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ purchaseApplyPo.setCreateUserId(userId);
+ purchaseApplyPo.setCreateUserName(userName);
+ purchaseApplyPo.setWarehousingWay(PurchaseApplyDto.WAREHOUSING_TYPE_APPLY);
JSONArray resourceStores = reqJson.getJSONArray("resourceStores");
-
List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
-
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);
}
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
+ return purchaseApplyBMOImpl.apply(purchaseApplyPo);
+ }
+ @RequestMapping(value = "/resourceEnter", method = RequestMethod.POST)
+ public ResponseEntity<String> resourceEnter(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "applyOrderId", "璁㈠崟ID涓虹┖");
+ JSONArray purchaseApplyDetails = reqJson.getJSONArray("purchaseApplyDetailVo");
+ List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
+ for (int detailIndex = 0; detailIndex < purchaseApplyDetails.size(); detailIndex++) {
+ JSONObject purchaseApplyDetail = purchaseApplyDetails.getJSONObject(detailIndex);
+ Assert.hasKeyAndValue(purchaseApplyDetail, "purchaseQuantity", "閲囪喘鏁伴噺鏈～鍐�");
+ Assert.hasKeyAndValue(purchaseApplyDetail, "price", "閲囪喘鍗曚环鏈～鍐�");
+ Assert.hasKeyAndValue(purchaseApplyDetail, "id", "鏄庣粏ID涓虹┖");
+ PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(purchaseApplyDetail, PurchaseApplyDetailPo.class);
+ purchaseApplyDetailPos.add(purchaseApplyDetailPo);
+ }
+ PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
+ purchaseApplyPo.setApplyOrderId(reqJson.getString("applyOrderId"));
+ purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
+ return resourceEnterBMOImpl.enter(purchaseApplyPo);
+ }
+
+ /**
+ * 鐩存帴鍏ュ簱鎿嶄綔
+ * <p>
+ * {"resourceStores":[{"resId":"852020061636590016","resName":"姗＄毊鎿�","resCode":"003","price":"100.00","stock":"0","description":"ada","quantity":"1"},
+ * {"resId":"852020061729120031","resName":"鏂囨。鏌�","resCode":"002","price":"33.00","stock":"0","description":"钃濊壊","quantity":"1"}],
+ * "description":"123123","endUserName":"1","endUserTel":"17797173942","file":"","resOrderType":"10000","staffId":"","staffName":""}
+ *
+ * @param reqJson
+ * @return
+ */
+ @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) {
+ Assert.hasKeyAndValue(reqJson, "resourceStores", "蹇呭～锛岃濉啓鐢宠閲囪喘鐨勭墿璧�");
+ Assert.hasKeyAndValue(reqJson, "description", "蹇呭～锛岃濉啓閲囪喘鐢宠璇存槑");
+ Assert.hasKeyAndValue(reqJson, "resOrderType", "蹇呭～锛岃濉啓鐢宠绫诲瀷");
+ PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
+ purchaseApplyPo.setApplyOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
+ purchaseApplyPo.setDescription(reqJson.getString("description"));
+ purchaseApplyPo.setUserId(userId);
+ purchaseApplyPo.setUserName(userName);
+ purchaseApplyPo.setEndUserName(reqJson.getString("endUserName"));
+ purchaseApplyPo.setEndUserTel(reqJson.getString("endUserTel"));
+ purchaseApplyPo.setStoreId(storeId);
+ purchaseApplyPo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
+ purchaseApplyPo.setState(PurchaseApplyDto.STATE_END);
+ purchaseApplyPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ purchaseApplyPo.setDescription("鐩存帴閲囪喘鍏ュ簱");
+ purchaseApplyPo.setCreateUserId(userId);
+ purchaseApplyPo.setCreateUserName(userName);
+ purchaseApplyPo.setWarehousingWay(PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT);
+ JSONArray resourceStores = reqJson.getJSONArray("resourceStores");
+ List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
+ for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
+ JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
+ 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);
return purchaseApplyBMOImpl.apply(purchaseApplyPo);
}
}
--
Gitblit v1.8.0