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/api/PurchaseApi.java | 131 +++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 32 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 8279136..947b171
--- 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,22 +1,25 @@
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.dto.purchase.PurchaseApplyDto;
+import com.java110.dto.user.UserDto;
+import com.java110.intf.store.*;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
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 com.java110.utils.util.StringUtil;
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.List;
+import java.util.*;
@RestController
@RequestMapping(value = "/purchase")
@@ -27,6 +30,33 @@
@Autowired
private IResourceEnterBMO resourceEnterBMOImpl;
+
+ @Autowired
+ private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
+
+ @Autowired
+ private IStorehouseInnerServiceSMO storehouseInnerServiceSMOImpl;
+
+ @Autowired
+ private IAllocationStorehouseInnerServiceSMO allocationStorehouseInnerServiceSMOImpl;
+
+ @Autowired
+ private IAllocationStorehouseApplyInnerServiceSMO allocationStorehouseApplyInnerServiceSMOImpl;
+
+ @Autowired
+ private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IResourceStoreTimesV1InnerServiceSMO resourceStoreTimesV1InnerServiceSMOImpl;
+
+ //鍩�
+ public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
+
+ //閿�
+ public static final String URGRNT_NUMBER = "URGRNT_NUMBER";
/**
* 閲囪喘鐢宠
@@ -41,13 +71,18 @@
@RequestMapping(value = "/purchaseApply", method = RequestMethod.POST)
public ResponseEntity<String> purchaseApply(@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", "蹇呭～锛岃濉啓鐢宠绫诲瀷");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ Assert.listOnlyOne(userDtos,"鏈寘鍚敤鎴�");
+
+
+ String userName = userDtos.get(0).getName();
PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
purchaseApplyPo.setApplyOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
purchaseApplyPo.setDescription(reqJson.getString("description"));
@@ -57,43 +92,75 @@
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);
+ purchaseApplyPo.setCommunityId(reqJson.getString("communityId"));
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.getString("stock"));
+ JSONArray timeList = resourceStore.getJSONArray("times");
PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
+ //鑾峰彇閲囪喘鍙傝�冧环鏍�
+ String consultPrice = null;
+ if(resourceStore.containsKey("timesId") && !StringUtil.isEmpty(resourceStore.getString("timesId"))){
+ for (int timesIndex = 0; timesIndex < timeList.size(); timesIndex++) {
+ JSONObject times = timeList.getJSONObject(timesIndex);
+ if(times.getString("timesId").toString().equals(resourceStore.getString("timesId").toString())){
+ consultPrice=times.getString("price");
+ }
+ }
+ }
+
+ purchaseApplyDetailPo.setConsultPrice(consultPrice);
purchaseApplyDetailPos.add(purchaseApplyDetailPo);
}
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
-
- return purchaseApplyBMOImpl.apply(purchaseApplyPo);
+ return purchaseApplyBMOImpl.apply(purchaseApplyPo,reqJson);
}
- @RequestMapping(value = "/resourceEnter", method = RequestMethod.POST)
- public ResponseEntity<String> resourceEnter(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "applyOrderId", "璁㈠崟ID涓虹┖");
+ //璋冩暣涓篶md 妯″紡
+// @RequestMapping(value = "/resourceEnter", method = RequestMethod.POST)
+// public ResponseEntity<String> resourceEnter(@RequestBody JSONObject reqJson) {
+// Assert.hasKeyAndValue(reqJson, "applyOrderId", "璁㈠崟ID涓虹┖");
+// PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
+// purchaseApplyDto.setApplyOrderId(reqJson.getString("applyOrderId"));
+// purchaseApplyDto.setStatusCd("0");
+// List<PurchaseApplyDto> purchaseApplyDtoList = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto);
+// if(purchaseApplyDtoList!=null && PurchaseApplyDto.STATE_AUDITED.equals(purchaseApplyDtoList.get(0).getState())){
+// throw new IllegalArgumentException("璇ヨ鍗曞凡缁忓鐞嗭紝璇峰埛鏂扮‘璁よ鍗曠姸鎬侊紒");
+// }
+// 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);
+// }
- JSONArray purchaseApplyDetails = reqJson.getJSONArray("purchaseApplyDetailVo");
+ /**
+ * 鐩存帴鍏ュ簱鎿嶄綔
+ * <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
+ */
- 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