From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java
index 5990a44..ee2869a 100644
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayOweFeeListener.java
@@ -9,6 +9,7 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.fee.FeeAttrDto;
+import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.dto.repair.RepairDto;
import com.java110.entity.center.AppService;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
@@ -124,12 +125,24 @@
}
//杩欓噷鍙槸鍐欏叆 鏀舵嵁琛紝鏆備笉鑰冭檻 浜嬪姟涓�鑷存�ч棶棰橈紝灏辩畻鍐欏叆澶辫触 涔熷彧鏄奖鍝� 鏀舵嵁鎵撳嵃锛屽鏋� 璐靛叕鍙稿 鏀舵嵁瑕佹眰 姣旇緝楂橈紝涓嶈兘鏈夊け璐ョ殑鎯呭喌 璇峰姞鍏ヤ簨鍔＄鐞�
- feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetails(feeReceiptDetailPos);
+// feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetails(feeReceiptDetailPos);
+//
+// feeReceiptInnerServiceSMOImpl.saveFeeReceipts(feeReceiptPos);
+
+ //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
+ List<String> detailIds = new ArrayList<>();
+
+ for (FeeReceiptDetailPo feeReceiptDetailPo : feeReceiptDetailPos) {
+ detailIds.add(feeReceiptDetailPo.getDetailId());
+ }
+
+ FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
+ feeReceiptDetailDto.setDetailIds(detailIds.toArray(new String[detailIds.size()]));
+ feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
+ List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
- feeReceiptInnerServiceSMOImpl.saveFeeReceipts(feeReceiptPos);
-
- dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptPos));
+ dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos));
}
private void getFeeReceiptDetailPo(DataFlowContext dataFlowContext, JSONObject paramObj, JSONArray businesses, List<FeeReceiptDetailPo> feeReceiptDetailPos, List<FeeReceiptPo> feeReceiptPos) {
--
Gitblit v1.8.0