From b949123acd810812781c1dc15843a44fb974073f Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 03 二月 2020 14:14:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ReportComponent/src/main/java/com/java110/report/smo/fee/impl/ListPayFeeSMOImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 f66f510..4e52e3d 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;
@@ -50,10 +51,17 @@
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);
+ 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("payObjType") || "3333".equals(paramIn.getString("payObjType"))) {
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(paramIn);
+ } else if ("6666".equals(paramIn.getString("payObjType"))) {
+ 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