From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 ee3cfaf..edb0316 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
@@ -22,13 +22,14 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.payFeeBatch.PayFeeBatchDto;
+import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.user.UserDto;
+import com.java110.fee.feeMonth.IPayFeeMonth;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IMeterWaterV1InnerServiceSMO;
@@ -38,8 +39,8 @@
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
-import com.java110.po.meterWater.MeterWaterPo;
-import com.java110.po.payFeeBatch.PayFeeBatchPo;
+import com.java110.po.meter.MeterWaterPo;
+import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -98,6 +99,7 @@
@Autowired
private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
+
@Autowired
private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
@@ -113,6 +115,10 @@
Assert.hasKeyAndValue(reqJson, "curReadingTime", "璇锋眰鎶ユ枃涓湭鍖呭惈curReadingTime");
Assert.hasKeyAndValue(reqJson, "objType", "璇锋眰鎶ユ枃涓湭鍖呭惈objType");
Assert.hasKeyAndValue(reqJson, "meterType", "璇锋眰鎶ユ枃涓湭鍖呭惈鎶勮〃绫诲瀷");
+
+ if (reqJson.getDoubleValue("curDegrees") < reqJson.getDoubleValue("preDegrees")) {
+ throw new CmdException("褰撳墠璇绘暟灏忎簬涓婃湡璇绘暟");
+ }
}
@Override
@@ -169,6 +175,11 @@
payFeePo.setState(FeeDto.STATE_DOING);
payFeePo.setBatchId(reqJson.getString("batchId"));
payFeePo.setUserId("-1");
+
+ //todo 鍏堝啓 涓嶇劧 鍐欐湀绂绘暎琛� 鏌ヨ璐圭敤鏃� 鏌ヤ笉鍒�
+ reqJson.put("feeId", payFeePo.getFeeId());
+ addMeterWater(reqJson);
+
int flag = payFeeV1InnerServiceSMOImpl.savePayFee(payFeePo);
if (flag < 1) {
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
@@ -222,8 +233,7 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
}
- reqJson.put("feeId", payFeePo.getFeeId());
- addMeterWater(reqJson);
+
}
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
--
Gitblit v1.8.0