商家端 预约信息列表 修改 信息设置保存效验修改

alien-entity/src/main/resources/mapper/StoreReservationMapper.xml

@@ -56,8 +56,10 @@
             ur.end_time,
             CONCAT(IFNULL(ur.start_time, ''), '-', IFNULL(ur.end_time, '')) AS time_slot,
             ur.user_id,
-            IFNULL(lu.real_name, lu.user_name) AS customer_name,
-            lu.user_phone AS contact_phone,
+--             IFNULL(lu.real_name, lu.user_name) AS customer_name,
+--             lu.user_phone AS contact_phone,
+            ur.reservation_user_phone AS contact_phone,
+            ur.reservation_user_name AS customer_name,
             ur.remark,
             IFNULL(ur.reason, '') AS reason,
             ur.status,

alien-store/src/main/java/shop/alien/store/controller/StoreBookingSettingsController.java

@@ -65,9 +65,6 @@ public class StoreBookingSettingsController {
         if (dto.getRetainPositionFlag() == null) {
             return R.fail("未按时到店是否保留位置不能为空");
         }
-        if (dto.getRetentionDuration() == null || dto.getRetentionDuration() <= 0) {
-            return R.fail("保留时长必须大于0");
-        }
         if (dto.getBookingDateDisplayDays() == null || dto.getBookingDateDisplayDays() <= 0) {
             return R.fail("预订日期显示天数必须大于0");
         }

alien-store/src/main/java/shop/alien/store/service/impl/StoreBookingSettingsServiceImpl.java

@@ -79,10 +79,7 @@ public class StoreBookingSettingsServiceImpl extends ServiceImpl<StoreBookingSet
             log.warn("保存预订服务信息设置失败：未按时到店是否保留位置不能为空");
             throw new RuntimeException("未按时到店是否保留位置不能为空");
         }
-        if (settings.getRetentionDuration() == null || settings.getRetentionDuration() <= 0) {
-            log.warn("保存预订服务信息设置失败：保留时长必须大于0");
-            throw new RuntimeException("保留时长必须大于0");
-        }
+
         if (settings.getBookingDateDisplayDays() == null || settings.getBookingDateDisplayDays() <= 0) {
             log.warn("保存预订服务信息设置失败：预订日期显示天数必须大于0");
             throw new RuntimeException("预订日期显示天数必须大于0");