From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/impl/FrontFeeServiceSMOImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/impl/FrontFeeServiceSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/impl/FrontFeeServiceSMOImpl.java
old mode 100644
new mode 100755
index 9bea7a1..4bafd5d
--- a/service-front/src/main/java/com/java110/front/smo/impl/FrontFeeServiceSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/impl/FrontFeeServiceSMOImpl.java
@@ -131,6 +131,11 @@
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) {
@@ -405,11 +410,11 @@
private void validateLoadFeeDetail(IPageData pd) {
Assert.jsonObjectHaveKey(pd.getReqData(), "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId鑺傜偣");
+ //Assert.jsonObjectHaveKey(pd.getReqData(), "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeId鑺傜偣");
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
Assert.hasLength(paramIn.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
- Assert.hasLength(paramIn.getString("feeId"), "璐圭敤ID涓嶈兘涓虹┖");
+ //Assert.hasLength(paramIn.getString("feeId"), "璐圭敤ID涓嶈兘涓虹┖");
}
/**
@@ -477,13 +482,13 @@
Assert.jsonObjectHaveKey(pd.getReqData(), "apartment", "璇锋眰鎶ユ枃涓湭鍖呭惈apartment鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "builtUpArea", "璇锋眰鎶ユ枃涓湭鍖呭惈builtUpArea鑺傜偣");
Assert.jsonObjectHaveKey(pd.getReqData(), "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state鑺傜偣");
- Assert.jsonObjectHaveKey(pd.getReqData(), "unitPrice", "璇锋眰鎶ユ枃涓湭鍖呭惈unitPrice鑺傜偣");
+ Assert.jsonObjectHaveKey(pd.getReqData(), "feeCoefficient", "璇锋眰鎶ユ枃涓湭鍖呭惈feeCoefficient鑺傜偣");
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
Assert.hasLength(reqJson.getString("communityId"), "灏忓尯ID涓嶈兘涓虹┖");
Assert.isInteger(reqJson.getString("section"), "鎴块棿鏁颁笉鏄湁鏁堟暟瀛�");
Assert.isMoney(reqJson.getString("builtUpArea"), "寤虹瓚闈㈢Н鏁版嵁鏍煎紡閿欒");
- Assert.isMoney(reqJson.getString("unitPrice"), "鎴垮眿鍗曚环鏁版嵁鏍煎紡閿欒");
+ Assert.isMoney(reqJson.getString("feeCoefficient"), "绠楄垂绯绘暟鏁版嵁鏍煎紡閿欒");
/* if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
throw new IllegalArgumentException("涓嶆槸鏈夋晥鎴垮眿鎴峰瀷 浼犲叆鏁版嵁閿欒");
--
Gitblit v1.8.0