From 586aa07aa928bff687eb36520de2034fff041487 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 06 七月 2023 16:36:24 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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
index 49c06f8..4da8e3f 100755
--- 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
@@ -12,6 +12,7 @@
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.parking.ParkingSpaceDto;
import com.java110.fee.bmo.meterWater.IQueryPreMeterWater;
+import com.java110.fee.feeMonth.IPayFeeMonth;
import com.java110.intf.community.IParkingSpaceInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
@@ -65,6 +66,8 @@
@Autowired
private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeMonth payFeeMonthImpl;
@Override
public ResponseEntity<String> query(MeterWaterDto meterWaterDto, String roomNum) {
@@ -155,7 +158,15 @@
feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrPos);
}
+
meterWaterInnerServiceSMOImpl.saveMeterWaters(meterWaterPos);
+
+ // todo 杩欓噷寮傛鐨勬柟寮忚绠� 鏈堟暟鎹� 鍜屾瑺璐规暟鎹�
+ List<String> feeIds = new ArrayList<>();
+ for (PayFeePo feePo : fees) {
+ feeIds.add(feePo.getFeeId());
+ }
+ payFeeMonthImpl.doGeneratorFeeMonths(feeIds, fees.get(0).getCommunityId());
return ResultVo.success();
}
@@ -173,6 +184,8 @@
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
Assert.listOnlyOne(roomDtos, "鎴垮眿鏈壘鍒版垨鎵惧埌澶氭潯" + importExportMeterWaterDto.getFloorNum() + "-" + importExportMeterWaterDto.getUnitNum() + "-" + importExportMeterWaterDto.getRoomNum());
+
+ String roomName = importExportMeterWaterDto.getFloorNum() + "-" + importExportMeterWaterDto.getUnitNum() + "-" + importExportMeterWaterDto.getRoomNum();
importExportMeterWaterDto.setMeterType(meterType);
//鏌ヨ鎴垮眿鏄惁鏈夊悎鍚�
@@ -202,8 +215,7 @@
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() + "瀹�";
-
+ String feeName = roomName;
if ("1010".equals(importExportMeterWaterDto.getMeterType())) {
feeName += "姘磋垂";
} else if ("2020".equals(importExportMeterWaterDto.getMeterType())) {
@@ -216,13 +228,23 @@
feeAttrPos.add(feeAttrPo);
}
+
+ //todo 淇濆瓨鎴垮眿鍚嶇О
+ FeeAttrPo feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(communityId);
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME);
+ feeAttrPo.setValue(roomName);
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ 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 = new FeeAttrPo();
feeAttrPo.setCommunityId(communityId);
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
feeAttrPo.setValue(ownerDtos.get(0).getOwnerId());
@@ -250,7 +272,7 @@
payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
payFeePo.setState(FeeDto.STATE_DOING);
// 濡傛灉 褰撳墠璇绘暟灏忎簬绛変簬涓婃湡璇绘暟
- if(Double.parseDouble(importExportMeterWaterDto.getCurDegrees()) <= Double.parseDouble(importExportMeterWaterDto.getPreDegrees())){
+ if (Double.parseDouble(importExportMeterWaterDto.getCurDegrees()) <= Double.parseDouble(importExportMeterWaterDto.getPreDegrees())) {
payFeePo.setState(FeeDto.STATE_FINISH);
}
@@ -288,7 +310,7 @@
return false;
}
if (MeterWaterDto.METER_TYPE_ROOM.equals(meterWaterDto.getObjType())) {
- String[] nums = roomNum.split("-",3);
+ String[] nums = roomNum.split("-", 3);
if (nums.length != 3) {
return false;
}
@@ -305,7 +327,7 @@
meterWaterDto.setObjId(roomDtos.get(0).getRoomId());
} else {
- String[] nums = roomNum.split("-",2);
+ String[] nums = roomNum.split("-", 2);
if (nums.length != 2) {
return false;
}
--
Gitblit v1.8.0