From 3e0a5ec84e20908f9300dad9b82bc851803cca66 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 01 七月 2022 09:31:18 +0800
Subject: [PATCH] 1、优化页面查询相关bug2、优化优惠申请图片上传3、优化页面性bug
---
service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 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 cf92855..fc7731e 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
@@ -5,10 +5,12 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.DataFlowContext;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.applyRoomDiscount.ApplyRoomDiscountDto;
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;
@@ -21,12 +23,15 @@
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;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
@@ -100,6 +105,12 @@
@Autowired
private IUpdateAccountBMO updateAccountBMOImpl;
+ @Autowired
+ private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+ @Autowired
+ private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+
/**
* 浼樻儬鐢宠
*
@@ -137,6 +148,9 @@
if (applyRoomDiscountDtos.size() == 0) {
//绌虹疆鎴夸紭鎯犲彲鐢�
applyRoomDiscountPo.setInUse("0");
+ applyRoomDiscountPo.setArdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ardId));
+ applyRoomDiscountPo.setState(ApplyRoomDiscountDto.STATE_APPLY);
+ saveFile(applyRoomDiscountPo);
return saveApplyRoomDiscountBMOImpl.save(applyRoomDiscountPo);
} else if (applyRoomDiscountDtos.size() > 0) {
//鍙栧嚭缁撴潫鏃堕棿
@@ -145,12 +159,47 @@
if (startDate.getTime() - finishTime.getTime() >= 0) {
//绌虹疆鎴夸紭鎯犲彲鐢�
applyRoomDiscountPo.setInUse("0");
+ applyRoomDiscountPo.setArdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ardId));
+ applyRoomDiscountPo.setState(ApplyRoomDiscountDto.STATE_APPLY);
+ saveFile(applyRoomDiscountPo);
return saveApplyRoomDiscountBMOImpl.save(applyRoomDiscountPo);
} else {
throw new UnsupportedOperationException("璇ユ椂闂存宸茬粡鐢宠杩囩┖缃埧锛岃閲嶆柊杈撳叆绌虹疆鎴跨敵璇峰紑濮嬪拰缁撴潫鏃堕棿");
}
} else {
throw new UnsupportedOperationException("淇℃伅閿欒");
+ }
+ }
+
+ /**
+ * 涓婁紶鍥剧墖
+ *
+ * @param applyRoomDiscountPo
+ */
+ public void saveFile(ApplyRoomDiscountPo applyRoomDiscountPo) {
+ //鑾峰彇鍥剧墖
+ List<String> photos = applyRoomDiscountPo.getPhotos();
+ FileRelPo fileRelPo = new FileRelPo();
+ fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+ fileRelPo.setObjId(applyRoomDiscountPo.getArdId());
+ //table琛ㄧず琛ㄥ瓨鍌� ftp琛ㄧずftp鏂囦欢瀛樺偍
+ fileRelPo.setSaveWay("ftp");
+ fileRelPo.setCreateTime(new Date());
+ //鍥剧墖涓婁紶
+ if (photos != null && photos.size() > 0) {
+ //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);
+ fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+ }
}
}
@@ -310,6 +359,7 @@
* 89002020980011 102020006 鍑忓厤閲戦
* 89002020980012 102020007 鏈堜唤
* 89002020980013 102020007 鎵撴姌鐜�
+ *
* @param feeDiscountSpecs
* @return
*/
@@ -380,6 +430,7 @@
*/
@RequestMapping(value = "/queryApplyRoomDiscount", method = RequestMethod.GET)
public ResponseEntity<String> queryApplyRoomDiscount(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "ardId", required = false) String ardId,
@RequestParam(value = "roomName", required = false) String roomName,
@RequestParam(value = "roomId", required = false) String roomId,
@RequestParam(value = "state", required = false) String state,
@@ -387,6 +438,7 @@
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ApplyRoomDiscountDto applyRoomDiscountDto = new ApplyRoomDiscountDto();
+ applyRoomDiscountDto.setArdId(ardId);
applyRoomDiscountDto.setPage(page);
applyRoomDiscountDto.setRow(row);
applyRoomDiscountDto.setCommunityId(communityId);
--
Gitblit v1.8.0