From 03ec498fc3e75037372052a97dad897662d19c70 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期六, 01 六月 2019 22:36:01 +0800
Subject: [PATCH] 费用配置服务配置错误修改
---
WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
index 3a3dc4f..71ab4f1 100644
--- a/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java
@@ -4,16 +4,12 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.common.constant.FeeTypeConstant;
import com.java110.common.constant.PrivilegeCodeConstant;
-import com.java110.common.constant.ResponseConstant;
import com.java110.common.constant.ServiceConstant;
-import com.java110.common.exception.SMOException;
import com.java110.common.util.Assert;
-import com.java110.common.util.CommonUtil;
import com.java110.common.util.StringUtil;
import com.java110.core.context.IPageData;
import com.java110.web.core.BaseComponentSMO;
import com.java110.web.smo.IFeeServiceSMO;
-import com.java110.web.smo.IRoomServiceSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,19 +52,22 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
paramIn.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
- responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
- ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeConfig",
+ responseEntity = this.callCenterService(restTemplate, pd, "",
+ ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeConfig" + mapToUrlParam(paramIn),
HttpMethod.GET);
-
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
JSONArray feeConfigs = JSONArray.parseArray(responseEntity.getBody().toString());
- if(feeConfigs != null && feeConfigs.size() > 1){
+
+ if (feeConfigs != null && feeConfigs.size() > 1) {
responseEntity = new ResponseEntity<String>("鏁版嵁寮傚父锛岃妫�鏌ラ厤缃暟鎹�", HttpStatus.BAD_REQUEST);
return responseEntity;
}
- if(feeConfigs != null) {
+ if (feeConfigs != null) {
responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(feeConfigs.get(0)), HttpStatus.OK);
- }else{
+ } else {
responseEntity = new ResponseEntity<String>("{}", HttpStatus.OK);
}
@@ -78,7 +77,6 @@
}
/**
- *
* @param pd 椤甸潰鏁版嵁灏佽瀵硅薄
* @return
*/
@@ -103,11 +101,11 @@
//鏁版嵁鏍￠獙鏄惁 鍟嗘埛鏄惁鍏ラ┗璇ュ皬鍖�
super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
paramIn.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
- if(!paramIn.containsKey("configId") || StringUtil.isEmpty(paramIn.getString("configId"))) {
+ if (!paramIn.containsKey("configId") || StringUtil.isEmpty(paramIn.getString("configId"))) {
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/fee.saveFeeConfig",
HttpMethod.POST);
- }else{
+ } else {
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
ServiceConstant.SERVICE_API_URL + "/api/fee.updateFeeConfig",
HttpMethod.POST);
@@ -131,9 +129,10 @@
/**
* 鏍￠獙鏁版嵁鍚堟硶鎬�
+ *
* @param pd
*/
- private void validateSaveOrUpdatePropertyFeeConfig(IPageData pd){
+ private void validateSaveOrUpdatePropertyFeeConfig(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "squarePrice", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "additionalAmount", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
--
Gitblit v1.8.0