From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDetailCmd.java | 11 +++++++++--
1 files changed, 9 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 890e6ae..f8d1b4f 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,8 +6,8 @@
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.payFeeDetailDiscount.PayFeeDetailDiscountDto;
+import com.java110.dto.fee.FeeAccountDetailDto;
+import com.java110.dto.payFee.PayFeeDetailDiscountDto;
import com.java110.intf.fee.IFeeAccountDetailServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
@@ -25,6 +25,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * 鏌ヨ缂磋垂鍘嗗彶
+ */
@Java110Cmd(serviceCode = "fee.queryFeeDetail")
public class QueryFeeDetailCmd extends Cmd {
@@ -48,11 +51,15 @@
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();
--
Gitblit v1.8.0