Merge remote-tracking branch 'origin/dev' into dev

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/TFareSettingVo.java

@@ -0,0 +1,30 @@
+package com.ylx.massage.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 类描述：平台车费日间夜间起步价配置返回Vo
+ *
+ * @author Administrator
+ * @version 1.0
+ * @date 2026/6/5 16:14
+ */
+@Data
+public class TFareSettingVo implements Serializable {
+    private static final long serialVersionUID = -8658347908445348379L;
+
+    //起步价
+    @ApiModelProperty("起步价")
+    private BigDecimal baseFare;
+    //起步距离（公里）
+    @ApiModelProperty("起步距离（公里）")
+    private BigDecimal baseDistance;
+    //超出起步价后每公里费用
+    @ApiModelProperty("超出起步价后每公里费用")
+    private BigDecimal additionalFarePer;
+
+}

nightFragrance-massage/src/main/java/com/ylx/massage/service/TFareSettingService.java

@@ -2,6 +2,7 @@ package com.ylx.massage.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.massage.domain.TFareSetting;
+import com.ylx.massage.domain.vo.TFareSettingVo;
 
 /**
  * 车费设置表(TFareSetting)表服务接口
@@ -20,8 +21,7 @@ public interface TFareSettingService extends IService<TFareSetting> {
      * @param cityCode
      * @return
      */
-    TFareSetting getFareSetting(String cityCode);
-
+    TFareSettingVo getFareSetting(String userBookingTime,String cityCode);
 
 }
 

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TFareSettingServiceImpl.java

@@ -1,15 +1,27 @@
 package com.ylx.massage.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.constant.MassageConstants;
+import com.ylx.common.core.domain.entity.SysDictData;
 import com.ylx.common.exception.ServiceException;
+import com.ylx.common.utils.StringUtils;
+import com.ylx.massage.domain.vo.TFareSettingVo;
 import com.ylx.massage.mapper.TFareSettingMapper;
 import com.ylx.massage.domain.TFareSetting;
+import com.ylx.system.service.ISysDictTypeService;
 import io.jsonwebtoken.lang.Collections;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ylx.massage.service.TFareSettingService;
 
+import java.time.LocalTime;
+import java.time.format.DateTimeParseException;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -19,9 +31,13 @@ import java.util.stream.Collectors;
  * @author makejava
  * @since 2024-08-22 17:41:00
  */
+@Slf4j
 @Service("tFareSettingService")
 public class TFareSettingServiceImpl extends ServiceImpl<TFareSettingMapper, TFareSetting> implements TFareSettingService {
+    private static final String DAY_TIME = "day_time";
 
+    @Autowired
+    private ISysDictTypeService dictTypeService;
     @Override
     public TFareSetting add(TFareSetting tFareSetting) {
         //判断部门重复设置
@@ -57,21 +73,72 @@ public class TFareSettingServiceImpl extends ServiceImpl<TFareSettingMapper, TFa
     }
 
     /**
-     * C端根据城市编码获取车费起步价配置
+     * C端根据城市编码和用户预约时间获取车费起步价配置
      * @param cityCode
      * @return
      */
     @Override
-    public TFareSetting getFareSetting(String cityCode) {
-        if (cityCode == null || cityCode.trim().isEmpty()) {
+    public TFareSettingVo getFareSetting(String userbookingTime, String cityCode) {
+        // 参数校验
+        if (StringUtils.isBlank(userbookingTime) || StringUtils.isBlank(cityCode)) {
+            throw new IllegalArgumentException("预约时间和城市编码不能为空");
+        }
+
+        // 查询最新的有效配置
+        TFareSetting setting = getLatestValidFareSetting(cityCode);
+        if (setting == null) {
             return null;
         }
 
+        // 解析预约时间
+        Date bookingDate;
+        try {
+            // 假设格式为 yyyy-MM-dd HH:mm:ss，可根据实际调整
+            bookingDate = DateUtil.parse(userbookingTime, "yyyy-MM-dd HH:mm:ss");
+        } catch (Exception e) {
+            throw new IllegalArgumentException("预约时间格式错误");
+        }
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(bookingDate);
+        LocalTime bookingTime = LocalTime.of(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE));
+        // 定义白天时间段（比如 6:00 - 22:00），读取字典表配置
+        List<SysDictData> dataDayTimes = dictTypeService.selectDictDataByType(DAY_TIME);
+        if (dataDayTimes == null || dataDayTimes.size() < 2) {
+            throw new IllegalStateException("白天时段字典配置缺失，请检查 dat_time 类型");
+        }
+        LocalTime dayStart, dayEnd;
+        try {
+            dayStart = LocalTime.parse(dataDayTimes.get(0).getDictValue());
+            dayEnd = LocalTime.parse(dataDayTimes.get(1).getDictValue());
+        } catch (DateTimeParseException e) {
+            throw new IllegalArgumentException("白天时段配置格式错误，应为 HH:mm");
+        }
+        boolean isDaytime = !bookingTime.isBefore(dayStart) && !bookingTime.isAfter(dayEnd);
+
+
+        TFareSettingVo vo = new TFareSettingVo();
+        if (isDaytime) {
+            vo.setBaseFare(setting.getDaytimeBaseFare());
+            vo.setBaseDistance(setting.getDaytimeBaseDistance());
+            vo.setAdditionalFarePer(setting.getDaytimeAdditionalFarePer());
+        } else {
+            vo.setBaseFare(setting.getNightBaseFare());
+            vo.setBaseDistance(setting.getNightBaseDistance());
+            vo.setAdditionalFarePer(setting.getNightAdditionalFarePer());
+        }
+        return vo;
+    }
+
+    /**
+     * 根据城市编码获取最新的有效车费配置
+     */
+    private TFareSetting getLatestValidFareSetting(String cityCode) {
         LambdaQueryWrapper<TFareSetting> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(TFareSetting::getCityCode, cityCode)
+                .eq(TFareSetting::getEnable, 1)
+                .eq(TFareSetting::getIsDelete, 0)
                 .orderByDesc(TFareSetting::getCreateTime)
                 .last("LIMIT 1");
-
         return this.getOne(wrapper);
     }
 }