From 2703710ab562eca0b94fbfda76a196cc30e64483 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 18 四月 2023 00:06:07 +0800
Subject: [PATCH] 优化 导入费用时，模板上能体现一下房屋状态，这样未销售房就不会依然被填入
---
service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 207 insertions(+), 7 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java
old mode 100644
new mode 100755
index 90eedf9..de021d2
--- a/service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java
@@ -1,21 +1,34 @@
package com.java110.fee.bmo.meterWater.impl;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
+import com.java110.dto.contract.ContractRoomDto;
+import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.meterWater.ImportExportMeterWaterDto;
import com.java110.dto.meterWater.MeterWaterDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.fee.bmo.meterWater.IQueryPreMeterWater;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.fee.IMeterWaterInnerServiceSMO;
+import com.java110.intf.store.IContractRoomInnerServiceSMO;
+import com.java110.intf.user.IOwnerInnerServiceSMO;
+import com.java110.po.fee.FeeAttrPo;
+import com.java110.po.fee.PayFeePo;
+import com.java110.po.meterWater.MeterWaterPo;
+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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -39,6 +52,18 @@
@Autowired
private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+ @Autowired
+ private IContractRoomInnerServiceSMO contractRoomInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
@Override
@@ -65,17 +90,192 @@
meterWaterDto = new MeterWaterDto();
meterWaterDto.setMeterType(meterType);
meterWaterDto.setObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ meterWaterDto.setObjId(tmpRoomDto.getRoomId());
+ meterWaterDto.setCommunityId(communityId);
List<MeterWaterDto> meterWaterDtos = meterWaterInnerServiceSMOImpl.queryMeterWaters(meterWaterDto);
importExportMeterWaterDto = BeanConvertUtil.covertBean(tmpRoomDto, ImportExportMeterWaterDto.class);
- String preDegree = meterWaterDtos == null ? "0" : meterWaterDtos.get(0).getCurDegrees();
- String preReadTime = meterWaterDtos == null ? DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A)
- : meterWaterDtos.get(0).getCurReadingTime();
-
+ String preDegree = "0";
+ String preReadTime = DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B);
+ double price = 0;
+ if (meterWaterDtos != null && meterWaterDtos.size() > 0) {
+ preDegree = meterWaterDtos.get(0).getCurDegrees();
+ preReadTime = DateUtil.dateTimeToDate(meterWaterDtos.get(0).getCurReadingTime());
+ price = meterWaterDtos.get(0).getPrice();
+ }
importExportMeterWaterDto.setPreDegrees(preDegree);
importExportMeterWaterDto.setPreReadingTime(preReadTime);
+ importExportMeterWaterDto.setPrice(price);
importExportMeterWaterDtos.add(importExportMeterWaterDto);
}
return ResultVo.createResponseEntity(1, importExportMeterWaterDtos.size(), importExportMeterWaterDtos);
+ }
+
+ @Override
+ public ResponseEntity<String> importMeterWater(JSONObject reqJson) {
+ String communityId = reqJson.getString("communityId");
+ String storeId = reqJson.getString("storeId");
+ String configId = reqJson.getString("configId");
+ String userId = reqJson.getString("userId");
+ String feeTypeCd = reqJson.getString("feeTypeCd");
+ String batchId = reqJson.getString("batchId");
+ String meterType = reqJson.getString("meterType");
+ JSONArray importMeteWaterFees = reqJson.getJSONArray("importMeteWaterFees");
+ JSONObject meteWaterJson = null;
+ ImportExportMeterWaterDto importExportMeterWaterDto = null;
+
+ List<PayFeePo> fees = new ArrayList<>();
+ List<MeterWaterPo> meterWaterPos = new ArrayList<>();
+ List<FeeAttrPo> feeAttrPos = new ArrayList<>();
+ for (int meteWaterIndex = 0; meteWaterIndex < importMeteWaterFees.size(); meteWaterIndex++) {
+ meteWaterJson = importMeteWaterFees.getJSONObject(meteWaterIndex);
+
+ importExportMeterWaterDto = BeanConvertUtil.covertBean(meteWaterJson, ImportExportMeterWaterDto.class);
+
+ dealImportExportMeterWater(importExportMeterWaterDto,
+ communityId,
+ storeId,
+ configId,
+ userId,
+ feeTypeCd,
+ fees,
+ meterWaterPos,
+ feeAttrPos,
+ batchId,
+ meterType
+ );
+ }
+
+ if (fees.size() < 1 || meterWaterPos.size() < 1) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鎵归噺鎶勮〃澶辫触");
+ }
+
+ feeInnerServiceSMOImpl.saveFee(fees);
+
+ if (feeAttrPos.size() > 0) {
+ feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
+ }
+
+ meterWaterInnerServiceSMOImpl.saveMeterWaters(meterWaterPos);
+ return ResultVo.success();
+ }
+
+
+ private void dealImportExportMeterWater(ImportExportMeterWaterDto importExportMeterWaterDto, String communityId,
+ String storeId, String configId, String userId, String feeTypeCd,
+ List<PayFeePo> fees, List<MeterWaterPo> meterWaterPos, List<FeeAttrPo> feeAttrPos,
+ String batchId, String meterType) {
+
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(communityId);
+ roomDto.setFloorNum(importExportMeterWaterDto.getFloorNum());
+ roomDto.setUnitNum(importExportMeterWaterDto.getUnitNum());
+ roomDto.setRoomNum(importExportMeterWaterDto.getRoomNum());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+
+ Assert.listOnlyOne(roomDtos, "鎴垮眿鏈壘鍒版垨鎵惧埌澶氭潯" + importExportMeterWaterDto.getFloorNum() + "-" + importExportMeterWaterDto.getUnitNum() + "-" + importExportMeterWaterDto.getRoomNum());
+
+ importExportMeterWaterDto.setMeterType(meterType);
+ //鏌ヨ鎴垮眿鏄惁鏈夊悎鍚�
+ ContractRoomDto contractRoomDto = new ContractRoomDto();
+
+ contractRoomDto.setRoomId(roomDtos.get(0).getRoomId());
+
+ List<ContractRoomDto> contractRoomDtos = contractRoomInnerServiceSMOImpl.queryContractRooms(contractRoomDto);
+
+
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setIncomeObjId(storeId);
+ payFeePo.setAmount("-1");
+ payFeePo.setStartTime(importExportMeterWaterDto.getPreReadingTime());
+ payFeePo.setEndTime(importExportMeterWaterDto.getPreReadingTime());
+ payFeePo.setPayerObjId(roomDtos.get(0).getRoomId());
+ payFeePo.setBatchId(batchId);
+ //payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+
+ if (contractRoomDtos != null && contractRoomDtos.size() > 0) {
+ payFeePo.setPayerObjId(contractRoomDtos.get(0).getContractId());
+ //payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
+ FeeAttrPo feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
+ String feeName = importExportMeterWaterDto.getFloorNum() + "鏍�" + importExportMeterWaterDto.getUnitNum() + "鍗曞厓" + importExportMeterWaterDto.getRoomNum() + "瀹�";
+
+ if ("1010".equals(importExportMeterWaterDto.getMeterType())) {
+ feeName += "姘磋垂";
+ } else if ("2020".equals(importExportMeterWaterDto.getMeterType())) {
+ feeName += "鐢佃垂";
+ } else {
+ feeName += "鐕冩皵璐�";
+ }
+ feeAttrPo.setValue(feeName);
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
+ }
+
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setCommunityId(communityId);
+ ownerDto.setRoomId(roomDtos.get(0).getRoomId());
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
+
+ if (ownerDtos != null && ownerDtos.size() > 0) {
+ FeeAttrPo feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
+ feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
+ feeAttrPo.setValue(ownerDtos.get(0).getLink());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPos.add(feeAttrPo);
+
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
+ feeAttrPo.setValue(ownerDtos.get(0).getName());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPos.add(feeAttrPo);
+
+ }
+ payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
+ payFeePo.setState(FeeDto.STATE_DOING);
+ // 濡傛灉 褰撳墠璇绘暟灏忎簬绛変簬涓婃湡璇绘暟
+ if(Double.parseDouble(importExportMeterWaterDto.getCurDegrees()) <= Double.parseDouble(importExportMeterWaterDto.getPreDegrees())){
+ payFeePo.setState(FeeDto.STATE_FINISH);
+ }
+
+ payFeePo.setUserId(userId);
+ payFeePo.setFeeTypeCd(feeTypeCd);
+ payFeePo.setConfigId(configId);
+ payFeePo.setCommunityId(communityId);
+ fees.add(payFeePo);
+
+
+ MeterWaterPo meterWaterPo = new MeterWaterPo();
+ meterWaterPo.setCommunityId(communityId);
+ meterWaterPo.setCurDegrees(importExportMeterWaterDto.getCurDegrees());
+ meterWaterPo.setCurReadingTime(importExportMeterWaterDto.getCurReadingTime());
+ meterWaterPo.setFeeId(payFeePo.getFeeId());
+ meterWaterPo.setMeterType(importExportMeterWaterDto.getMeterType());
+ meterWaterPo.setObjId(roomDtos.get(0).getRoomId());
+ meterWaterPo.setObjName(importExportMeterWaterDto.getFloorNum() + "-" + importExportMeterWaterDto.getUnitNum() + "-" + importExportMeterWaterDto.getRoomNum());
+ meterWaterPo.setObjType(MeterWaterDto.OBJ_TYPE_ROOM);
+ meterWaterPo.setPreDegrees(importExportMeterWaterDto.getPreDegrees());
+ meterWaterPo.setPreReadingTime(importExportMeterWaterDto.getPreReadingTime());
+ meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId));
+ meterWaterPo.setRemark(importExportMeterWaterDto.getRemark());
+ meterWaterPo.setPrice(importExportMeterWaterDto.getPrice());
+ meterWaterPos.add(meterWaterPo);
}
private boolean freshFeeDtoParam(MeterWaterDto meterWaterDto, String roomNum) {
@@ -88,7 +288,7 @@
return false;
}
if (MeterWaterDto.METER_TYPE_ROOM.equals(meterWaterDto.getObjType())) {
- String[] nums = roomNum.split("-");
+ String[] nums = roomNum.split("-",3);
if (nums.length != 3) {
return false;
}
@@ -105,7 +305,7 @@
meterWaterDto.setObjId(roomDtos.get(0).getRoomId());
} else {
- String[] nums = roomNum.split("-");
+ String[] nums = roomNum.split("-",2);
if (nums.length != 2) {
return false;
}
--
Gitblit v1.8.0