From 4aa9b8cb058bcf4bae95d80810ce2ccde3406ee8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 06 十一月 2023 11:59:41 +0800
Subject: [PATCH] zjh 2023/11/06--1
---
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
index 46fd329..88247fc 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjNewFlowingWaterController.java
@@ -251,6 +251,7 @@
tjFlowingWater.setPaidIn(BigDecimal.valueOf(0.00).subtract(tjFlowingWater.getRefundPrice()));
tjFlowingWater.setCopeWith(flowingWater.getCopeWith());
tjFlowingWater.setRemarks("宸查��璐�");
+ tjFlowingWater.setPayType(flowingWater.getPayType());
if (flowingWaterService.save(tjFlowingWater)) {
flowingWater.setRemarks("宸查��璐�");
flowingWaterService.updateById(flowingWater);
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index 910b304..7722c26 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -153,7 +153,7 @@
if(!SecurityUtils.isAdmin(user.getUserId())){
if(dictHosp.getSecretKey() != null && dictHosp.getExpirationTime() != null){
if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),
- dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
+ dictHosp.getExpirationTime(),dictHosp.getSecretKey()) || new Date().after(DateUtil.endOfDay(dictHosp.getExpirationTime()))) {
throw new SecretKeyException("鍟嗗宸茶繃鏈熻缁垂浣跨敤");
}
long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
--
Gitblit v1.8.0