From dd9759eaa3dabd3d55943fc0c741fd5018d2d76e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 五月 2023 16:43:29 +0800
Subject: [PATCH] optimize dining
---
service-store/src/main/java/com/java110/store/api/PurchaseApi.java | 147 +++++++++++++++++++++++++++----------------------
1 files changed, 81 insertions(+), 66 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 bccf08d..bd04c44
--- a/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
+++ b/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
@@ -4,22 +4,22 @@
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.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.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 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.Date;
-import java.util.List;
+import java.util.*;
@RestController
@RequestMapping(value = "/purchase")
@@ -34,6 +34,30 @@
@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";
+
/**
* 閲囪喘鐢宠
* <p>
@@ -47,11 +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"));
@@ -66,37 +97,61 @@
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涓虹┖");
- 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);
- }
+ //璋冩暣涓篶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);
+// }
+
/**
* 鐩存帴鍏ュ簱鎿嶄綔
* <p>
@@ -107,45 +162,5 @@
* @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_AUDITED);
- 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.setQuantity(purchaseApplyDetailPo.getPurchaseQuantity());
- purchaseApplyDetailPos.add(purchaseApplyDetailPo);
- //澧炲姞搴撳瓨
- ResourceStorePo resourceStorePo = new ResourceStorePo();
- resourceStorePo.setResId(purchaseApplyDetailPo.getResId());
- resourceStorePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
- resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
- }
- purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
- return purchaseApplyBMOImpl.apply(purchaseApplyPo);
- }
+
}
--
Gitblit v1.8.0