From 586aa07aa928bff687eb36520de2034fff041487 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 06 七月 2023 16:36:24 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java
index d4d4d7c..7f6210e 100755
--- a/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/applyRoomDiscount/impl/UpdateApplyRoomDiscountBMOImpl.java
@@ -2,12 +2,11 @@
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.file.FileDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.fee.bmo.applyRoomDiscount.IUpdateApplyRoomDiscountBMO;
-import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.fee.IApplyRoomDiscountInnerServiceSMO;
-import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
+import com.java110.po.room.ApplyRoomDiscountPo;
import com.java110.po.file.FileRelPo;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,9 +25,6 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
/**
* @param applyRoomDiscountPo
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
@@ -42,9 +38,14 @@
//鑾峰彇鍥剧墖闆嗗悎
List<String> photos = applyRoomDiscountPo.getPhotos();
if (photos != null && photos.size() > 0) {
- FileRelPo fileRelPo = new FileRelPo();
- fileRelPo.setObjId(applyRoomDiscountPo.getArdId());
- fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(applyRoomDiscountPo.getArdId());
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ if (fileRelDtos != null && fileRelDtos.size() > 0) {
+ FileRelPo fileRelPo = new FileRelPo();
+ fileRelPo.setObjId(applyRoomDiscountPo.getArdId());
+ fileRelInnerServiceSMOImpl.deleteFileRel(fileRelPo);
+ }
FileRelPo fileRel = new FileRelPo();
fileRel.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
fileRel.setObjId(applyRoomDiscountPo.getArdId());
@@ -54,14 +55,8 @@
//19000琛ㄧず瑁呬慨鍥剧墖
fileRel.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);
- fileRel.setFileRealName(fileName);
- fileRel.setFileSaveName(fileName);
+ fileRel.setFileRealName(photo);
+ fileRel.setFileSaveName(photo);
fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
}
}
--
Gitblit v1.8.0