From eca80efa8e040df44beb81d53f4478b7c3e35b7e Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 16 六月 2023 17:05:22 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayOweFeeSMOImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayOweFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayOweFeeSMOImpl.java
index 1f1e5f7..bc96c1e 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayOweFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayOweFeeSMOImpl.java
@@ -66,8 +66,14 @@
protected void validate(IPageData pd, JSONObject paramIn) {
Assert.jsonObjectHaveKey(paramIn, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId鑺傜偣");
- Assert.jsonObjectHaveKey(paramIn, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈鎴垮眿淇℃伅鑺傜偣");
Assert.jsonObjectHaveKey(paramIn, "appId", "璇锋眰鎶ユ枃涓湭鍖呭惈appId鑺傜偣");
+
+ if (!paramIn.containsKey("ownerId") && !paramIn.containsKey("roomId")) {
+ throw new IllegalArgumentException("鏈寘鍚埧灞嬫垨鑰呬笟涓�");
+ }
+ if (StringUtil.isEmpty(paramIn.getString("ownerId")) && StringUtil.isEmpty(paramIn.getString("roomId"))) {
+ throw new IllegalArgumentException("鏈寘鍚埧灞嬫垨鑰呬笟涓�");
+ }
}
@@ -91,9 +97,15 @@
payObjType = paramIn.getString("payObjType");
}
+ String ownerId = paramIn.getString("ownerId");
+ String roomId = paramIn.getString("roomId");
+
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = "/feeApi/listOweFees?page=1&row=50&communityId=" + paramIn.getString("communityId") + "&payObjId=" + paramIn.getString("roomId") + "&payObjType=" + payObjType;
+ String url = "/feeApi/listOweFees?page=1&row=50&communityId=" + paramIn.getString("communityId") + "&payObjId=" + roomId + "&payObjType=" + payObjType;
+ if(!StringUtil.isEmpty(ownerId)){
+ url = "/feeApi/listOweFees?page=1&row=50&communityId=" + paramIn.getString("communityId") + "&ownerId=" + ownerId;
+ }
responseEntity = super.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -110,7 +122,7 @@
BigDecimal tmpMoney = new BigDecimal(money);
BigDecimal feePrice = null;
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
- feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feePrice"));
+ feePrice = new BigDecimal(fees.getJSONObject(feeIndex).getDouble("feeTotalPrice"));
tmpMoney = tmpMoney.add(feePrice);
}
--
Gitblit v1.8.0