From 1b8cefcc2c20d43f9e5dcd58cd26672de604420a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 18 五月 2022 16:40:55 +0800
Subject: [PATCH] 优化
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 165 insertions(+), 10 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
index 79c207d..e30987f 100755
--- a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
@@ -13,15 +13,27 @@
import com.java110.community.bmo.roomRenovationRecord.ISaveRoomRenovationRecordBMO;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
+import com.java110.dto.communitySetting.CommunitySettingDto;
+import com.java110.dto.fee.FeeAttrDto;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.FeeDto;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.roomRenovation.RoomRenovationDto;
import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;
import com.java110.dto.user.UserDto;
-import com.java110.intf.IRoomRenovationInnerServiceSMO;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.community.ICommunitySettingInnerServiceSMO;
+import com.java110.intf.community.IRoomRenovationInnerServiceSMO;
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.po.fee.FeeAttrPo;
+import com.java110.po.fee.PayFeePo;
import com.java110.po.file.FileRelPo;
import com.java110.po.roomRenovation.RoomRenovationPo;
import com.java110.po.roomRenovationDetail.RoomRenovationDetailPo;
@@ -29,6 +41,7 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
+import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
@@ -38,10 +51,12 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
-
@RestController
@RequestMapping(value = "/roomRenovation")
@@ -89,6 +104,21 @@
@Autowired
private IDeleteRoomRenovationRecordBMO deleteRoomRenovationRecordBMOImpl;
+ @Autowired
+ private ICommunitySettingInnerServiceSMO communitySettingInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -98,7 +128,9 @@
* @path /app/roomRenovation/saveRoomRenovation
*/
@RequestMapping(value = "/saveRoomRenovation", method = RequestMethod.POST)
- public ResponseEntity<String> saveRoomRenovation(@RequestBody JSONObject reqJson) {
+ public ResponseEntity<String> saveRoomRenovation(@RequestBody JSONObject reqJson,
+ @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId) throws ParseException {
Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
Assert.hasKeyAndValue(reqJson, "roomName", "璇锋眰鎶ユ枃涓湭鍖呭惈roomName");
@@ -109,6 +141,16 @@
Assert.hasKeyAndValue(reqJson, "personTel", "璇锋眰鎶ユ枃涓湭鍖呭惈personTel");
//Assert.hasKeyAndValue(reqJson, "isViolation", "璇锋眰鎶ユ枃涓湭鍖呭惈isViolation");
+ //鑾峰彇寮�濮嬫椂闂�
+ String startTime = reqJson.getString("startTime") + " 00:00:00";
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date timeOne = format.parse(startTime);
+ Calendar now = Calendar.getInstance();
+ String newTime = now.get(Calendar.YEAR) + "-" + (now.get(Calendar.MONTH) + 1) + "-" + now.get(Calendar.DAY_OF_MONTH) + " 00:00:00";
+ Date timeTwo = format.parse(newTime);
+ if (timeOne.getTime() < timeTwo.getTime()) {
+ return ResultVo.error("瑁呬慨鏃堕棿涓嶈兘灏忎簬褰撳墠鏃堕棿锛�");
+ }
RoomRenovationPo roomRenovationPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationPo.class);
//鍒ゆ柇鏄惁宸茬粡瀛樺湪璇ユ埧灞嬬殑瑁呬慨璁板綍浜�
@@ -128,6 +170,102 @@
roomRenovationPo.setIsViolation("N");
roomRenovationPo.setStartTime(reqJson.getString("startTime") + " 00:00:00");
roomRenovationPo.setEndTime(reqJson.getString("endTime") + " 23:59:59");
+ //鐢熸垚瑁呬慨璐圭敤
+ CommunitySettingDto communitySettingDto = new CommunitySettingDto();
+ communitySettingDto.setSettingKey("REPAIR_CONFIG_FEE");
+ communitySettingDto.setCommunityId(reqJson.getString("communityId"));
+ //鏌ヨ灏忓尯閰嶇疆
+ List<CommunitySettingDto> communitySettingDtos = communitySettingInnerServiceSMOImpl.queryCommunitySettings(communitySettingDto);
+ String settingValue = null;
+ if (communitySettingDtos != null && communitySettingDtos.size() > 0) {
+ //鑾峰彇灏忓尯璁剧疆鍊�
+ settingValue = communitySettingDtos.get(0).getSettingValue();
+ }
+ //鑾峰彇鎴垮眿id
+ String roomId = reqJson.getString("roomId");
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(roomId);
+ //鏌ヨ涓氫富鎴垮眿鍏崇郴琛�
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+ Assert.listOnlyOne(ownerRoomRelDtos, "鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄩ敊璇紒");
+ //鑾峰彇涓氫富id
+ String ownerId = ownerRoomRelDtos.get(0).getOwnerId();
+ if (!StringUtil.isEmpty(settingValue)) {
+ String[] settingValues = settingValue.split(",");
+ List<PayFeePo> payFeePos = new ArrayList<>();
+ List<FeeAttrPo> feeAttrOwnerIdPos = new ArrayList<>();
+ List<FeeAttrPo> feeAttrOwnerNamePos = new ArrayList<>();
+ List<FeeAttrPo> feeAttrOwnerLinkPos = new ArrayList<>();
+ List<FeeAttrPo> feeAttrOwnerTimePos = new ArrayList<>();
+ for (int i = 0; i < settingValues.length; i++) {
+ String configId = settingValues[i];
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setConfigId(configId);
+ //鏌ヨ璐圭敤椤�
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+ Assert.listOnlyOne(feeConfigDtos, "鏌ヨ璐圭敤椤归敊璇紒");
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setAmount(feeConfigDtos.get(0).getAdditionalAmount());
+ if (!StringUtil.isEmpty(storeId)) {
+ payFeePo.setIncomeObjId(storeId);
+ } else {
+ payFeePo.setIncomeObjId(reqJson.getString("storeId"));
+ }
+ payFeePo.setFeeTypeCd(feeConfigDtos.get(0).getFeeTypeCd());
+ payFeePo.setStartTime(newTime);
+ payFeePo.setEndTime(format.format(System.currentTimeMillis()));
+ payFeePo.setCommunityId(reqJson.getString("communityId"));
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setUserId(userId);
+ payFeePo.setPayerObjId(reqJson.getString("roomId"));
+ payFeePo.setFeeFlag(feeConfigDtos.get(0).getFeeFlag());
+ payFeePo.setState(FeeDto.STATE_DOING);
+ payFeePo.setConfigId(configId);
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ payFeePo.setBatchId("-1");
+ payFeePos.add(payFeePo);
+ FeeAttrPo feeAttrPo1 = new FeeAttrPo();
+ feeAttrPo1.setFeeId(payFeePo.getFeeId());
+ feeAttrPo1.setCommunityId(reqJson.getString("communityId"));
+ feeAttrPo1.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo1.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID); //涓氫富id
+ feeAttrPo1.setValue(ownerId);
+ feeAttrOwnerIdPos.add(feeAttrPo1);
+ FeeAttrPo feeAttrPo2 = new FeeAttrPo();
+ feeAttrPo2.setFeeId(payFeePo.getFeeId());
+ feeAttrPo2.setCommunityId(reqJson.getString("communityId"));
+ feeAttrPo2.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo2.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME); //涓氫富鍚嶇О
+ feeAttrPo2.setValue(reqJson.getString("personName"));
+ feeAttrOwnerNamePos.add(feeAttrPo2);
+ FeeAttrPo feeAttrPo3 = new FeeAttrPo();
+ feeAttrPo3.setFeeId(payFeePo.getFeeId());
+ feeAttrPo3.setCommunityId(reqJson.getString("communityId"));
+ feeAttrPo3.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo3.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK); //鑱旂郴鏂瑰紡
+ feeAttrPo3.setValue(reqJson.getString("personTel"));
+ feeAttrOwnerLinkPos.add(feeAttrPo3);
+ if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {//涓�娆℃�ц垂鐢�
+ FeeAttrPo feeAttrPo4 = new FeeAttrPo();
+ feeAttrPo4.setFeeId(payFeePo.getFeeId());
+ feeAttrPo4.setCommunityId(reqJson.getString("communityId"));
+ feeAttrPo4.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo4.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME); //缁撴潫鏃堕棿
+ feeAttrPo4.setValue(reqJson.getString("startTime"));
+ feeAttrOwnerTimePos.add(feeAttrPo4);
+ }
+ }
+ //鐢熸垚璐圭敤
+ feeInnerServiceSMOImpl.saveFee(payFeePos);
+ //鎻掑叆璐圭敤灞炴��(涓氫富id)
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrOwnerIdPos);
+ //鎻掑叆璐圭敤灞炴��(涓氫富濮撳悕)
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrOwnerNamePos);
+ //鎻掑叆璐圭敤灞炴��(涓氫富鑱旂郴鏂瑰紡)
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrOwnerLinkPos);
+ //鎻掑叆璐圭敤灞炴��(璐圭敤鎴鏃堕棿)
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrOwnerTimePos);
+ }
return saveRoomRenovationBMOImpl.save(roomRenovationPo);
}
@@ -286,6 +424,8 @@
String rId = roomRenovationPo.getrId();
//鐘舵��
String state = roomRenovationPo.getState();
+ //鏄惁杩濊
+ String isTrue = roomRenovationPo.getIsTrue();
//鏌ヨ褰撳墠鐢ㄦ埛淇℃伅
UserDto userDto = new UserDto();
userDto.setUserId(userId);
@@ -300,6 +440,7 @@
roomRenovationRecordPo.setCreateTime(format.format(new Date()));
roomRenovationRecordPo.setStaffId(userId);
roomRenovationRecordPo.setStaffName(users.get(0).getName());
+ roomRenovationRecordPo.setIsTrue(isTrue);
saveRoomRenovationRecordBMO.saveRecord(roomRenovationRecordPo);
FileRelPo fileRelPo = new FileRelPo();
fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
@@ -399,6 +540,11 @@
@RequestParam(value = "roomName", required = false) String roomName,
@RequestParam(value = "personName", required = false) String personName,
@RequestParam(value = "personTel", required = false) String personTel,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "isPostpone", required = false) String isPostpone,
+ @RequestParam(value = "renovationTime", required = false) String renovationTime,
+ @RequestParam(value = "renovationStartTime", required = false) String renovationStartTime,
+ @RequestParam(value = "renovationEndTime", required = false) String renovationEndTime,
@RequestHeader(value = "user-id") String userId,
@RequestParam(value = "page", required = false) int page,
@RequestParam(value = "row", required = false) int row) {
@@ -410,7 +556,12 @@
roomRenovationDto.setRoomName(roomName);
roomRenovationDto.setPersonName(personName);
roomRenovationDto.setPersonTel(personTel);
+ roomRenovationDto.setState(state);
roomRenovationDto.setUserId(userId);
+ roomRenovationDto.setIsPostpone(isPostpone);
+ roomRenovationDto.setRenovationTime(renovationTime);
+ roomRenovationDto.setRenovationStartTime(renovationStartTime);
+ roomRenovationDto.setRenovationEndTime(renovationEndTime);
return getRoomRenovationBMOImpl.get(roomRenovationDto);
}
@@ -445,15 +596,19 @@
roomDto.setRoomId(reqJson.getString("roomId"));
//鐘舵�佸彉涓哄凡瑁呬慨
roomDto.setState("2005");
+ //楠屾敹鎴愬姛
+ roomRenovationDetailPo.setState("3000");
saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
return updateRoomRenovationBMOImpl.updateRoom(roomDto);
- } else if (roomRenovationDetailPo.getState().equals("6000")) {
- RoomDto roomDto = new RoomDto();
- roomDto.setRoomId(reqJson.getString("roomId"));
- //鐘舵�佸彉涓哄凡浜ゆ埧
- roomDto.setState("2003");
- saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
- return updateRoomRenovationBMOImpl.updateRoom(roomDto);
+ } else if (roomRenovationDetailPo.getState().equals("6000")) { //楠屾敹澶辫触瑁呬慨鐘舵�佸彉涓鸿淇腑
+ RoomRenovationPo roomRenovation = new RoomRenovationPo();
+ roomRenovation.setrId(roomRenovationDetailPo.getrId());
+ roomRenovation.setState("3000");
+ //楠屾敹澶辫触鎶婃埧灞嬬姸鎬佸彉涓鸿淇腑锛岃涓氫富瑁呬慨鏁存敼
+ updateRoomRenovationBMOImpl.update(roomRenovation);
+ //楠屾敹澶辫触
+ roomRenovationDetailPo.setState("4000");
+ return saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
} else {
return saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
}
--
Gitblit v1.8.0