From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +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 | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 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 97ab58e..e292e27 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
@@ -6,7 +6,6 @@
import com.java110.dto.RoomDto;
import com.java110.dto.contractRoom.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;
@@ -29,7 +28,7 @@
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;
@@ -97,12 +96,15 @@
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);
@@ -115,6 +117,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;
@@ -135,7 +139,9 @@
feeTypeCd,
fees,
meterWaterPos,
- feeAttrPos
+ feeAttrPos,
+ batchId,
+ meterType
);
}
@@ -153,9 +159,11 @@
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);
@@ -166,14 +174,7 @@
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");
- }
-
+ importExportMeterWaterDto.setMeterType(meterType);
//鏌ヨ鎴垮眿鏄惁鏈夊悎鍚�
ContractRoomDto contractRoomDto = new ContractRoomDto();
@@ -189,6 +190,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);
@@ -204,8 +206,10 @@
if ("1010".equals(importExportMeterWaterDto.getMeterType())) {
feeName += "姘磋垂";
- } else {
+ } else if ("2020".equals(importExportMeterWaterDto.getMeterType())) {
feeName += "鐢佃垂";
+ } else {
+ feeName += "鐕冩皵璐�";
}
feeAttrPo.setValue(feeName);
feeAttrPo.setFeeId(payFeePo.getFeeId());
@@ -265,6 +269,7 @@
meterWaterPo.setPreReadingTime(importExportMeterWaterDto.getPreReadingTime());
meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId));
meterWaterPo.setRemark(importExportMeterWaterDto.getRemark());
+ meterWaterPo.setPrice(importExportMeterWaterDto.getPrice());
meterWaterPos.add(meterWaterPo);
}
@@ -278,7 +283,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;
}
@@ -295,7 +300,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