From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
index 1d653e2..12e3e62 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayBatchFeeCmd.java
@@ -166,7 +166,7 @@
 
         JSONArray fees = reqJson.getJSONArray("fees");
         JSONObject paramInObj = null;
-        JSONArray datas = new JSONArray();
+        JSONArray details = new JSONArray();
         for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
             try {
                 paramInObj = fees.getJSONObject(feeIndex);
@@ -175,10 +175,13 @@
                 logger.error("澶勭悊寮傚父", e);
                 throw new CmdException(e.getMessage());
             }
-            datas.add(paramInObj.getString("detailId"));
+            details.add(paramInObj.getString("detailId"));
         }
 
-        cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(datas));
+        JSONObject data = new JSONObject();
+        data.put("details",details);
+
+        cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(data));
     }
 
     private void doDeal(JSONObject paramObj, String communityId, ICmdDataFlowContext cmdDataFlowContext, UserDto userDto) throws Exception {
@@ -212,7 +215,7 @@
                 throw new CmdException("缂磋垂澶辫触");
             }
         } finally {
-            DistributedLock.releaseDistributedLock(requestId, key);
+            DistributedLock.releaseDistributedLock(key,requestId);
         }
         //杞﹁締寤舵湡
         updateOwnerCarEndTime(payFeePo, paramObj);

--
Gitblit v1.8.0