From c083b87a2635d9b48dd95cb441d7a7c5c9258abe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 21 四月 2021 18:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/api/PurchaseApi.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 f62077b..03f1030 100644
--- 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,21 +1,22 @@
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.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.*;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@RestController
@@ -24,6 +25,9 @@
@Autowired
private IPurchaseApplyBMO purchaseApplyBMOImpl;
+
+ @Autowired
+ private IResourceEnterBMO resourceEnterBMOImpl;
/**
* 閲囪喘鐢宠
@@ -40,11 +44,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"));
@@ -55,18 +57,35 @@
purchaseApplyPo.setStoreId(storeId);
purchaseApplyPo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
purchaseApplyPo.setState(PurchaseApplyDto.STATE_WAIT_DEAL);
-
+ purchaseApplyPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
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));
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);
+ }
}
--
Gitblit v1.8.0