From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/UpdateFeeCmd.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/UpdateFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/UpdateFeeCmd.java
index 02e8f32..31e3deb 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/UpdateFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/UpdateFeeCmd.java
@@ -9,6 +9,7 @@
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.fee.feeMonth.IPayFeeMonth;
import com.java110.fee.smo.impl.FeeAttrInnerServiceSMOImpl;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
@@ -41,6 +42,9 @@
@Autowired
private FeeAttrInnerServiceSMOImpl feeAttrInnerServiceSMOImpl;
+ @Autowired
+ private IPayFeeMonth payFeeMonthImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -57,6 +61,10 @@
List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
Assert.listOnlyOne(feeDtos, "鏈煡璇㈠埌璐圭敤淇℃伅 鎴栨煡璇㈠埌澶氭潯" + reqJson);
+
+ if(FeeDto.FEE_FLAG_CYCLE.equals(feeDtos.get(0).getFeeFlag()) && reqJson.containsKey("maxEndTime")){
+ reqJson.remove("maxEndTime");
+ }
}
@Override
@@ -69,6 +77,11 @@
throw new CmdException("淇敼璐圭敤");
}
+ // todo 閲嶆柊璁＄畻绂绘暎鏈�
+ payFeeMonthImpl.deleteFeeMonth(payFeePo.getFeeId(),payFeePo.getCommunityId());
+ payFeeMonthImpl.doGeneratorOrRefreshFeeMonth(payFeePo.getFeeId(),payFeePo.getCommunityId());
+
+
if (reqJson.containsKey("maxEndTime") && !StringUtil.isEmpty(reqJson.getString("maxEndTime"))) {
FeeAttrDto feeAttrDto = new FeeAttrDto();
feeAttrDto.setFeeId(payFeePo.getFeeId());
@@ -78,6 +91,7 @@
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
feeAttrPo.setValue(reqJson.getString("maxEndTime"));
+ feeAttrPo.setCommunityId(reqJson.getString("communityId"));
if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -100,6 +114,7 @@
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_RATE);
feeAttrPo.setValue(reqJson.getString("rate"));
+ feeAttrPo.setCommunityId(reqJson.getString("communityId"));
if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -117,6 +132,7 @@
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_RATE_CYCLE);
feeAttrPo.setValue(reqJson.getString("rateCycle"));
+ feeAttrPo.setCommunityId(reqJson.getString("communityId"));
if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
@@ -134,6 +150,7 @@
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_RATE_START_TIME);
feeAttrPo.setValue(reqJson.getString("rateStartTime"));
+ feeAttrPo.setCommunityId(reqJson.getString("communityId"));
if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
feeAttrInnerServiceSMOImpl.saveFeeAttr(feeAttrPo);
--
Gitblit v1.8.0