From 1894ced0dbff98c9429cf6db5712c5687e8d7637 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 07 一月 2020 00:13:42 +0800
Subject: [PATCH] 人脸采集上传成功

---
 WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 50 insertions(+), 8 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 a8f1fc3..8476d04 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,13 +2,13 @@
 
 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.core.component.BaseComponentSMO;
 import com.java110.web.smo.IFeeServiceSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -319,6 +319,34 @@
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> listArrearsFee(IPageData pd) {
+        validateListFee(pd);
+
+        //鏍¢獙鍛樺伐鏄惁鏈夋潈闄愭搷浣�
+        //super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_PARKING_SPACE_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.queryArrearsFee" + super.mapToUrlParam(paramIn),
+                HttpMethod.GET);
+
+        return responseEntity;
+    }
+
 
     private void validateLoadFee(IPageData pd) {
         Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
@@ -339,6 +367,20 @@
         JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
         Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
         Assert.hasLength(paramIn.getString("psId"), "鍋滆溅浣岻D涓嶈兘涓虹┖");
+    }
+
+
+    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蹇呴』涓烘暟瀛�");
     }
 
 
@@ -441,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