From d6e3adf2633accb75590764927939130eaee193c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 25 七月 2024 16:37:42 +0800
Subject: [PATCH] zjh 2024/07/25-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
index 4dbdc3a..c8131c0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -212,9 +212,9 @@
             wq.eq(TjReservation::getIsExpire, 2);
             TjReservation tjReservation = tjReservationService.getOne(wq);
             if (tjReservation != null) {
-                if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
-                    return AjaxResult.error("鏈埌棰勭害鏃堕棿");
-                }
+//                if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
+//                    return AjaxResult.error("鏈埌棰勭害鏃堕棿");
+//                }
                 if (null != tjReservation.getReservationTime() && DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
                     tjReservation.setIsExpire(1);
                     tjReservationService.updateById(tjReservation);
@@ -263,7 +263,7 @@
                     tjCustomer.setAgeUnit(tjReservation.getAgeUnit());
                     tjCustomer.setCareer(tjReservation.getCareer());
                     tjCustomer.setDwPhone(tjReservation.getDwPhone());
-                    tjCustomer.setCardId(tjReservation.getCardId());
+//                    tjCustomer.setCardId(tjReservation.getCardId());
                     tjCustomer.setIndexCard(tjReservation.getIndexCard());
                     //鎴彇瀵嗙爜鑷姩鐢熸垚set杩涘幓
                     String substring = cusIdcard.substring(cusIdcard.length() - 6);

--
Gitblit v1.8.0