From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +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 | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 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..9a51701 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,49 +25,46 @@
@Autowired
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
/**
* @param applyRoomDiscountPo
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
@Java110Transactional
public ResponseEntity<String> update(ApplyRoomDiscountPo applyRoomDiscountPo) {
-
+ List<String> photos = applyRoomDiscountPo.getPhotos();
+ applyRoomDiscountPo.setPhotos(null);
int flag = applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
- if (flag > 0) {
- //鑾峰彇鍥剧墖闆嗗悎
- List<String> photos = applyRoomDiscountPo.getPhotos();
- if (photos != null && photos.size() > 0) {
+ if (flag < 1) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+ }
+ //鑾峰彇鍥剧墖闆嗗悎
+ if (photos != null && photos.size() > 0) {
+ 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());
- //table琛ㄧず琛ㄥ瓨鍌� ftp琛ㄧずftp鏂囦欢瀛樺偍
- fileRel.setSaveWay("ftp");
- fileRel.setCreateTime(new Date());
- //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);
- fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
- }
}
- return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+ FileRelPo fileRel = new FileRelPo();
+ fileRel.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+ fileRel.setObjId(applyRoomDiscountPo.getArdId());
+ //table琛ㄧず琛ㄥ瓨鍌� ftp琛ㄧずftp鏂囦欢瀛樺偍
+ fileRel.setSaveWay("ftp");
+ fileRel.setCreateTime(new Date());
+ //19000琛ㄧず瑁呬慨鍥剧墖
+ fileRel.setRelTypeCd("19000");
+ for (String photo : photos) {
+ fileRel.setFileRealName(photo);
+ fileRel.setFileSaveName(photo);
+ fileRelInnerServiceSMOImpl.saveFileRel(fileRel);
+ }
}
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
- return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+
}
}
--
Gitblit v1.8.0