From dbea8ec9fde739d028d656ac7031091fae6e6c2c Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 19 七月 2023 09:03:50 +0800
Subject: [PATCH] 1、新增费用提前预生成账单2、优化强制回单3、区配置新增退费收据开关4、权限优化
---
service-fee/src/main/java/com/java110/fee/cmd/feeConfig/ListFeeConfigsCmd.java | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/feeConfig/ListFeeConfigsCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/feeConfig/ListFeeConfigsCmd.java
index 933df76..d9c99f4 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/feeConfig/ListFeeConfigsCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/feeConfig/ListFeeConfigsCmd.java
@@ -31,21 +31,16 @@
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
super.validatePageInfo(reqJson);
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖篒D");
-
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
FeeConfigDto feeConfigDto = BeanConvertUtil.covertBean(reqJson, FeeConfigDto.class);
-
- if ("0".equals(reqJson.getString("isFlag"))) {
+ if (!StringUtil.isEmpty(reqJson.getString("isFlag")) && reqJson.getString("isFlag").equals("0")) {
feeConfigDto.setPage(PageDto.DEFAULT_PAGE);
}
-
int count = feeConfigInnerServiceSMOImpl.queryFeeConfigsCount(feeConfigDto);
-
List<ApiFeeConfigDataVo> feeConfigs = null;
-
if (count > 0) {
feeConfigs = BeanConvertUtil.covertBeanList(feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto), ApiFeeConfigDataVo.class);
//澶勭悊 灏忔暟鐐瑰悗鏃犳晥鐨�0
@@ -53,7 +48,6 @@
if (!StringUtil.isEmpty(feeConfig.getAdditionalAmount())) {
feeConfig.setAdditionalAmount(Double.parseDouble(feeConfig.getAdditionalAmount()) + "");
}
-
if (!StringUtil.isEmpty(feeConfig.getSquarePrice())) {
feeConfig.setSquarePrice(Double.parseDouble(feeConfig.getSquarePrice()) + "");
}
@@ -61,15 +55,11 @@
} else {
feeConfigs = new ArrayList<>();
}
-
ApiFeeConfigVo apiFeeConfigVo = new ApiFeeConfigVo();
-
apiFeeConfigVo.setTotal(count);
apiFeeConfigVo.setRecords((int) Math.ceil((double) count / (double) reqJson.getInteger("row")));
apiFeeConfigVo.setFeeConfigs(feeConfigs);
-
ResponseEntity<String> responseEntity = new ResponseEntity<String>(JSONObject.toJSONString(apiFeeConfigVo), HttpStatus.OK);
-
cmdDataFlowContext.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0