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/feeDiscount/impl/GetFeeDiscountBMOImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscount/impl/GetFeeDiscountBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscount/impl/GetFeeDiscountBMOImpl.java
old mode 100644
new mode 100755
index e717fda..543ad30
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscount/impl/GetFeeDiscountBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscount/impl/GetFeeDiscountBMOImpl.java
@@ -1,10 +1,12 @@
package com.java110.fee.bmo.feeDiscount.impl;
-import com.java110.dto.feeDiscount.FeeDiscountDto;
-import com.java110.dto.feeDiscountSpec.FeeDiscountSpecDto;
+import com.java110.dto.fee.FeeDiscountDto;
+import com.java110.dto.fee.FeeDiscountSpecDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
import com.java110.fee.bmo.feeDiscount.IGetFeeDiscountBMO;
import com.java110.intf.fee.IFeeDiscountInnerServiceSMO;
import com.java110.intf.fee.IFeeDiscountSpecInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -22,6 +24,9 @@
@Autowired
private IFeeDiscountSpecInnerServiceSMO feeDiscountSpecInnerServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeDetailDiscountInnerServiceSMO payFeeDetailDiscountInnerServiceSMOImpl;
/**
* @param feeDiscountDto
@@ -47,6 +52,60 @@
return responseEntity;
}
+ @Override
+ public ResponseEntity<String> getFeeDetailDiscount(PayFeeDetailDiscountDto payFeeDetailDiscountDto) {
+
+ int count = payFeeDetailDiscountInnerServiceSMOImpl.queryPayFeeDetailDiscountsCount(payFeeDetailDiscountDto);
+
+ List<PayFeeDetailDiscountDto> feeDetailDiscountDtos = null;
+ if (count > 0) {
+ feeDetailDiscountDtos = payFeeDetailDiscountInnerServiceSMOImpl.queryPayFeeDetailDiscounts(payFeeDetailDiscountDto);
+ freshDiscountDetailSpec(feeDetailDiscountDtos);
+ } else {
+ feeDetailDiscountDtos = new ArrayList<>();
+ }
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) payFeeDetailDiscountDto.getRow()), count, feeDetailDiscountDtos);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+ return responseEntity;
+ }
+
+ private void freshDiscountDetailSpec(List<PayFeeDetailDiscountDto> feeDetailDiscountDtos) {
+
+ if (feeDetailDiscountDtos == null || feeDetailDiscountDtos.size() < 1) {
+ return;
+ }
+
+ List<String> discountIds = new ArrayList<>();
+ for (PayFeeDetailDiscountDto feeDetailDiscountDto : feeDetailDiscountDtos) {
+ discountIds.add(feeDetailDiscountDto.getDiscountId());
+ }
+
+ FeeDiscountSpecDto tmpFeeDiscountSpecDto = new FeeDiscountSpecDto();
+
+ tmpFeeDiscountSpecDto.setDiscountIds(discountIds.toArray(new String[discountIds.size()]));
+ tmpFeeDiscountSpecDto.setCommunityId(feeDetailDiscountDtos.get(0).getCommunityId());
+
+ List<FeeDiscountSpecDto> feeDiscountSpecDtos = feeDiscountSpecInnerServiceSMOImpl.queryFeeDiscountSpecs(tmpFeeDiscountSpecDto);
+
+ if (feeDiscountSpecDtos == null || feeDiscountSpecDtos.size() < 1) {
+ return;
+ }
+ List<FeeDiscountSpecDto> tmpSpecs = null;
+ for (PayFeeDetailDiscountDto feeDetailDiscountDto : feeDetailDiscountDtos) {
+ tmpSpecs = new ArrayList<>();
+ for (FeeDiscountSpecDto feeDiscountSpecDto : feeDiscountSpecDtos) {
+ if (feeDetailDiscountDto.getDiscountId().equals(feeDiscountSpecDto.getDiscountId())) {
+ tmpSpecs.add(feeDiscountSpecDto);
+
+ }
+ }
+ feeDetailDiscountDto.setFeeDiscountSpecs(tmpSpecs);
+ }
+ }
+
private void freshDiscountSpec(List<FeeDiscountDto> feeDiscountDtos) {
if (feeDiscountDtos == null || feeDiscountDtos.size() < 1) {
--
Gitblit v1.8.0