From 0b3ff378a9faaf9d7a4831b7f0de67378fe0dfea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:20:15 +0800
Subject: [PATCH] optimize 统计
---
service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java b/service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java
index dac2771..8b0add3 100755
--- a/service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java
@@ -7,9 +7,9 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.applyRoomDiscount.ApplyRoomDiscountDto;
-import com.java110.dto.applyRoomDiscountType.ApplyRoomDiscountTypeDto;
+import com.java110.dto.applyRoomDiscount.ApplyRoomDiscountTypeDto;
import com.java110.dto.fee.FeeDetailDto;
-import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
+import com.java110.dto.fee.FeeDiscountRuleDto;
import com.java110.fee.bmo.account.IUpdateAccountBMO;
import com.java110.fee.bmo.applyRoomDiscount.IAuditApplyRoomDiscountBMO;
import com.java110.fee.bmo.applyRoomDiscount.IDeleteApplyRoomDiscountBMO;
@@ -268,6 +268,9 @@
BigDecimal cashBackAmount = new BigDecimal("0.00");//杩旂幇鎬婚噾棰�
for (int i = 0; i < discounts.size(); i++) {
JSONObject discountObject = discounts.getJSONObject(i);
+ if (!reqJson.getString("discountId").equals(discountObject.getString("discountId"))) {
+ continue;
+ }
JSONArray feeDiscountSpecs = discountObject.getJSONArray("feeDiscountSpecs");
//鑾峰彇瑙勫垯id
String ruleId = discounts.getJSONObject(i).getString("ruleId");
@@ -412,6 +415,7 @@
@RequestParam(value = "roomId", required = false) String roomId,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "applyType", required = false) String applyType,
+ @RequestParam(value = "feeId", required = false) String feeId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ApplyRoomDiscountDto applyRoomDiscountDto = new ApplyRoomDiscountDto();
@@ -423,6 +427,7 @@
applyRoomDiscountDto.setRoomId(roomId);
applyRoomDiscountDto.setState(state);
applyRoomDiscountDto.setApplyType(applyType);
+ applyRoomDiscountDto.setFeeId(feeId);
return getApplyRoomDiscountBMOImpl.get(applyRoomDiscountDto);
}
--
Gitblit v1.8.0