From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/bmo/feeReceiptDetail/impl/GetFeeReceiptDetailBMOImpl.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeReceiptDetail/impl/GetFeeReceiptDetailBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/feeReceiptDetail/impl/GetFeeReceiptDetailBMOImpl.java
old mode 100644
new mode 100755
index 5d1a76e..9313e11
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeReceiptDetail/impl/GetFeeReceiptDetailBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeReceiptDetail/impl/GetFeeReceiptDetailBMOImpl.java
@@ -1,8 +1,10 @@
package com.java110.fee.bmo.feeReceiptDetail.impl;
-import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
+import com.java110.dto.fee.FeeReceiptDetailDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
import com.java110.fee.bmo.feeReceiptDetail.IGetFeeReceiptDetailBMO;
-import com.java110.intf.IFeeReceiptDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -18,6 +20,9 @@
@Autowired
private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeDetailDiscountInnerServiceSMO payFeeDetailDiscountInnerServiceSMOImpl;
+
/**
* @param feeReceiptDetailDto
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -30,9 +35,13 @@
List<FeeReceiptDetailDto> feeReceiptDetailDtos = null;
if (count > 0) {
feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
+
} else {
feeReceiptDetailDtos = new ArrayList<>();
}
+
+ //todo 璁＄畻浼樻儬閲戦
+ computeDiscountFee(feeReceiptDetailDtos);
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) feeReceiptDetailDto.getRow()), count, feeReceiptDetailDtos);
@@ -41,4 +50,31 @@
return responseEntity;
}
+ private void computeDiscountFee(List<FeeReceiptDetailDto> feeReceiptDetailDtos) {
+
+ if(feeReceiptDetailDtos == null || feeReceiptDetailDtos.size() < 1){
+ return ;
+ }
+
+ List<String> detailIds = new ArrayList<>();
+ for(FeeReceiptDetailDto feeReceiptDetailDto:feeReceiptDetailDtos){
+ detailIds.add(feeReceiptDetailDto.getDetailId());
+ }
+
+ PayFeeDetailDiscountDto payFeeDetailDiscountDto = new PayFeeDetailDiscountDto();
+ payFeeDetailDiscountDto.setCommunityId(feeReceiptDetailDtos.get(0).getCommunityId());
+ payFeeDetailDiscountDto.setDetailIds(detailIds.toArray(new String[detailIds.size()]));
+
+ List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtos = payFeeDetailDiscountInnerServiceSMOImpl.computeDiscountFee(payFeeDetailDiscountDto);
+
+ for(FeeReceiptDetailDto feeReceiptDetailDto:feeReceiptDetailDtos){
+ for(PayFeeDetailDiscountDto tmpPayFeeDetailDiscountDto:payFeeDetailDiscountDtos){
+ if(!feeReceiptDetailDto.getDetailId().equals(tmpPayFeeDetailDiscountDto.getDetailId())){
+ continue;
+ }
+ feeReceiptDetailDto.setDiscountPrice(tmpPayFeeDetailDiscountDto.getDiscountPrice());
+ }
+ }
+ }
+
}
--
Gitblit v1.8.0