From 9e22e9abd4a3c606ec51d491abf94d7a465356b9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 30 六月 2023 00:35:56 +0800
Subject: [PATCH] 优化商户
---
service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java
index 593cd19..c6098a3 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java
@@ -6,7 +6,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.report.QueryStatisticsDto;
import com.java110.report.statistics.IBaseDataStatistics;
import com.java110.report.statistics.IFeeStatistics;
@@ -21,6 +21,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -136,7 +137,7 @@
data = datas.getJSONObject(dataIndex);
//todo 杩欓噷寰幆璐圭敤澶х被
for (Map info : infos) {
- if (!data.get("roomId").toString().equals(info.get("payerObjId"))) {
+ if (!data.getString("roomId").equals(info.get("payerObjId"))) {
continue;
}
feeTypeCd = info.get("feeTypeCd").toString();
@@ -164,13 +165,17 @@
}
List<Map> tmpInfos = null;
+ Map dInfo = null;
for (Map nInfo : newInfos) {
for (Map info : infos) {
if (!nInfo.get("payerObjId").equals(info.get("payerObjId"))) {
continue;
}
tmpInfos = getTmpInfos(nInfo, info);
- tmpInfos.add(info);
+ //todo 娣辨嫹璐�
+ dInfo = new HashMap();
+ dInfo.putAll(info);
+ tmpInfos.add(dInfo);
//璁＄畻鍗曢」 娆犺垂閲戦
computeOweAmount(tmpInfos, info.get("feeTypeCd").toString(), nInfo);
nInfo.put(info.get("feeTypeCd").toString(), tmpInfos);
--
Gitblit v1.8.0