From 2703710ab562eca0b94fbfda76a196cc30e64483 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 18 四月 2023 00:06:07 +0800
Subject: [PATCH] 优化 导入费用时，模板上能体现一下房屋状态，这样未销售房就不会依然被填入
---
service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 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 fc7731e..8aa2bfc 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
@@ -10,8 +10,6 @@
import com.java110.dto.applyRoomDiscountType.ApplyRoomDiscountTypeDto;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
-import com.java110.dto.file.FileDto;
-import com.java110.fee.bmo.account.ISaveAccountBMO;
import com.java110.fee.bmo.account.IUpdateAccountBMO;
import com.java110.fee.bmo.applyRoomDiscount.IAuditApplyRoomDiscountBMO;
import com.java110.fee.bmo.applyRoomDiscount.IDeleteApplyRoomDiscountBMO;
@@ -22,13 +20,10 @@
import com.java110.fee.bmo.applyRoomDiscountType.IGetApplyRoomDiscountTypeBMO;
import com.java110.fee.bmo.applyRoomDiscountType.ISaveApplyRoomDiscountTypeBMO;
import com.java110.fee.bmo.applyRoomDiscountType.IUpdateApplyRoomDiscountTypeBMO;
-import com.java110.intf.acct.IAccountInnerServiceSMO;
-import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.fee.IApplyRoomDiscountInnerServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeDiscountRuleInnerServiceSMO;
-import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
import com.java110.po.applyRoomDiscountType.ApplyRoomDiscountTypePo;
import com.java110.po.file.FileRelPo;
@@ -94,19 +89,7 @@
private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
@Autowired
- private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
-
- @Autowired
- private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
-
- @Autowired
- private ISaveAccountBMO saveAccountBMOImpl;
-
- @Autowired
private IUpdateAccountBMO updateAccountBMOImpl;
-
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
@@ -190,14 +173,8 @@
//19000琛ㄧず瑁呬慨鍥剧墖
fileRelPo.setRelTypeCd("19000");
for (String photo : photos) {
- FileDto fileDto = new FileDto();
- fileDto.setCommunityId("-1");
- fileDto.setContext(photo);
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- fileRelPo.setFileRealName(fileName);
- fileRelPo.setFileSaveName(fileName);
+ fileRelPo.setFileRealName(photo);
+ fileRelPo.setFileSaveName(photo);
fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
}
}
@@ -291,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");
@@ -435,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();
@@ -446,6 +427,7 @@
applyRoomDiscountDto.setRoomId(roomId);
applyRoomDiscountDto.setState(state);
applyRoomDiscountDto.setApplyType(applyType);
+ applyRoomDiscountDto.setFeeId(feeId);
return getApplyRoomDiscountBMOImpl.get(applyRoomDiscountDto);
}
--
Gitblit v1.8.0