From e46395d507a9eb1d4534c61184b4d60dbd75f888 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 五月 2023 18:28:27 +0800
Subject: [PATCH] optimize
---
service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
index 361adf3..0eff632 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java
@@ -6,9 +6,11 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.fee.FeeDetailDto;
-import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
+import com.java110.dto.fee.FeeAccountDetailDto;
+import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -23,6 +25,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * 鏌ヨ缂磋垂鍘嗗彶
+ */
@Java110Cmd(serviceCode = "fee.queryFeeDetail")
public class QueryFeeDetailCmd extends Cmd {
@@ -32,6 +37,9 @@
@Autowired
private IFeeAccountDetailServiceSMO feeAccountDetailServiceSMOImpl;
+ @Autowired
+ private IPayFeeDetailDiscountInnerServiceSMO payFeeDetailDiscountInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰涓湭鍖呭惈communityId淇℃伅");
@@ -39,15 +47,19 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
-//鑾峰彇寮�濮嬫椂闂�
+ //鑾峰彇寮�濮嬫椂闂�
if (!StringUtil.isEmpty(reqJson.getString("startTime"))) {
String startTime = reqJson.getString("startTime") + " 00:00:00";
reqJson.put("startTime", startTime);
+ } else {
+ reqJson.put("startTime", null);
}
//鑾峰彇缁撴潫鏃堕棿
if (!StringUtil.isEmpty(reqJson.getString("endTime"))) {
String endTime = reqJson.getString("endTime") + " 23:59:59";
reqJson.put("endTime", endTime);
+ } else {
+ reqJson.put("endTime", null);
}
//鏌ヨ鎬昏褰曟暟
ApiFeeDetailVo apiFeeDetailVo = new ApiFeeDetailVo();
@@ -82,6 +94,10 @@
feeAccountDetailDto.setDetailId(feeDetail.getDetailId());
List<FeeAccountDetailDto> feeAccountDetailDtos = feeAccountDetailServiceSMOImpl.queryFeeAccountDetails(feeAccountDetailDto);
feeDetail.setFeeAccountDetailDtoList(feeAccountDetailDtos);
+ PayFeeDetailDiscountDto payFeeDetailDiscountDto = new PayFeeDetailDiscountDto();
+ payFeeDetailDiscountDto.setDetailId(feeDetail.getDetailId());
+ List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtos = payFeeDetailDiscountInnerServiceSMOImpl.queryPayFeeDetailDiscounts(payFeeDetailDiscountDto);
+ feeDetail.setPayFeeDetailDiscountDtoList(payFeeDetailDiscountDtos);
feeDetailList.add(feeDetail);
}
List<ApiFeeDetailDataVo> feeDetails = BeanConvertUtil.covertBeanList(feeDetailList, ApiFeeDetailDataVo.class);
--
Gitblit v1.8.0