From 263d34e9027ed2fe109b257fc9db77af3f3a1b5e Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期六, 08 六月 2019 11:50:20 +0800
Subject: [PATCH] 车位出售周期为空导致空指针异常处理
---
WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java | 129 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 126 insertions(+), 3 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
index 71ab4f1..cd7b86c 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
@@ -32,7 +32,7 @@
private RestTemplate restTemplate;
@Override
- public ResponseEntity<String> loadPropertyConfigFee(IPageData pd) {
+ public ResponseEntity<String> loadPropertyConfigFee(IPageData pd, String feeTypeCd) {
validateLoadPropertyConfigFee(pd);
//鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
@@ -51,7 +51,7 @@
String storeTypeCd = JSONObject.parseObject(responseEntity.getBody().toString()).getString("storeTypeCd");
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
- paramIn.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
+ paramIn.put("feeTypeCd", feeTypeCd);
responseEntity = this.callCenterService(restTemplate, pd, "",
ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeConfig" + mapToUrlParam(paramIn),
HttpMethod.GET);
@@ -65,7 +65,7 @@
return responseEntity;
}
- if (feeConfigs != null) {
+ if (feeConfigs != null && feeConfigs.size() > 0) {
responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(feeConfigs.get(0)), HttpStatus.OK);
} else {
responseEntity = new ResponseEntity<String>("{}", HttpStatus.OK);
@@ -75,6 +75,90 @@
return responseEntity;
}
+
+ @Override
+ public ResponseEntity<String> payFee(IPageData pd) {
+ validatePayFee(pd);
+
+ //鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_PROPERTY_FEE);
+
+ 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);
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+ ServiceConstant.SERVICE_API_URL + "/api/fee.payFee",
+ HttpMethod.POST);
+
+
+ return responseEntity;
+ }
+
+ /**
+ * 鏌ヨ涓昏垂鐢�
+ * @param pd 椤甸潰鏁版嵁灏佽瀵硅薄
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> loadFeeByRoomId(IPageData pd) {
+ validateLoadFee(pd);
+
+ //鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_PROPERTY_CONFIG_FEE);
+
+ 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);
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/fee.queryFee" + mapToUrlParam(paramIn),
+ HttpMethod.GET);
+ return responseEntity;
+ }
+
+ @Override
+ public ResponseEntity<String> loadFeeDetail(IPageData pd) {
+ validateLoadFeeDetail(pd);
+
+ //鏍￠獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
+ super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_PROPERTY_FEE);
+
+ 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);
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeDetail" + mapToUrlParam(paramIn),
+ HttpMethod.GET);
+ return responseEntity; }
/**
* @param pd 椤甸潰鏁版嵁灏佽瀵硅薄
@@ -115,6 +199,45 @@
}
+
+ private void validateLoadFee(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "feeTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈feeTypeCd鑺傜偣");
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("roomId"), "鎴垮眿ID涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("feeTypeCd"), "璐圭敤绫诲瀷涓嶈兘涓虹┖");
+ }
+
+ /**
+ * 鏍￠獙缂磋垂鍙傛暟
+ * @param pd
+ */
+ private void validatePayFee(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "cycles", "璇锋眰鎶ユ枃涓湭鍖呭惈cycles鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "receivedAmount", "璇锋眰鎶ユ枃涓湭鍖呭惈receivedAmount鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeId鑺傜偣");
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("cycles"), "鍛ㄦ湡涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("receivedAmount"), "瀹炴敹閲戦涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("feeId"), "璐圭敤ID涓嶈兘涓虹┖");
+ }
+
+
+ private void validateLoadFeeDetail(IPageData pd) {
+ Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId鑺傜偣");
+
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
+ Assert.hasLength(paramIn.getString("feeId"), "璐圭敤ID涓嶈兘涓虹┖");
+ }
+
/**
* 灏忓尯鎴垮眿鏌ヨ鏁版嵁鏍￠獙
*
--
Gitblit v1.8.0