From 5553586c5c9d54492f44f0349026f90278e8f2fd Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 31 十月 2019 14:17:22 +0800
Subject: [PATCH] 区分停车费
---
ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java b/ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java
index cdcaf0b..eaf4a2a 100644
--- a/ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java
+++ b/ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java
@@ -5,6 +5,7 @@
import com.java110.core.context.IPageData;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.report.smo.fee.IListPayFeeSMO;
+import com.java110.utils.constant.FeeTypeConstant;
import com.java110.utils.constant.PrivilegeCodeConstant;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.exception.SMOException;
@@ -47,9 +48,21 @@
// Map paramMap = BeanConvertUtil.beanCovertMap(result);
// paramIn.putAll(paramMap);
- paramIn.put("storeId", result.getUserId());
+ int page = paramIn.getInteger("page");
+ int row = paramIn.getInteger("row");
+ paramIn.put("storeId", result.getStoreId());
+ paramIn.put("page", (page - 1) * row);
+ paramIn.put("row", page * row);
- String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPayFee" + mapToUrlParam(paramIn);
+ String apiUrl = "";
+ if (!paramIn.containsKey("feeTypeCd") || FeeTypeConstant.FEE_TYPE_PROPERTY.equals(paramIn.getString("feeTypeCd"))) {
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(paramIn);
+ } else if (FeeTypeConstant.FEE_TYPE_HIRE_PARKING_SPACE.equals(paramIn.getString("feeTypeCd"))) {
+ paramIn.put("feeTypeCd", "");
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
+ }else{
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(paramIn);
+ }
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, "",
--
Gitblit v1.8.0