From 4ff738f377504fe8f2296df18cf7d0123641cdd9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 17 十月 2019 22:11:03 +0800
Subject: [PATCH] 优化调用微服务时的报错

---
 WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 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 29d9112..fd16a8c 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
@@ -2,11 +2,11 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.FeeTypeConstant;
-import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.util.Assert;
-import com.java110.common.util.StringUtil;
+import com.java110.utils.constant.FeeTypeConstant;
+import com.java110.utils.constant.PrivilegeCodeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
 import com.java110.core.context.IPageData;
 import com.java110.web.core.BaseComponentSMO;
 import com.java110.web.smo.IFeeServiceSMO;
@@ -340,9 +340,9 @@
         //鏁版嵁鏍¢獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
         super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
 
-        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
-                ServiceConstant.SERVICE_API_URL + "/api/fee.queryArrearsFee",
-                HttpMethod.POST);
+        responseEntity = this.callCenterService(restTemplate, pd, "",
+                ServiceConstant.SERVICE_API_URL + "/api/fee.queryArrearsFee" + super.mapToUrlParam(paramIn),
+                HttpMethod.GET);
 
         return responseEntity;
     }
@@ -370,13 +370,17 @@
     }
 
 
-    private void validateListFee(IPageData pd){
+    private void validateListFee(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
         Assert.jsonObjectHaveKey(pd.getReqData(), "feeTypeCd", "璇锋眰鎶ユ枃涓湭鍖呭惈feeTypeCd鑺傜偣");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "row", "璇锋眰鎶ユ枃涓湭鍖呭惈row鑺傜偣");
+        Assert.jsonObjectHaveKey(pd.getReqData(), "page", "璇锋眰鎶ユ枃涓湭鍖呭惈page鑺傜偣");
 
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
         Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
         Assert.hasLength(paramIn.getString("feeTypeCd"), "鍋滆溅浣峟eeTypeCd涓嶈兘涓虹┖");
+        Assert.isInteger(paramIn.getString("row"), "row蹇呴』涓烘暟瀛�");
+        Assert.isInteger(paramIn.getString("page"), "page蹇呴』涓烘暟瀛�");
     }
 
 
@@ -479,9 +483,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