修复首页欠费信息查询时 未展示问题

Author: 吴学文

Api/src/main/java/com/java110/api/listener/fee/QueryArrearsFeeListener.java

@@ -79,6 +79,7 @@ public void soService(ServiceDataFlowEvent event) {
         //获取请求数据
         JSONObject reqJson = dataFlowContext.getReqJson();
         validateFeeData(reqJson);
+
         FeeDto feeDtoParamIn = BeanConvertUtil.covertBean(reqJson, FeeDto.class);
         feeDtoParamIn.setArrearsEndTime(DateUtil.getCurrentDate());
 
@@ -89,10 +90,16 @@ public void soService(ServiceDataFlowEvent event) {
                     FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE});
         }
 
+        int page = reqJson.getInteger("page");
+        int row = reqJson.getInteger("row");
+
         int feeCount = feeInnerServiceSMOImpl.queryFeesCount(feeDtoParamIn);
+        ApiArrearsFeeVo apiArrearsFeeVo = new ApiArrearsFeeVo();
+        apiArrearsFeeVo.setTotal(feeCount);
+        apiArrearsFeeVo.setRecords((int) Math.ceil((double) feeCount / (double) row));
         ResponseEntity<String> responseEntity = null;
         if (feeCount == 0) {
-            responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(new ApiArrearsFeeVo()), HttpStatus.OK);
+            responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiArrearsFeeVo), HttpStatus.OK);
             dataFlowContext.setResponseEntity(responseEntity);
             return;
         }
@@ -116,8 +123,9 @@ public void soService(ServiceDataFlowEvent event) {
             freshParkingSpaceAndOwnerData(apiFeeVo, ownerDtos);
         }
 
+        apiArrearsFeeVo.setArrears(apiFeeVo);
 
-        responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiFeeVo), HttpStatus.OK);
+        responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiArrearsFeeVo), HttpStatus.OK);
 
 
         dataFlowContext.setResponseEntity(responseEntity);
@@ -169,6 +177,12 @@ private void freshParkingSpaceAndOwnerData(List<ApiArrearsFeeDataVo> apiFeeVos,
     private void validateFeeData(JSONObject reqJson) {
         Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
         Assert.jsonObjectHaveKey(reqJson, "feeTypeCd", "请求中未包含feeTypeCd信息");
+        Assert.jsonObjectHaveKey(reqJson, "page", "请求中未包含page信息");
+        Assert.jsonObjectHaveKey(reqJson, "row", "请求中未包含row信息");
+
+
+        Assert.isInteger(reqJson.getString("row"), "row必须为数字");
+        Assert.isInteger(reqJson.getString("page"), "page必须为数字");
 
     }
 

Api/src/main/java/com/java110/api/listener/floor/QueryFloorsListener.java

@@ -85,8 +85,8 @@ private void validateFloorData(JSONObject reqJson) {
         Assert.jsonObjectHaveKey(reqJson, "page", "请求中未包含page信息");
         Assert.jsonObjectHaveKey(reqJson, "row", "请求中未包含page信息");
         Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
-        Assert.isInteger(reqJson.getString("page"), "不是有效数字");
-        Assert.isInteger(reqJson.getString("row"), "不是有效数字");
+        Assert.isInteger(reqJson.getString("page"), "page不是有效数字");
+        Assert.isInteger(reqJson.getString("row"), "row不是有效数字");
 
     }
 

WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java

@@ -340,9 +340,9 @@ public ResponseEntity<String> listArrearsFee(IPageData pd) {
         //数据校验是否 商户是否入驻该小区
         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 validateLoadParkingSpaceFee(IPageData pd) {
     }
 
 
-    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"), "停车位feeTypeCd不能为空");
+        Assert.isInteger("row", "row必须为数字");
+        Assert.isInteger("page", "page必须为数字");
     }
 
 

WebService/src/main/resources/components/index-arrears/indexArrears.html

@@ -25,7 +25,7 @@ <h5>欠费信息</h5>
                         </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="arr in arrears">
+                        <tr v-for="arr in indexArrearsInfo.arrears">
                             <td>{{arr.feeId}}</td>
                             <td>{{arr.ownerName}}</td>
                             <td>{{arr.tel}}</td>

WebService/src/main/resources/components/index-arrears/indexArrears.js

@@ -11,24 +11,24 @@
             }
         },
         _initMethod:function(){
-            vc.component._listArrearsData();
+            vc.component._listArrearsData(DEFAULT_PAGE,DEFAULT_ROWS);
         },
         _initEvent:function(){
             vc.on("indexArrears","_listArrearsData",function(){
-                vc.component._listArrearsData();
+                vc.component._listArrearsData(DEFAULT_PAGE,DEFAULT_ROWS);
             });
         },
         methods:{
             _listArrearsData:function(_page,_row){
-                if(!vc.getCurrentCommunity().hasOwnProperty('communityId')){
+                if(vc.getCurrentCommunity() == null || vc.getCurrentCommunity == undefined){
                     return ;
                 }
                 var param = {
                     params:{
                         page:_page,
                         row:_row,
                         communityId:vc.getCurrentCommunity().communityId,
-                        feeTypeCd:vc.indexArrearsInfo.feeTypeCd
+                        feeTypeCd:vc.component.indexArrearsInfo.feeTypeCd
                     }
                 }
 
@@ -55,7 +55,7 @@
             },
             _switchFeeType:function(_feeTypeCd){
                 vc.component.indexArrearsInfo.feeTypeCd = _feeTypeCd;
-                vc.component._listArrearsData();
+                vc.component._listArrearsData(DEFAULT_PAGE,DEFAULT_ROWS);
             }
         }
     })