From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费
---
service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 155 insertions(+), 24 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
index ed07c28..b30ca51 100755
--- a/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/contract/impl/UpdateContractBMOImpl.java
@@ -4,44 +4,50 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.contract.ContractDto;
-import com.java110.dto.contractAttr.ContractAttrDto;
-import com.java110.dto.contractChangePlan.ContractChangePlanDto;
-import com.java110.dto.contractChangePlanDetail.ContractChangePlanDetailDto;
-import com.java110.dto.contractChangePlanRoom.ContractChangePlanRoomDto;
-import com.java110.dto.contractRoom.ContractRoomDto;
+import com.java110.dto.contract.ContractAttrDto;
+import com.java110.dto.contract.ContractChangePlanDto;
+import com.java110.dto.contract.ContractChangePlanDetailDto;
+import com.java110.dto.contract.ContractChangePlanRoomDto;
+import com.java110.dto.contract.ContractRoomDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerRoomRelDto;
-import com.java110.dto.rentingPool.RentingPoolDto;
+import com.java110.dto.renting.RentingPoolDto;
import com.java110.dto.store.StoreDto;
import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.store.*;
+import com.java110.intf.store.IContractAttrInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanDetailInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanInnerServiceSMO;
+import com.java110.intf.store.IContractChangePlanRoomInnerServiceSMO;
+import com.java110.intf.store.IContractFileInnerServiceSMO;
+import com.java110.intf.store.IContractInnerServiceSMO;
+import com.java110.intf.store.IContractRoomInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.intf.user.IRentingPoolInnerServiceSMO;
import com.java110.po.contract.ContractPo;
-import com.java110.po.contractAttr.ContractAttrPo;
-import com.java110.po.contractChangePlan.ContractChangePlanPo;
-import com.java110.po.contractChangePlanRoom.ContractChangePlanRoomPo;
-import com.java110.po.contractFile.ContractFilePo;
-import com.java110.po.contractRoom.ContractRoomPo;
+import com.java110.po.contract.ContractAttrPo;
+import com.java110.po.contract.ContractChangePlanPo;
+import com.java110.po.contract.ContractFilePo;
+import com.java110.po.contract.ContractRoomPo;
import com.java110.po.owner.OwnerRoomRelPo;
-import com.java110.po.rentingPool.RentingPoolPo;
+import com.java110.po.renting.RentingPoolPo;
import com.java110.po.room.RoomPo;
import com.java110.store.bmo.contract.IUpdateContractBMO;
import com.java110.store.bmo.contractFile.IDeleteContractFileBMO;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
-import org.apache.http.annotation.Contract;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
@Service("updateContractBMOImpl")
@@ -108,10 +114,12 @@
deleteContractFileBMOImpl.delete(contractFilePo);
List<ContractFilePo> filePos = contractPo.getContractFilePo();
- for (ContractFilePo file: filePos) {
- if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0){
- file.setContractId(contractPo.getContractId());
- contractFileInnerServiceSMOImpl.saveContractFile(file);
+ if (filePos != null) {
+ for (ContractFilePo file : filePos) {
+ if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0) {
+ file.setContractId(contractPo.getContractId());
+ contractFileInnerServiceSMOImpl.saveContractFile(file);
+ }
}
}
@@ -137,6 +145,52 @@
}
+ @Java110Transactional
+ public ResponseEntity<String> update(ContractDto contractPo, JSONObject reqJson) {
+
+ int flag = contractInnerServiceSMOImpl.updateContract(contractPo);
+
+ if (flag < 1) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "淇濆瓨澶辫触");
+
+ }
+
+ //闄勪欢淇濆瓨--鍏堝垹闄ゅ師鏉ユ墍鏈夌殑闄勪欢鍐嶈繘琛屼繚瀛�
+// ContractFilePo contractFilePo = new ContractFilePo();
+// contractFilePo.setContractId(contractPo.getContractId());
+// deleteContractFileBMOImpl.delete(contractFilePo);
+
+// List<ContractFilePo> filePos = contractPo.getContractFilePo();
+// if (filePos != null) {
+// for (ContractFilePo file : filePos) {
+// if (file.getFileRealName().length() > 0 && file.getFileSaveName().length() > 0) {
+// file.setContractId(contractPo.getContractId());
+// contractFileInnerServiceSMOImpl.saveContractFile(file);
+// }
+// }
+// }
+
+
+// noticeRentUpdateState(contractPo);
+
+ if (!reqJson.containsKey("contractTypeSpecs")) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+ }
+
+
+ JSONArray contractTypeSpecs = reqJson.getJSONArray("contractTypeSpecs");
+
+ if (contractTypeSpecs.size() < 1) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+ }
+
+ for (int typeSpecIndex = 0; typeSpecIndex < contractTypeSpecs.size(); typeSpecIndex++) {
+ updateContractAttr(contractTypeSpecs.getJSONObject(typeSpecIndex), contractPo);
+ }
+
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "淇濆瓨鎴愬姛");
+
+ }
@Override
public ResponseEntity<String> needAuditContract(ContractDto contractDto, JSONObject reqJson) {
@@ -146,6 +200,7 @@
List<ContractDto> contractDtos = contractInnerServiceSMOImpl.queryContracts(tmpContractDto);
Assert.listOnlyOne(contractDtos, "鍚堝悓涓嶅瓨鍦�");
contractDto.setStartUserId(contractDtos.get(0).getStartUserId());
+ contractDto.setNextUserId(reqJson.getString("nextUserId"));
boolean isLastTask = contractApplyUserInnerServiceSMOImpl.completeTask(contractDto);
if (isLastTask) {
@@ -158,6 +213,9 @@
ContractPo contractPo = new ContractPo();
contractPo.setContractId(contractDto.getContractId());
contractPo.setState(ContractDto.STATE_AUDIT_DOING);
+ if ("1200".equals(reqJson.getString("state"))) {
+ contractPo.setState(ContractDto.STATE_FAIL);
+ }
contractPo.setStatusCd(StatusConstant.STATUS_CD_VALID);
contractInnerServiceSMOImpl.updateContract(contractPo);
}
@@ -181,6 +239,7 @@
List<ContractChangePlanDto> contractChangePlanDtos = contractChangePlanInnerServiceSMOImpl.queryContractChangePlans(tmpContractChangePlanDto);
Assert.listOnlyOne(contractChangePlanDtos, "鍚堝悓璁″垝涓嶅瓨鍦�");
contractChangePlanDto.setStartUserId(contractChangePlanDtos.get(0).getChangePerson());
+ contractChangePlanDto.setNextUserId(reqJson.getString("nextUserId"));
boolean isLastTask = contractChangeUserInnerServiceSMOImpl.completeTask(contractChangePlanDto);
if (isLastTask) {
@@ -201,7 +260,15 @@
ContractPo contractPo = BeanConvertUtil.covertBean(contractChangePlanDetailDtos.get(0), ContractPo.class);
contractInnerServiceSMOImpl.updateContract(contractPo);
- dealContractChangePlanRoom(contractChangePlanDto,contractDtos.get(0));
+ //todo 瑙ｅ喅鍚堝悓bug 鍙湁 璧勪骇鍙樻洿鏃� 鎿嶄綔 鍚堝悓鎴垮眿
+ if (ContractChangePlanDto.PLAN_TYPE_CHANGE_ROOM.equals(contractChangePlanDtos.get(0).getPlanType())) {
+ dealContractChangePlanRoom(contractChangePlanDto, contractDtos.get(0));
+ }
+
+ //todo 濡傛灉鏄鏈熷彉鏇存椂 灏嗘埧灞嬬殑鏃堕棿淇敼涓哄彉鏇村悗鐨勬椂闂�
+ if (ContractChangePlanDto.PLAN_TYPE_CHANGE_RENT_DATE.equals(contractChangePlanDtos.get(0).getPlanType())) {
+ changeRoomEndTime(contractChangePlanDto, contractDtos.get(0));
+ }
} else { //淇敼涓哄鏍镐腑
ContractChangePlanPo contractChangePlanPo = new ContractChangePlanPo();
@@ -211,6 +278,49 @@
contractChangePlanInnerServiceSMOImpl.updateContractChangePlan(contractChangePlanPo);
}
return ResultVo.success();
+ }
+
+ /**
+ * 淇敼鎴垮眿鐨勭鏈�
+ *
+ * @param contractChangePlanDto
+ * @param contractDto
+ */
+ private void changeRoomEndTime(ContractChangePlanDto contractChangePlanDto, ContractDto contractDto) {
+
+ //鏌ヨ鍚堝悓鎴垮眿
+ ContractRoomDto contractRoomDto = new ContractRoomDto();
+ contractRoomDto.setStoreId(contractChangePlanDto.getStoreId());
+ contractRoomDto.setContractId(contractDto.getContractId());
+ List<ContractRoomDto> oldContractRoomDtos = contractRoomInnerServiceSMOImpl.queryContractRooms(contractRoomDto);
+ if (oldContractRoomDtos == null || oldContractRoomDtos.size() < 1) {
+ return;
+ }
+ Date contractEndDate = DateUtil.getDateFromStringA(contractDto.getEndTime());
+ for (ContractRoomDto oldContractRoomDto : oldContractRoomDtos) {
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setRoomId(oldContractRoomDto.getRoomId());
+ ownerRoomRelDto.setOwnerId(contractDto.getObjId());
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+
+ if (ownerRoomRelDtos == null || ownerRoomRelDtos.size() < 1) { // 璇存槑涓氫富娌℃湁鍙戠敓鍙樺寲锛屽悗缁伐浣滀笉鍋氬鐞�
+ continue;
+ }
+
+ // todo 濡傛灉鍚堝悓鐨勫皬浜庢埧灞嬬殑鍒� 涓嶄慨鏀�
+ // todo 杩欏潡鍙互鏍规嵁瀹為檯鐨勪竴涓娇鐢ㄦ儏鍐电湅鐪嬭涓嶈闄愬埗
+ Date roomEndDate = ownerRoomRelDtos.get(0).getEndTime();
+ if(contractEndDate.getTime() < roomEndDate.getTime()){
+ continue;
+ }
+
+ //todo 淇敼鏃堕棿
+ OwnerRoomRelPo ownerRoomRelPo = new OwnerRoomRelPo();
+ ownerRoomRelPo.setEndTime(contractDto.getEndTime());
+ ownerRoomRelPo.setStartTime(contractDto.getStartTime());
+ ownerRoomRelPo.setRelId(ownerRoomRelDtos.get(0).getRelId());
+ ownerRoomRelInnerServiceSMOImpl.updateOwnerRoomRels(ownerRoomRelPo);
+ }
}
private void dealContractChangePlanRoom(ContractChangePlanDto contractChangePlanDto, ContractDto contractDto) {
@@ -235,10 +345,10 @@
doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
return;
}
- doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
-
//鍒犻櫎鑰佺殑鍏崇郴鍊�
doDelOldRoomRel(contractChangePlanRoomDtos, oldContractRoomDtos);
+ //澧炲姞
+ doAddRoomRel(contractDto, oldContractRoomDtos, contractChangePlanRoomDtos);
}
@@ -361,7 +471,7 @@
}
private boolean isDelOldRoom(ContractRoomDto oldContractRoomDto, List<ContractChangePlanRoomDto> contractChangePlanRoomDtos) {
- if (contractChangePlanRoomDtos == null || contractChangePlanRoomDtos.size() > 0) {
+ if (contractChangePlanRoomDtos == null || contractChangePlanRoomDtos.size() < 1) {
return false;
}
@@ -375,7 +485,7 @@
}
private boolean isOldRoom(ContractChangePlanRoomDto tmpContractChangePlanRoomDto, List<ContractRoomDto> oldContractRoomDtos) {
- if (oldContractRoomDtos == null || oldContractRoomDtos.size() > 0) {
+ if (oldContractRoomDtos == null || oldContractRoomDtos.size() < 1) {
return false;
}
@@ -387,6 +497,7 @@
return false;
}
+
private void updateContractAttr(JSONObject jsonObject, ContractPo contractPo) {
ContractAttrDto contractAttrDto = new ContractAttrDto();
contractAttrDto.setContractId(contractPo.getContractId());
@@ -407,6 +518,26 @@
}
}
+ private void updateContractAttr(JSONObject jsonObject, ContractDto contractPo) {
+ ContractAttrDto contractAttrDto = new ContractAttrDto();
+ contractAttrDto.setContractId(contractPo.getContractId());
+ contractAttrDto.setSpecCd(jsonObject.getString("specCd"));
+ List<ContractAttrDto> contractAttrDtos = contractAttrInnerServiceSMOImpl.queryContractAttrs(contractAttrDto);
+
+ Assert.listOnlyOne(contractAttrDtos, "鏈壘鍒伴渶瑕佷慨鏀圭殑鍚堝悓灞炴��");
+ ContractAttrPo contractAttrPo = new ContractAttrPo();
+ contractAttrPo.setAttrId(contractAttrDtos.get(0).getAttrId());
+ contractAttrPo.setContractId(contractPo.getContractId());
+ contractAttrPo.setSpecCd(jsonObject.getString("specCd"));
+ contractAttrPo.setValue(jsonObject.getString("value"));
+ contractAttrPo.setStoreId(contractPo.getStoreId());
+ int count = contractAttrInnerServiceSMOImpl.updateContractAttr(contractAttrPo);
+
+ if (count < 1) {
+ throw new IllegalArgumentException("淇濆瓨灞炴�уけ璐�");
+ }
+ }
+
/**
* 淇敼 鎴垮眿绉熻祦鐘舵��
*
--
Gitblit v1.8.0