From 7c36caa1b7bb37633e95b0934957b2b75a34a621 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 04 九月 2022 18:39:10 +0800
Subject: [PATCH] 优化代码

---
 service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayOweFeeSMOImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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..5579361 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) {

--
Gitblit v1.8.0