From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/impl/FrontFeeServiceSMOImpl.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/impl/FrontFeeServiceSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/impl/FrontFeeServiceSMOImpl.java
index 8ea8cbb..bc04a5b 100644
--- a/service-api/src/main/java/com/java110/api/smo/impl/FrontFeeServiceSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/impl/FrontFeeServiceSMOImpl.java
@@ -12,7 +12,7 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
@@ -55,7 +55,7 @@
paramIn.put("feeTypeCd", feeTypeCd);
}
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/feeConfig.listFeeConfigs" + mapToUrlParam(paramIn),
+ "feeConfig.listFeeConfigs" + mapToUrlParam(paramIn),
HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
@@ -98,7 +98,7 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeConfig" + mapToUrlParam(paramIn),
+ "fee.queryFeeConfig" + mapToUrlParam(paramIn),
HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
@@ -127,11 +127,6 @@
super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.PRIVILEGE_PROPERTY_FEE);
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
- String remark = paramIn.getString("remark");
- if(!StringUtil.isEmpty(remark)){
- remark="-"+remark;
- }
- paramIn.put("remark", "鐜板満鏀堕摱鍙版敮浠�" + remark);
String communityId = paramIn.getString("communityId");
ResponseEntity responseEntity = super.getStoreInfo(pd, restTemplate);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -145,7 +140,7 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
- ServiceConstant.SERVICE_API_URL + "/api/fee.payFee",
+ "fee.payFee",
HttpMethod.POST);
return responseEntity;
}
@@ -177,7 +172,7 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/fee.queryFee" + mapToUrlParam(paramIn),
+ "fee.queryFee" + mapToUrlParam(paramIn),
HttpMethod.GET);
return responseEntity;
}
@@ -210,7 +205,7 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeByParkingSpace" + mapToUrlParam(paramIn),
+ "fee.queryFeeByParkingSpace" + mapToUrlParam(paramIn),
HttpMethod.GET);
return responseEntity;
}
@@ -236,7 +231,7 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeDetail" + mapToUrlParam(paramIn),
+ "fee.queryFeeDetail" + mapToUrlParam(paramIn),
HttpMethod.GET);
return responseEntity;
}
@@ -268,11 +263,11 @@
paramIn.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
if (!paramIn.containsKey("configId") || StringUtil.isEmpty(paramIn.getString("configId"))) {
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
- ServiceConstant.SERVICE_API_URL + "/api/fee.saveFeeConfig",
+ "fee.saveFeeConfig",
HttpMethod.POST);
} else {
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
- ServiceConstant.SERVICE_API_URL + "/api/fee.updateFeeConfig",
+ "fee.updateFeeConfig",
HttpMethod.POST);
}
@@ -307,11 +302,11 @@
if (!paramIn.containsKey("configId") || StringUtil.isEmpty(paramIn.getString("configId"))) {
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
- ServiceConstant.SERVICE_API_URL + "/api/fee.saveFeeConfig",
+ "fee.saveFeeConfig",
HttpMethod.POST);
} else {
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
- ServiceConstant.SERVICE_API_URL + "/api/fee.updateFeeConfig",
+ "fee.updateFeeConfig",
HttpMethod.POST);
}
@@ -340,7 +335,7 @@
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
responseEntity = this.callCenterService(restTemplate, pd, "",
- ServiceConstant.SERVICE_API_URL + "/api/fee.queryArrearsFee" + super.mapToUrlParam(paramIn),
+ "fee.queryArrearsFee" + super.mapToUrlParam(paramIn),
HttpMethod.GET);
return responseEntity;
--
Gitblit v1.8.0