From b06ccd76e50812d81ee689dcd609bb02ac5c4ed4 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 11 八月 2022 14:48:52 +0800
Subject: [PATCH] 1、优化页面展示行问题
---
service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java
index 76e2b62..3e53dd8 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/CreateFeeByComboCmd.java
@@ -4,7 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+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;
@@ -29,7 +29,6 @@
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.payFeeBatch.PayFeeBatchPo;
-import com.java110.utils.constant.CommonConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -43,7 +42,7 @@
import java.util.List;
@Java110Cmd(serviceCode = "fee.createFeeByCombo")
-public class CreateFeeByComboCmd extends AbstractServiceCmdListener {
+public class CreateFeeByComboCmd extends Cmd {
@Autowired
private IPayFeeBatchV1InnerServiceSMO payFeeBatchV1InnerServiceSMOImpl;
@@ -127,11 +126,11 @@
FeeConfigDto feeConfigDto = new FeeConfigDto();
feeConfigDto.setCommunityId(reqJson.getString("communityId"));
- feeConfigDto.setConfigId(reqJson.getString("configId"));
+ feeConfigDto.setConfigId(config.getString("configId"));
List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
Assert.listOnlyOne(feeConfigDtos, "褰撳墠璐圭敤椤笽D涓嶅瓨鍦ㄦ垨瀛樺湪澶氭潯" + reqJson.getString("configId"));
- if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag()) && config.containsKey("endTime")) {
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag()) && config.containsKey("endTime")) {
Date endTime = null;
Date configEndTime = null;
try {
@@ -150,7 +149,7 @@
feePos.add(BeanConvertUtil.covertBean(addRoomFee(config, reqJson,feeConfigDtos), PayFeePo.class));
- if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {
feeAttrsPos.add(addFeeAttr(reqJson, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
config.containsKey("endTime") ? config.getString("endTime") : reqJson.getString("configEndTime")));
}
@@ -275,8 +274,8 @@
businessUnit.put("startTime", config.getString("startTime"));
businessUnit.put("endTime", config.getString("startTime"));
businessUnit.put("communityId", paramInJson.getString("communityId"));
- businessUnit.put("payerObjId", config.getString("payerObjId"));
- businessUnit.put("payerObjType", config.getString("payerObjType"));
+ businessUnit.put("payerObjId", paramInJson.getString("payerObjId"));
+ businessUnit.put("payerObjType", paramInJson.getString("payerObjType"));
businessUnit.put("feeFlag", feeConfigDtos.get(0).getFeeFlag());
businessUnit.put("state", "2008001");
businessUnit.put("batchId", paramInJson.getString("batchId"));
--
Gitblit v1.8.0