From 4ce807bb99088dc6f41262046830fc872e772be4 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期二, 02 九月 2025 14:23:33 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09

---
 service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
index b73c189..75506fa 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
@@ -6,8 +6,8 @@
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.fee.FeeDetailDto;
-import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
-import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
+import com.java110.dto.fee.FeeAccountDetailDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
 import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
 import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
 import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
@@ -64,7 +64,7 @@
         //鏌ヨ鎬昏褰曟暟
         ApiFeeDetailVo apiFeeDetailVo = new ApiFeeDetailVo();
         FeeDetailDto feeDetailDto = BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class);
-
+        feeDetailDto.setContractFee(reqJson.getString("contractId"));
         int total = feeDetailInnerServiceSMOImpl.queryFeeDetailsCount(feeDetailDto);
         apiFeeDetailVo.setTotal(total);
         if (total > 0) {
@@ -73,7 +73,7 @@
             for (FeeDetailDto feeDetail : feeDetailDtos) {
                 //鑾峰彇鐘舵��
                 String state = feeDetail.getState();
-                if (!StringUtil.isEmpty(state) && (state.equals("1300") || state.equals("1100") || state.equals("1200"))) { //閫�璐瑰崟銆佸凡閫�璐广�侀��璐瑰け璐ョ姸鎬�
+                if ("1300".equals(state) || "1100".equals(state) || "1200".equals(state)) { //閫�璐瑰崟銆佸凡閫�璐广�侀��璐瑰け璐ョ姸鎬�
                     //鑾峰彇鍛ㄦ湡
                     String cycles = feeDetail.getCycles();
                     if (!StringUtil.isEmpty(cycles) && cycles.contains("-")) {

--
Gitblit v1.8.0