From 9ec0a61f90ac2464eebc643bfe2d93ac9ba6e569 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期六, 23 八月 2025 10:59:18 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09
---
service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java
index dc3e9a4..a7eb4b7 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java
@@ -66,8 +66,23 @@
feeDetailDto.setPayerObjId(payerObjId);
feeDetailDto.setPayerObjType(payerObjType);
//缂磋垂寮�濮嬫椂闂翠负涓婃湀鍒版湡鏃堕棿
- feeDetailDto.setStartTime(DateUtil.getDateFromStringB(endTime));
- feeDetailDto.setEndTime(DateUtil.getDateFromStringB(custEndTime));
+ try {
+ feeDetailDto.setStartTime(DateUtil.getDateFromStringA(endTime));
+ feeDetailDto.setEndTime(DateUtil.getDateFromStringA(custEndTime));
+ }catch (Exception e){
+ feeDetailDto.setStartTime(DateUtil.getDateFromStringB(endTime));
+ feeDetailDto.setEndTime(DateUtil.getDateFromStringB(custEndTime));
+ }
+ if(Double.parseDouble(feeDetailDto.getCycles())==105){
+ double cycle = (DateUtil.dayCompare(
+ feeDetailDto.getStartTime(),
+ feeDetailDto.getEndTime()
+ ));
+ feeDetailDto.setRow(row);
+ feeDetailDto.setPage(page);
+ List<ComputeDiscountDto> computeDiscountDtos = feeDiscountInnerServiceSMOImpl.computeDiscount(feeDetailDto,cycle);
+ return ResultVo.createResponseEntity(computeDiscountDtos);
+ }
feeDetailDto.setRow(row);
feeDetailDto.setPage(page);
List<ComputeDiscountDto> computeDiscountDtos = feeDiscountInnerServiceSMOImpl.computeDiscount(feeDetailDto);
--
Gitblit v1.8.0