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 | 118 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 94 insertions(+), 24 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 afb839c..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
@@ -3,31 +3,33 @@
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.contractRoom.ContractRoomDto;
+import com.java110.dto.room.RoomDto;
+import com.java110.dto.contract.ContractRoomDto;
import com.java110.dto.fee.FeeAttrDto;
-import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.meterWater.ImportExportMeterWaterDto;
-import com.java110.dto.meterWater.MeterWaterDto;
+import com.java110.dto.meter.ImportExportMeterWaterDto;
+import com.java110.dto.meter.MeterWaterDto;
+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;
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.po.meter.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;
@@ -61,6 +63,11 @@
@Autowired
private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
+ @Autowired
+ private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
+
+ @Autowired
+ private IPayFeeMonth payFeeMonthImpl;
@Override
public ResponseEntity<String> query(MeterWaterDto meterWaterDto, String roomNum) {
@@ -87,16 +94,20 @@
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 = "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);
@@ -109,6 +120,8 @@
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;
@@ -129,7 +142,9 @@
feeTypeCd,
fees,
meterWaterPos,
- feeAttrPos
+ feeAttrPos,
+ batchId,
+ meterType
);
}
@@ -143,13 +158,23 @@
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();
}
+
private void dealImportExportMeterWater(ImportExportMeterWaterDto importExportMeterWaterDto, String communityId,
String storeId, String configId, String userId, String feeTypeCd,
- List<PayFeePo> fees, List<MeterWaterPo> meterWaterPos, List<FeeAttrPo> feeAttrPos) {
+ List<PayFeePo> fees, List<MeterWaterPo> meterWaterPos, List<FeeAttrPo> feeAttrPos,
+ String batchId, String meterType) {
RoomDto roomDto = new RoomDto();
roomDto.setCommunityId(communityId);
@@ -160,14 +185,9 @@
Assert.listOnlyOne(roomDtos, "鎴垮眿鏈壘鍒版垨鎵惧埌澶氭潯" + importExportMeterWaterDto.getFloorNum() + "-" + importExportMeterWaterDto.getUnitNum() + "-" + importExportMeterWaterDto.getRoomNum());
- if (FeeConfigDto.FEE_TYPE_CD_WATER.equals(feeTypeCd)) {
- importExportMeterWaterDto.setMeterType("1010");
- }else if(FeeConfigDto.FEE_TYPE_CD_GAS.equals(feeTypeCd)){
- importExportMeterWaterDto.setMeterType("3030");
- } else {
- importExportMeterWaterDto.setMeterType("2020");
- }
+ String roomName = importExportMeterWaterDto.getFloorNum() + "-" + importExportMeterWaterDto.getUnitNum() + "-" + importExportMeterWaterDto.getRoomNum();
+ importExportMeterWaterDto.setMeterType(meterType);
//鏌ヨ鎴垮眿鏄惁鏈夊悎鍚�
ContractRoomDto contractRoomDto = new ContractRoomDto();
@@ -183,6 +203,7 @@
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);
@@ -194,19 +215,67 @@
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{
- feeName +="鐢佃垂";
+ String feeName = roomName;
+ 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);
}
+
+
+ //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 = 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);
@@ -227,6 +296,7 @@
meterWaterPo.setPreReadingTime(importExportMeterWaterDto.getPreReadingTime());
meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId));
meterWaterPo.setRemark(importExportMeterWaterDto.getRemark());
+ meterWaterPo.setPrice(importExportMeterWaterDto.getPrice());
meterWaterPos.add(meterWaterPo);
}
@@ -240,7 +310,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;
}
@@ -257,7 +327,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