From da346adeebe3e737e91cbc9740e7aa65ee9dccf7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 19 十月 2019 22:44:56 +0800
Subject: [PATCH] 派单 bug 修复
---
WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java | 137 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 132 insertions(+), 5 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java
index baaa4c5..8d4be0d 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/PackingSpaceServiceSMOImpl.java
@@ -1,11 +1,12 @@
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;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.exception.SMOException;
-import com.java110.common.util.Assert;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.exception.SMOException;
+import com.java110.utils.util.Assert;
import com.java110.core.context.IPageData;
import com.java110.web.core.BaseComponentSMO;
import com.java110.web.smo.IParkingSpaceServiceSMO;
@@ -17,6 +18,9 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* 灏忓尯妤煎疄鐜扮被
@@ -173,6 +177,114 @@
return responseEntity;
}
+ @Override
+ public ResponseEntity<String> listParkingSpaceByOwner(IPageData pd) {
+ validateListParkingSpaceByOwner(pd);
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ String communityId = paramIn.getString("communityId");
+
+ //鏍￠獙鐢ㄦ埛鏄惁鏈夋潈闄�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_PARKING_SPACE_FOR_OWNER);
+
+ ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
+
+ String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+ String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
+ //鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
+ super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
+ String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.queryParkingSpacesByOwner" + mapToUrlParam(paramIn);
+
+
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ apiUrl,
+ HttpMethod.GET);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+
+ JSONObject psInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ JSONArray pss = psInfo.getJSONArray("parkingSpaces");
+
+ Map feeMap = null;
+ JSONObject resultFeeInfo = null;
+ JSONObject psObj = null;
+ for (int roomIndex = 0; roomIndex < pss.size(); roomIndex++) {
+ psObj = pss.getJSONObject(roomIndex);
+ feeMap = new HashMap();
+ feeMap.put("communityId", communityId);
+ feeMap.put("psId", psObj.getString("psId"));
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeByParkingSpace" + mapToUrlParam(feeMap);
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ apiUrl,
+ HttpMethod.GET);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ //throw new SMOException(ResponseConstant.RESULT_CODE_ERROR, "褰撳墠鎴垮眿[" + roomObj.getString("roomNum") + "]娌℃湁鐗╀笟璐逛俊鎭紝鏁版嵁閿欒");
+
+ continue;
+ }
+
+ resultFeeInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ psObj.putAll(resultFeeInfo);
+
+ }
+
+ responseEntity = new ResponseEntity(psInfo.toJSONString(), HttpStatus.OK);
+
+ return responseEntity;
+ }
+
+ @Override
+ public ResponseEntity<String> exitParkingSpace(IPageData pd) {
+ validateExitParkingSpace(pd);
+ //鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_OWNER_ROOM);
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ String communityId = paramIn.getString("communityId");
+ ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeId", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛ID澶辫触锛屾湭鍖呭惈storeId鑺傜偣");
+ Assert.jsonObjectHaveKey(responseEntity.getBody().toString(), "storeTypeCd", "鏍规嵁鐢ㄦ埛ID鏌ヨ鍟嗘埛绫诲瀷澶辫触锛屾湭鍖呭惈storeTypeCd鑺傜偣");
+
+ String storeId = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeId");
+ 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(),
+ ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.exitParkingSpace",
+ HttpMethod.POST);
+
+ return responseEntity;
+ }
+
+ /**
+ * 鏁版嵁鍚堣鎬ф牎楠�
+ * @param pd 椤甸潰鏁版嵁灏佽
+ */
+ private void validateExitParkingSpace(IPageData pd) {
+
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "psId", "璇锋眰鎶ユ枃涓湭鍖呭惈psId鑺傜偣");
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("ownerId"), "ownerId涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("psId"), "psId涓嶈兘涓虹┖");
+ }
+
+
/**
* 鍒犻櫎灏忓尯妤� 鏍￠獙
*
@@ -233,6 +345,21 @@
}
+ /**
+ * 鏍￠獙鏌ヨ灏忓尯妤间俊鎭�
+ *
+ * @param pd 椤甸潰灏佽瀵硅薄
+ */
+ private void validateListParkingSpaceByOwner(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerId鑺傜偣");
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("ownerId"), "涓氫富ID涓嶈兘涓虹┖");
+
+
+ }
+
public RestTemplate getRestTemplate() {
--
Gitblit v1.8.0