Skip to content

Commit 6c41b26

Browse files
吴学文吴学文
吴学文
authored and
吴学文
committed
修复首页欠费信息查询时 未展示问题
1 parent 7511645 commit 6c41b26

5 files changed

Lines changed: 32 additions & 14 deletions

File tree

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public void soService(ServiceDataFlowEvent event) {
7979
//获取请求数据
8080
JSONObject reqJson = dataFlowContext.getReqJson();
8181
validateFeeData(reqJson);
82+
8283
FeeDto feeDtoParamIn = BeanConvertUtil.covertBean(reqJson, FeeDto.class);
8384
feeDtoParamIn.setArrearsEndTime(DateUtil.getCurrentDate());
8485

@@ -89,10 +90,16 @@ public void soService(ServiceDataFlowEvent event) {
8990
FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE});
9091
}
9192

93+
int page = reqJson.getInteger("page");
94+
int row = reqJson.getInteger("row");
95+
9296
int feeCount = feeInnerServiceSMOImpl.queryFeesCount(feeDtoParamIn);
97+
ApiArrearsFeeVo apiArrearsFeeVo = new ApiArrearsFeeVo();
98+
apiArrearsFeeVo.setTotal(feeCount);
99+
apiArrearsFeeVo.setRecords((int) Math.ceil((double) feeCount / (double) row));
93100
ResponseEntity<String> responseEntity = null;
94101
if (feeCount == 0) {
95-
responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(new ApiArrearsFeeVo()), HttpStatus.OK);
102+
responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiArrearsFeeVo), HttpStatus.OK);
96103
dataFlowContext.setResponseEntity(responseEntity);
97104
return;
98105
}
@@ -116,8 +123,9 @@ public void soService(ServiceDataFlowEvent event) {
116123
freshParkingSpaceAndOwnerData(apiFeeVo, ownerDtos);
117124
}
118125

126+
apiArrearsFeeVo.setArrears(apiFeeVo);
119127

120-
responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiFeeVo), HttpStatus.OK);
128+
responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiArrearsFeeVo), HttpStatus.OK);
121129

122130

123131
dataFlowContext.setResponseEntity(responseEntity);
@@ -169,6 +177,12 @@ private void freshParkingSpaceAndOwnerData(List<ApiArrearsFeeDataVo> apiFeeVos,
169177
private void validateFeeData(JSONObject reqJson) {
170178
Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
171179
Assert.jsonObjectHaveKey(reqJson, "feeTypeCd", "请求中未包含feeTypeCd信息");
180+
Assert.jsonObjectHaveKey(reqJson, "page", "请求中未包含page信息");
181+
Assert.jsonObjectHaveKey(reqJson, "row", "请求中未包含row信息");
182+
183+
184+
Assert.isInteger(reqJson.getString("row"), "row必须为数字");
185+
Assert.isInteger(reqJson.getString("page"), "page必须为数字");
172186

173187
}
174188

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ private void validateFloorData(JSONObject reqJson) {
8585
Assert.jsonObjectHaveKey(reqJson, "page", "请求中未包含page信息");
8686
Assert.jsonObjectHaveKey(reqJson, "row", "请求中未包含page信息");
8787
Assert.jsonObjectHaveKey(reqJson, "communityId", "请求中未包含communityId信息");
88-
Assert.isInteger(reqJson.getString("page"), "不是有效数字");
89-
Assert.isInteger(reqJson.getString("row"), "不是有效数字");
88+
Assert.isInteger(reqJson.getString("page"), "page不是有效数字");
89+
Assert.isInteger(reqJson.getString("row"), "row不是有效数字");
9090

9191
}
9292

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,9 @@ public ResponseEntity<String> listArrearsFee(IPageData pd) {
340340
//数据校验是否 商户是否入驻该小区
341341
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
342342

343-
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
344-
ServiceConstant.SERVICE_API_URL + "/api/fee.queryArrearsFee",
345-
HttpMethod.POST);
343+
responseEntity = this.callCenterService(restTemplate, pd, "",
344+
ServiceConstant.SERVICE_API_URL + "/api/fee.queryArrearsFee" + super.mapToUrlParam(paramIn),
345+
HttpMethod.GET);
346346

347347
return responseEntity;
348348
}
@@ -370,13 +370,17 @@ private void validateLoadParkingSpaceFee(IPageData pd) {
370370
}
371371

372372

373-
private void validateListFee(IPageData pd){
373+
private void validateListFee(IPageData pd) {
374374
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "请求报文中未包含communityId节点");
375375
Assert.jsonObjectHaveKey(pd.getReqData(), "feeTypeCd", "请求报文中未包含feeTypeCd节点");
376+
Assert.jsonObjectHaveKey(pd.getReqData(), "row", "请求报文中未包含row节点");
377+
Assert.jsonObjectHaveKey(pd.getReqData(), "page", "请求报文中未包含page节点");
376378

377379
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
378380
Assert.hasLength(paramIn.getString("communityId"), "小区ID不能为空");
379381
Assert.hasLength(paramIn.getString("feeTypeCd"), "停车位feeTypeCd不能为空");
382+
Assert.isInteger("row", "row必须为数字");
383+
Assert.isInteger("page", "page必须为数字");
380384
}
381385

382386

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h5>欠费信息</h5>
2525
</tr>
2626
</thead>
2727
<tbody>
28-
<tr v-for="arr in arrears">
28+
<tr v-for="arr in indexArrearsInfo.arrears">
2929
<td>{{arr.feeId}}</td>
3030
<td>{{arr.ownerName}}</td>
3131
<td>{{arr.tel}}</td>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@
1111
}
1212
},
1313
_initMethod:function(){
14-
vc.component._listArrearsData();
14+
vc.component._listArrearsData(DEFAULT_PAGE,DEFAULT_ROWS);
1515
},
1616
_initEvent:function(){
1717
vc.on("indexArrears","_listArrearsData",function(){
18-
vc.component._listArrearsData();
18+
vc.component._listArrearsData(DEFAULT_PAGE,DEFAULT_ROWS);
1919
});
2020
},
2121
methods:{
2222
_listArrearsData:function(_page,_row){
23-
if(!vc.getCurrentCommunity().hasOwnProperty('communityId')){
23+
if(vc.getCurrentCommunity() == null || vc.getCurrentCommunity == undefined){
2424
return ;
2525
}
2626
var param = {
2727
params:{
2828
page:_page,
2929
row:_row,
3030
communityId:vc.getCurrentCommunity().communityId,
31-
feeTypeCd:vc.indexArrearsInfo.feeTypeCd
31+
feeTypeCd:vc.component.indexArrearsInfo.feeTypeCd
3232
}
3333
}
3434

@@ -55,7 +55,7 @@
5555
},
5656
_switchFeeType:function(_feeTypeCd){
5757
vc.component.indexArrearsInfo.feeTypeCd = _feeTypeCd;
58-
vc.component._listArrearsData();
58+
vc.component._listArrearsData(DEFAULT_PAGE,DEFAULT_ROWS);
5959
}
6060
}
6161
})

0 commit comments

Comments
 (0)