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/RoomServiceSMOImpl.java | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/RoomServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/RoomServiceSMOImpl.java
index f88bce8..0638bcc 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/RoomServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/RoomServiceSMOImpl.java
@@ -1,11 +1,13 @@
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.FeeTypeConstant;
+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.IRoomServiceSMO;
@@ -17,6 +19,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;
/**
* 鎴垮眿鏈嶅姟瀹炵幇绫�
@@ -117,6 +122,43 @@
responseEntity = this.callCenterService(restTemplate, pd, "",
apiUrl,
HttpMethod.GET);
+
+ //fee.queryFee
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+
+ JSONObject roomInfo = JSONObject.parseObject(responseEntity.getBody().toString());
+ JSONArray rooms = roomInfo.getJSONArray("rooms");
+
+ Map feeMap = null;
+ JSONObject resultFeeInfo = null;
+ JSONObject roomObj = null;
+ for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
+ roomObj = rooms.getJSONObject(roomIndex);
+ feeMap = new HashMap();
+ feeMap.put("communityId", communityId);
+ feeMap.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
+ feeMap.put("roomId", roomObj.getString("roomId"));
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.queryFee" + 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());
+ roomObj.putAll(resultFeeInfo);
+
+ }
+
+ responseEntity = new ResponseEntity(roomInfo.toJSONString(), HttpStatus.OK);
+
return responseEntity;
}
@@ -338,6 +380,7 @@
/**
* 鏍￠獙鏍规嵁涓氫富鏌ヨ鎴垮眿淇℃伅
+ *
* @param pd 椤甸潰鏁版嵁灏佽
*/
private void validateListRoomByOwner(IPageData pd) {
@@ -383,11 +426,11 @@
Assert.jsonObjectHaveKey(pd.getReqData(), "unitId", "璇锋眰鎶ユ枃涓湭鍖呭惈unitId鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "roomNum", "璇锋眰鎶ユ枃涓湭鍖呭惈roomNum鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "layer", "璇锋眰鎶ユ枃涓湭鍖呭惈layer鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "section", "璇锋眰鎶ユ枃涓湭鍖呭惈section鑺傜偣");
+ /*Assert.jsonObjectHaveKey(pd.getReqData(), "section", "璇锋眰鎶ユ枃涓湭鍖呭惈section鑺傜偣");*/
Assert.jsonObjectHaveKey(pd.getReqData(), "apartment", "璇锋眰鎶ユ枃涓湭鍖呭惈apartment鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "builtUpArea", "璇锋眰鎶ユ枃涓湭鍖呭惈builtUpArea鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "unitPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈unitPrice鑺傜偣");
+ /*Assert.jsonObjectHaveKey(pd.getReqData(), "unitPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈unitPrice鑺傜偣");*/
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
Assert.hasLength(reqJson.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
@@ -395,9 +438,9 @@
Assert.isMoney(reqJson.getString("builtUpArea"), "寤虹瓚闈㈢Н鏁版嵁鏍煎紡閿欒");
Assert.isMoney(reqJson.getString("unitPrice"), "鎴垮眿鍗曚环鏁版嵁鏍煎紡閿欒");
- if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
+ /* if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
throw new IllegalArgumentException("涓嶆槸鏈夋晥鎴垮眿鎴峰瀷 浼犲叆鏁版嵁閿欒");
- }
+ }*/
if (!"2001".equals(reqJson.getString("state"))
&& !"2002".equals(reqJson.getString("state"))
--
Gitblit v1.8.0