From a26c074129afced8fe87e300fb501030fde0c056 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期五, 04 七月 2025 18:38:29 +0800
Subject: [PATCH] 添加二级费用项

---
 service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java
index 4c79dc3..95cde64 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java
@@ -193,14 +193,17 @@
             reqJson.put("feeId", payFeePo.getFeeId());
             addMeterWater(reqJson, roomList.get(0));
 
-
+            int flag = payFeeV1InnerServiceSMOImpl.savePayFee(payFeePo);
+            if (flag < 1) {
+                throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+            }
             FeeAttrPo feeAttrPo = new FeeAttrPo();
             feeAttrPo.setCommunityId(reqJson.getString("communityId"));
             feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
             feeAttrPo.setValue(reqJson.getString("curReadingTime"));
             feeAttrPo.setFeeId(payFeePo.getFeeId());
             feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
-            int flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
+            flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
             if (flag < 1) {
                 throw new CmdException("淇濆瓨鏁版嵁澶辫触");
             }
@@ -212,7 +215,7 @@
             feeAttrPo.setValue(roomList.get(0).getFloorNum() + "-" + roomList.get(0).getUnitNum() + "-" + roomList.get(0).getRoomNum());
             feeAttrPo.setFeeId(payFeePo.getFeeId());
             feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
-             flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
+            flag = feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
             if (flag < 1) {
                 throw new CmdException("淇濆瓨鏁版嵁澶辫触");
             }
@@ -222,7 +225,7 @@
             ownerDto.setRoomId(reqJson.getString("objId"));
             List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
 
-            if (!ListUtil.isNull(ownerDtos)) {
+            if (ownerDtos != null && ownerDtos.size() > 0) {
                 feeAttrPo = new FeeAttrPo();
                 feeAttrPo.setCommunityId(reqJson.getString("communityId"));
                 feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
@@ -256,10 +259,7 @@
                     throw new CmdException("淇濆瓨鏁版嵁澶辫触");
                 }
             }
-             flag = payFeeV1InnerServiceSMOImpl.savePayFee(payFeePo);
-            if (flag < 1) {
-                throw new CmdException("淇濆瓨鏁版嵁澶辫触");
-            }
+
         }
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }

--
Gitblit v1.8.0