From ad4cc050c77b41637d1ac445c7dc6922c3e63624 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 09:17:59 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java | 2 +-
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAppointableTimeMapper.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
index d9523ee..dd4fd8f 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -91,7 +91,7 @@
@ApiOperation(value = "门店详情预约操作【2.0】")
public R appointmentTime(@RequestBody AppointmentTimeDto dto) {
TShopAppointableTime one = shopAppointableTimeService.getOne(new LambdaQueryWrapper<TShopAppointableTime>().eq(TShopAppointableTime::getShopId, dto.getShopId())
- .last(" and DATE_FORMAT(appointable_time, '%Y-%m-%d %H:%i') = '" + dto.getTime() + "'"));
+ .last(" and DATE_FORMAT(appointment_time, '%Y-%m-%d %H:%i') = '" + dto.getTime() + "'"));
if (null != one) {
return R.fail("不能重复预约");
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAppointableTimeMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAppointableTimeMapper.xml
index 29c9e8e..23c3ae5 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAppointableTimeMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopAppointableTimeMapper.xml
@@ -7,7 +7,7 @@
select * from (
select
a.id,
- DATE_FORMAT(a.appointable_time, '%Y-%m-%d %H:%i') as appointmentTime,
+ DATE_FORMAT(a.appointment_time, '%Y-%m-%d %H:%i') as appointmentTime,
a.status,
b.shop_name as shopName,
a.reason as cancelReason,
@@ -33,7 +33,7 @@
<if test="null != item.status">
and a.status = #{item.status}
</if>
- ) as aa order by aa.sort,aa.appointable_time
+ ) as aa order by aa.sort,aa.appointment_time
</select>
--
Gitblit v1.7.1