From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
index 997a4f3..1efc337 100755
--- a/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.feeDiscount.FeeDiscountDto;
-import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
-import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
-import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
+import com.java110.dto.fee.FeeDiscountDto;
+import com.java110.dto.fee.FeeDiscountRuleDto;
+import com.java110.dto.fee.FeeDiscountRuleSpecDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
import com.java110.fee.bmo.feeDiscount.IDeleteFeeDiscountBMO;
import com.java110.fee.bmo.feeDiscount.IGetFeeDiscountBMO;
import com.java110.fee.bmo.feeDiscount.ISaveFeeDiscountBMO;
@@ -13,7 +13,7 @@
import com.java110.fee.bmo.feeDiscountRule.IGetFeeDiscountRuleBMO;
import com.java110.fee.bmo.feeDiscountRuleSpec.IComputeFeeDiscountBMO;
import com.java110.fee.bmo.feeDiscountRuleSpec.IGetFeeDiscountRuleSpecBMO;
-import com.java110.po.feeDiscount.FeeDiscountPo;
+import com.java110.po.fee.FeeDiscountPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -122,6 +122,7 @@
public ResponseEntity<String> queryFeeDiscount(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "discountType", required = false) String discountType,
@RequestParam(value = "discountName", required = false) String discountName,
+ @RequestParam(value = "discountId", required = false) String discountId,
@RequestParam(value = "ruleName", required = false) String ruleName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
@@ -132,6 +133,7 @@
feeDiscountDto.setDiscountType(discountType);
feeDiscountDto.setDiscountName(discountName);
feeDiscountDto.setRuleName(ruleName);
+ feeDiscountDto.setDiscountId(discountId);
return getFeeDiscountBMOImpl.get(feeDiscountDto);
}
--
Gitblit v1.8.0