From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/payFeeConfigDiscount/impl/GetPayFeeConfigDiscountBMOImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/payFeeConfigDiscount/impl/GetPayFeeConfigDiscountBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/payFeeConfigDiscount/impl/GetPayFeeConfigDiscountBMOImpl.java
old mode 100644
new mode 100755
index 1b45654..c9cdfcb
--- a/service-fee/src/main/java/com/java110/fee/bmo/payFeeConfigDiscount/impl/GetPayFeeConfigDiscountBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/payFeeConfigDiscount/impl/GetPayFeeConfigDiscountBMOImpl.java
@@ -1,7 +1,9 @@
package com.java110.fee.bmo.payFeeConfigDiscount.impl;
-import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
+import com.java110.dto.fee.FeeDiscountSpecDto;
+import com.java110.dto.payFee.PayFeeConfigDiscountDto;
import com.java110.fee.bmo.payFeeConfigDiscount.IGetPayFeeConfigDiscountBMO;
+import com.java110.intf.fee.IFeeDiscountSpecInnerServiceSMO;
import com.java110.intf.fee.IPayFeeConfigDiscountInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,9 @@
@Autowired
private IPayFeeConfigDiscountInnerServiceSMO payFeeConfigDiscountInnerServiceSMOImpl;
+ @Autowired
+ private IFeeDiscountSpecInnerServiceSMO feeDiscountSpecInnerServiceSMOImpl;
+
/**
* @param payFeeConfigDiscountDto
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -30,6 +35,7 @@
List<PayFeeConfigDiscountDto> payFeeConfigDiscountDtos = null;
if (count > 0) {
payFeeConfigDiscountDtos = payFeeConfigDiscountInnerServiceSMOImpl.queryPayFeeConfigDiscounts(payFeeConfigDiscountDto);
+ freshDiscountSpec(payFeeConfigDiscountDtos);
} else {
payFeeConfigDiscountDtos = new ArrayList<>();
}
@@ -41,4 +47,36 @@
return responseEntity;
}
+ private void freshDiscountSpec(List<PayFeeConfigDiscountDto> payFeeConfigDiscountDtos) {
+
+ if (payFeeConfigDiscountDtos == null || payFeeConfigDiscountDtos.size() < 1) {
+ return;
+ }
+
+ List<String> discountIds = new ArrayList<>();
+ for (PayFeeConfigDiscountDto payFeeConfigDiscountDto : payFeeConfigDiscountDtos) {
+ discountIds.add(payFeeConfigDiscountDto.getDiscountId());
+ }
+
+ FeeDiscountSpecDto tmpFeeDiscountSpecDto = new FeeDiscountSpecDto();
+
+ tmpFeeDiscountSpecDto.setDiscountIds(discountIds.toArray(new String[discountIds.size()]));
+ tmpFeeDiscountSpecDto.setCommunityId(payFeeConfigDiscountDtos.get(0).getCommunityId());
+
+ List<FeeDiscountSpecDto> feeDiscountSpecDtos = feeDiscountSpecInnerServiceSMOImpl.queryFeeDiscountSpecs(tmpFeeDiscountSpecDto);
+
+ if (feeDiscountSpecDtos == null || feeDiscountSpecDtos.size() < 1) {
+ return;
+ }
+ List<FeeDiscountSpecDto> tmpSpecs = null;
+ for (PayFeeConfigDiscountDto payFeeConfigDiscountDto : payFeeConfigDiscountDtos) {
+ tmpSpecs = new ArrayList<>();
+ for (FeeDiscountSpecDto feeDiscountSpecDto : feeDiscountSpecDtos) {
+ if (payFeeConfigDiscountDto.getDiscountId().equals(feeDiscountSpecDto.getDiscountId())) {
+ tmpSpecs.add(feeDiscountSpecDto);
+ }
+ }
+ payFeeConfigDiscountDto.setFeeDiscountSpecs(tmpSpecs);
+ }
+ }
}
--
Gitblit v1.8.0