From 532cb653224245d90ef314bff6d065bf0d0003ae Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 14 九月 2019 23:20:28 +0800
Subject: [PATCH] 优化 停车位出租
---
WebService/src/main/java/com/java110/web/smo/impl/CarServiceSMOImpl.java | 89 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 21 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/CarServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/CarServiceSMOImpl.java
index 10b593c..762bf65 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/CarServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/CarServiceSMOImpl.java
@@ -1,5 +1,6 @@
package com.java110.web.smo.impl;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.PrivilegeCodeConstant;
import com.java110.common.constant.ResponseConstant;
@@ -90,6 +91,8 @@
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_CAR);
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+
+ JSONArray infos = paramIn.getJSONArray("data");
String communityId = paramIn.getString("communityId");
ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -102,9 +105,20 @@
String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
- paramIn.put("userId", pd.getUserId());
- paramIn.put("storeId", storeId);
- responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+
+ JSONObject viewSelectParkingSpace = this.getObj(infos,"viewSelectParkingSpace");
+ JSONObject viewOwnerInfo = this.getObj(infos,"viewOwnerInfo");
+ JSONObject addCar = this.getObj(infos,"addCar");
+ JSONObject hireParkingSpaceFee = this.getObj(infos,"hireParkingSpaceFee");
+ JSONObject newParamIn = new JSONObject();
+ newParamIn.putAll(addCar);
+ newParamIn.putAll(hireParkingSpaceFee);
+ newParamIn.put("communityId", communityId);
+ newParamIn.put("ownerId", viewOwnerInfo.getString("ownerId"));
+ newParamIn.put("psId", viewSelectParkingSpace.getString("psId"));
+ newParamIn.put("userId", pd.getUserId());
+ newParamIn.put("storeId", storeId);
+ responseEntity = this.callCenterService(restTemplate, pd, newParamIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.sellParkingSpace",
HttpMethod.POST);
@@ -221,29 +235,43 @@
private void validateSaveCar(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "鏈寘鍚皬鍖篒D");
- Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈carNum");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carBrand", "璇锋眰鎶ユ枃涓湭鍖呭惈carBrand");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carType", "璇锋眰鎶ユ枃涓湭鍖呭惈carType");
- Assert.jsonObjectHaveKey(pd.getReqData(), "carColor", "鏈寘鍚玞arColor");
- Assert.jsonObjectHaveKey(pd.getReqData(), "psId", "鏈寘鍚玴sId");
- Assert.jsonObjectHaveKey(pd.getReqData(), "receivedAmount", "鏈寘鍚玶eceivedAmount");
- Assert.jsonObjectHaveKey(pd.getReqData(), "sellOrHire", "鏈寘鍚玸ellOrHire");
- JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
- Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("ownerId"), "ownerId涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("psId"), "psId涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("receivedAmount"), "receivedAmount涓嶈兘涓虹┖");
+ JSONObject info = JSONObject.parseObject(pd.getReqData());
- if(!"H".equals(paramIn.getString("sellOrHire"))
- && !"S".equals(paramIn.getString("sellOrHire"))){
+ JSONArray infos = info.getJSONArray("data");
+
+ if(infos.size() != 4){
+ throw new IllegalArgumentException("鏁版嵁琚鏀�");
+ }
+
+ Assert.hasKeyByFlowData(infos, "viewSelectParkingSpace", "psId", "鏈寘鍚玴sId");
+ Assert.hasKeyByFlowData(infos, "viewOwnerInfo", "ownerId", "蹇呭～锛屾湭鍖呭惈涓氫富淇℃伅");
+ Assert.hasKeyByFlowData(infos, "addCar", "carNum", "璇锋眰鎶ユ枃涓湭鍖呭惈carNum");
+ Assert.hasKeyByFlowData(infos, "addCar", "carBrand", "璇锋眰鎶ユ枃涓湭鍖呭惈carBrand");
+ Assert.hasKeyByFlowData(infos, "addCar", "carType", "璇锋眰鎶ユ枃涓湭鍖呭惈carType");
+ Assert.hasKeyByFlowData(infos, "addCar", "carColor", "鏈寘鍚玞arColor");
+ Assert.hasKeyByFlowData(infos, "hireParkingSpaceFee", "receivedAmount", "鏈寘鍚玶eceivedAmount");
+ Assert.hasKeyByFlowData(infos, "hireParkingSpaceFee", "sellOrHire", "鏈寘鍚玸ellOrHire");
+
+ JSONObject viewSelectParkingSpace = this.getObj(infos,"viewSelectParkingSpace");
+ JSONObject viewOwnerInfo = this.getObj(infos,"viewOwnerInfo");
+ JSONObject addCar = this.getObj(infos,"addCar");
+ JSONObject hireParkingSpaceFee = this.getObj(infos,"hireParkingSpaceFee");
+
+
+ Assert.hasLength(info.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
+ Assert.hasLength(viewOwnerInfo.getString("ownerId"), "ownerId涓嶈兘涓虹┖");
+ Assert.hasLength(viewSelectParkingSpace.getString("psId"), "psId涓嶈兘涓虹┖");
+ Assert.hasLength(hireParkingSpaceFee.getString("receivedAmount"), "receivedAmount涓嶈兘涓虹┖");
+
+ if(!"H".equals(hireParkingSpaceFee.getString("sellOrHire"))
+ && !"S".equals(hireParkingSpaceFee.getString("sellOrHire"))){
throw new IllegalArgumentException("鍏ュ弬閿欒锛屾棤娉曡瘑鍒鎿嶄綔");
}
- if("H".equals(paramIn.getString("sellOrHire"))){
- Assert.jsonObjectHaveKey(pd.getReqData(), "cycles", "鏈寘鍚玞ycles");
- Assert.hasLength(paramIn.getString("cycles"), "cycles涓嶈兘涓虹┖");
+ if("H".equals(hireParkingSpaceFee.getString("sellOrHire"))){
+ Assert.jsonObjectHaveKey(hireParkingSpaceFee, "cycles", "鏈寘鍚玞ycles");
+ Assert.hasLength(hireParkingSpaceFee.getString("cycles"), "cycles涓嶈兘涓虹┖");
}
}
@@ -283,6 +311,25 @@
}
+ private JSONObject getObj(JSONArray infos, String flowComponent) {
+
+ JSONObject serviceInfo = null;
+
+ for (int infoIndex = 0; infoIndex < infos.size(); infoIndex++) {
+
+ Assert.hasKeyAndValue(infos.getJSONObject(infoIndex), "flowComponent", "鏈寘鍚湇鍔℃祦绋嬬粍浠跺悕绉�");
+
+ if (flowComponent.equals(infos.getJSONObject(infoIndex).getString("flowComponent"))) {
+ serviceInfo = infos.getJSONObject(infoIndex);
+ Assert.notNull(serviceInfo, "鏈寘鍚湇鍔′俊鎭�");
+ return serviceInfo;
+ }
+ }
+
+ throw new IllegalArgumentException("鏈壘鍒扮粍浠剁紪鐮佷负銆�" + flowComponent + "銆戞暟鎹�");
+ }
+
+
public RestTemplate getRestTemplate() {
return restTemplate;
}
--
Gitblit v1.8.0