From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java | 30 +++++-------------------------
1 files changed, 5 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..8fbcab0 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");
--
Gitblit v1.8.0