From 3dfbf2598ab5b16ff76a99c7b75c889e261a08bb Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 18:00:58 +0800
Subject: [PATCH] 1、收银台费用计算后台计算2、优化显示细节问题
---
service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java b/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
index 786b756..84dcc45 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
@@ -12,6 +12,7 @@
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.dto.fee.FeeDetailDto;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.api.ApiFeeDetailDataVo;
import com.java110.vo.api.ApiFeeDetailVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,11 +57,15 @@
//鑾峰彇璇锋眰鏁版嵁
JSONObject reqJson = dataFlowContext.getReqJson();
//鑾峰彇寮�濮嬫椂闂�
- String startTime = reqJson.getString("startTime") + " 00:00:00";
+ if (!StringUtil.isEmpty(reqJson.getString("startTime"))) {
+ String startTime = reqJson.getString("startTime") + " 00:00:00";
+ reqJson.put("startTime", startTime);
+ }
//鑾峰彇缁撴潫鏃堕棿
- String endTime = reqJson.getString("endTime") + " 23:59:59";
- reqJson.put("startTime", startTime);
- reqJson.put("endTime", endTime);
+ if (!StringUtil.isEmpty(reqJson.getString("endTime"))) {
+ String endTime = reqJson.getString("endTime") + " 23:59:59";
+ reqJson.put("endTime", endTime);
+ }
validateFeeConfigData(reqJson);
//鏌ヨ鎬昏褰曟暟
--
Gitblit v1.8.0