From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-fee/src/main/java/com/java110/fee/bmo/meterWater/impl/QueryPreMeterWaterImpl.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 4da8e3f..9110a10 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
@@ -197,7 +197,7 @@
PayFeePo payFeePo = new PayFeePo();
- payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId,true));
payFeePo.setIncomeObjId(storeId);
payFeePo.setAmount("-1");
payFeePo.setStartTime(importExportMeterWaterDto.getPreReadingTime());
@@ -213,7 +213,7 @@
payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
FeeAttrPo feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(communityId);
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
String feeName = roomName;
if ("1010".equals(importExportMeterWaterDto.getMeterType())) {
@@ -235,7 +235,7 @@
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME);
feeAttrPo.setValue(roomName);
feeAttrPo.setFeeId(payFeePo.getFeeId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPos.add(feeAttrPo);
OwnerDto ownerDto = new OwnerDto();
@@ -249,7 +249,7 @@
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));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPos.add(feeAttrPo);
feeAttrPo = new FeeAttrPo();
@@ -257,7 +257,7 @@
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));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPos.add(feeAttrPo);
feeAttrPo = new FeeAttrPo();
@@ -265,16 +265,17 @@
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));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
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);
- }
+ //todo 濡傛灉 褰撳墠璇绘暟灏忎簬绛変簬涓婃湡璇绘暟
+ //todo 杩欓噷娉ㄩ噴锛屾湰鏉ユ兂鐫� 鏂逛究鐗╀笟鍐嶄笉鐢ㄥ幓缂磋垂 璇绘暟涓�0 鐨勶紝缁撴灉鐗╀笟杩樹範鎯笉浜� 鎬讳互涓鸿鏁颁负0 鐨勬病鏈夋妱琛ㄦ垚鍔燂紝涓嶄細鍘荤粨鏉熻垂鐢ㄤ腑鏌ョ湅
+// if (Double.parseDouble(importExportMeterWaterDto.getCurDegrees()) <= Double.parseDouble(importExportMeterWaterDto.getPreDegrees())) {
+// payFeePo.setState(FeeDto.STATE_FINISH);
+// }
payFeePo.setUserId(userId);
payFeePo.setFeeTypeCd(feeTypeCd);
@@ -294,7 +295,7 @@
meterWaterPo.setObjType(MeterWaterDto.OBJ_TYPE_ROOM);
meterWaterPo.setPreDegrees(importExportMeterWaterDto.getPreDegrees());
meterWaterPo.setPreReadingTime(importExportMeterWaterDto.getPreReadingTime());
- meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId));
+ meterWaterPo.setWaterId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_waterId,true));
meterWaterPo.setRemark(importExportMeterWaterDto.getRemark());
meterWaterPo.setPrice(importExportMeterWaterDto.getPrice());
meterWaterPos.add(meterWaterPo);
--
Gitblit v1.8.0