From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费
---
service-fee/src/main/java/com/java110/fee/cmd/feeConfig/UpdateFeeConfigCmd.java | 40 +++++++++++++++++++++++++++++++++++-----
1 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/feeConfig/UpdateFeeConfigCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/feeConfig/UpdateFeeConfigCmd.java
index aabb2ac..ba60e74 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/feeConfig/UpdateFeeConfigCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/feeConfig/UpdateFeeConfigCmd.java
@@ -7,11 +7,9 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.payFeeRule.PayFeeRuleDto;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
-import com.java110.intf.fee.IPayFeeRuleV1InnerServiceSMO;
-import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.payFee.PayFeeRuleDto;
+import com.java110.intf.fee.*;
import com.java110.po.fee.PayFeeConfigPo;
import com.java110.po.fee.PayFeePo;
import com.java110.utils.exception.CmdException;
@@ -30,6 +28,9 @@
@Autowired
private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeInnerServiceSMO feeInnerServiceSMO;
@Autowired
private IPayFeeRuleV1InnerServiceSMO payFeeRuleV1InnerServiceSMOImpl;
@@ -60,15 +61,26 @@
feeConfigDto.setConfigId(reqJson.getString("configId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
Assert.listOnlyOne(feeConfigDtos, "鏈壘鍒拌璐圭敤椤�");
+// int validCount = feeInnerServiceSMO.countValidPayFeeByConfigId(reqJson.getString("configId"));
+// if (validCount > 0) {
+// throw new CmdException("鍏宠仈鐢熸晥涓垂鐢紝鏃犳硶淇敼锛岃鎾ら攢鍏宠仈璐圭敤鍚庨噸璇曪紒");
+// }
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(reqJson);
businessFeeConfig.put("isDefault", feeConfigDtos.get(0).getIsDefault());
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+ if("NA".equals(payFeeConfigPo.getState())){
+ payFeeConfigPo.setState("N");
+ }
int flag = payFeeConfigV1InnerServiceSMOImpl.updatePayFeeConfig(payFeeConfigPo);
if (flag < 1) {
throw new CmdException("淇敼璐圭敤椤瑰け璐�");
}
cmdDataFlowContext.setResponseEntity(ResultVo.success());
+
+ //todo 缁撴潫璐圭敤
+ finishFee(reqJson,feeConfigDtos);
+
//todo 淇敼璐圭敤鏍囪瘑
if (!reqJson.containsKey("feeFlag")) {
return;
@@ -94,4 +106,22 @@
payFeeV1InnerServiceSMOImpl.updatePayFee(payFeePo);
}
+
+ /**
+ * 缁撴潫璐圭敤
+ * @param reqJson
+ * @param feeConfigDtos
+ */
+ private void finishFee(JSONObject reqJson, List<FeeConfigDto> feeConfigDtos) {
+ String state = reqJson.getString("state");
+ if(!"NA".equals(state)){
+ return;
+ }
+ PayFeePo payFeePo = new PayFeePo();
+ payFeePo.setConfigId(feeConfigDtos.get(0).getConfigId());
+ payFeePo.setState(FeeDto.STATE_FINISH);
+
+ payFeeV1InnerServiceSMOImpl.updatePayFee(payFeePo);
+
+ }
}
--
Gitblit v1.8.0