From 9e22e9abd4a3c606ec51d491abf94d7a465356b9 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 30 六月 2023 00:35:56 +0800
Subject: [PATCH] 优化商户
---
service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java b/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java
index 365d740..cf1de18 100644
--- a/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerDiningCmd.java
@@ -10,6 +10,7 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -31,17 +32,18 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖�");
- Assert.hasKeyAndValue(reqJson, "startDate", "鏈寘鍚紑濮嬫椂闂�");
- Assert.hasKeyAndValue(reqJson, "endDate", "鏈寘鍚粨鏉熸椂闂�");
- String startDate = reqJson.getString("startDate");
- String endDate = reqJson.getString("endDate");
- if (!startDate.contains(":")) {
- startDate += " 00:00:00";
- reqJson.put("startDate", startDate);
- }
- if (!endDate.contains(":")) {
- endDate += " 23:59:59";
- reqJson.put("endDate", endDate);
+
+ if(reqJson.containsKey("startDate") && reqJson.containsKey("endDate")) {
+ String startDate = reqJson.getString("startDate");
+ String endDate = reqJson.getString("endDate");
+ if (!StringUtil.isEmpty(startDate) && !startDate.contains(":")) {
+ startDate += " 00:00:00";
+ reqJson.put("startDate", startDate);
+ }
+ if (!StringUtil.isEmpty(endDate) && !endDate.contains(":")) {
+ endDate += " 23:59:59";
+ reqJson.put("endDate", endDate);
+ }
}
}
--
Gitblit v1.8.0