平台车费设置表

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TFareSetting.java

@@ -1,13 +1,12 @@
 package com.ylx.massage.domain;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.extern.slf4j.Slf4j;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,31 +18,42 @@ import java.util.Date;
  * @author makejava
  * @since 2024-08-22 17:41:00
  */
+
 @SuppressWarnings("serial")
+@Data
 @ApiModel(value = "TFareSetting", description = "车费设置")
 @TableName("t_fare_setting")
 public class TFareSetting extends Model<TFareSetting> {
     //主键
     @ApiModelProperty("主键")
     private String id;
-    //起步价
-    @ApiModelProperty("起步价")
-    private BigDecimal baseFare;
-    //起步距离（公里）
+    //日间起步价
+    @ApiModelProperty("日间起步价")
+    private BigDecimal daytimeBaseFare;
+    //日间起步距离（公里）
     @ApiModelProperty("起步距离（公里）")
-    private BigDecimal baseDistance;
-    //超出起步价后每公里费用
+    private BigDecimal daytimeBaseDistance;
+    //日间超出起步价后每公里费用
     @ApiModelProperty("超出起步价后每公里费用")
-    private BigDecimal additionalFarePer;
+    private BigDecimal daytimeAdditionalFarePer;
+    //夜间起步价
+    @ApiModelProperty("夜间起步价")
+    private BigDecimal nightBaseFare;
+    //夜间起步距离（公里）
+    @ApiModelProperty("夜间起步距离（公里）")
+    private BigDecimal nightBaseDistance;
+    //夜间超出起步价后每公里费用
+    @ApiModelProperty("夜间超出起步价后每公里费用")
+    private BigDecimal nightAdditionalFarePer;
     //是否启用0否 1是
     @ApiModelProperty("是否启用0否 1是")
     private Integer enable;
-    //部门id
-    @ApiModelProperty("部门id")
-    private String deptId;
-    //部门名称
-    @ApiModelProperty("部门名称")
-    private String deptName;
+    //城市编码
+    @ApiModelProperty("城市编码")
+    private String cityCode;
+    //城市名称
+    @ApiModelProperty("城市名称")
+    private String cityName;
     //系统创建时间
     @ApiModelProperty("系统创建时间")
     private Date createTime;
@@ -56,85 +66,6 @@ public class TFareSetting extends Model<TFareSetting> {
     private Integer isDelete;
 
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public BigDecimal getBaseFare() {
-        return baseFare;
-    }
-
-    public void setBaseFare(BigDecimal baseFare) {
-        this.baseFare = baseFare;
-    }
-
-    public BigDecimal getBaseDistance() {
-        return baseDistance;
-    }
-
-    public void setBaseDistance(BigDecimal baseDistance) {
-        this.baseDistance = baseDistance;
-    }
-
-    public BigDecimal getAdditionalFarePer() {
-        return additionalFarePer;
-    }
-
-    public void setAdditionalFarePer(BigDecimal additionalFarePer) {
-        this.additionalFarePer = additionalFarePer;
-    }
-
-    public Integer getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Integer enable) {
-        this.enable = enable;
-    }
-
-    public String getDeptId() {
-        return deptId;
-    }
-
-    public void setDeptId(String deptId) {
-        this.deptId = deptId;
-    }
-
-    public String getDeptName() {
-        return deptName;
-    }
-
-    public void setDeptName(String deptName) {
-        this.deptName = deptName;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getIsDelete() {
-        return isDelete;
-    }
-
-    public void setIsDelete(Integer isDelete) {
-        this.isDelete = isDelete;
-    }
 
     /**
      * 获取主键值

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

@@ -14,5 +14,14 @@ public interface TFareSettingService extends IService<TFareSetting> {
     TFareSetting add(TFareSetting tFareSetting);
 
     TFareSetting updateFareSetting(TFareSetting tFareSetting);
+
+    /**
+     * 根据城市编码获取车费设置 C端
+     * @param cityCode
+     * @return
+     */
+    TFareSetting getFareSetting(String cityCode);
+
+
 }
 

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

@@ -27,7 +27,7 @@ public class TFareSettingServiceImpl extends ServiceImpl<TFareSettingMapper, TFa
         //判断部门重复设置
         if (tFareSetting.getEnable().equals(MassageConstants.INTEGER_ONE)) {
             LambdaQueryWrapper<TFareSetting> tFareSettingLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            tFareSettingLambdaQueryWrapper.eq(TFareSetting::getDeptId, tFareSetting.getDeptId())
+            tFareSettingLambdaQueryWrapper.eq(TFareSetting::getCityCode, tFareSetting.getCityCode())
                     .eq(TFareSetting::getEnable, MassageConstants.INTEGER_ONE);
             List<TFareSetting> fareSettings = this.list(tFareSettingLambdaQueryWrapper);
             if (!Collections.isEmpty(fareSettings)) {
@@ -42,7 +42,7 @@ public class TFareSettingServiceImpl extends ServiceImpl<TFareSettingMapper, TFa
     public TFareSetting updateFareSetting(TFareSetting tFareSetting) {
         if (tFareSetting.getEnable().equals(MassageConstants.INTEGER_ONE)) {
             LambdaQueryWrapper<TFareSetting> tFareSettingLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            tFareSettingLambdaQueryWrapper.eq(TFareSetting::getDeptId, tFareSetting.getDeptId())
+            tFareSettingLambdaQueryWrapper.eq(TFareSetting::getCityCode, tFareSetting.getCityCode())
                     .eq(TFareSetting::getEnable, MassageConstants.INTEGER_ONE);
             //该部门已启用的
             List<TFareSetting> fareSettings = this.list(tFareSettingLambdaQueryWrapper);
@@ -55,5 +55,24 @@ public class TFareSettingServiceImpl extends ServiceImpl<TFareSettingMapper, TFa
         this.updateById(tFareSetting);
         return tFareSetting;
     }
+
+    /**
+     * C端根据城市编码获取车费起步价配置
+     * @param cityCode
+     * @return
+     */
+    @Override
+    public TFareSetting getFareSetting(String cityCode) {
+        if (cityCode == null || cityCode.trim().isEmpty()) {
+            return null;
+        }
+
+        LambdaQueryWrapper<TFareSetting> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(TFareSetting::getCityCode, cityCode)
+                .orderByDesc(TFareSetting::getCreateTime)
+                .last("LIMIT 1");
+
+        return this.getOne(wrapper);
+    }
 }
 

nightFragrance-massage/src/main/resources/mapper/massage/TFareSettingMapper.xml

@@ -4,12 +4,15 @@
 
     <resultMap type="com.ylx.massage.domain.TFareSetting" id="TFareSettingMap">
         <result property="id" column="id" jdbcType="VARCHAR"/>
-        <result property="baseFare" column="base_fare" jdbcType="NUMERIC"/>
-        <result property="baseDistance" column="base_distance" jdbcType="NUMERIC"/>
-        <result property="additionalFarePer" column="additional_fare_per" jdbcType="NUMERIC"/>
+        <result property="daytimeBaseFare" column="daytime_base_fare" jdbcType="NUMERIC"/>
+        <result property="daytimeBaseDistance" column="daytime_base_distance" jdbcType="NUMERIC"/>
+        <result property="daytimeAdditionalFarePer" column="daytime_additional_fare_per" jdbcType="NUMERIC"/>
+        <result property="nightBaseFare" column="night_base_fare" jdbcType="NUMERIC"/>
+        <result property="nightBaseDistance" column="night_base_distance" jdbcType="NUMERIC"/>
+        <result property="nightAdditionalFarePer" column="night_additional_fare_per" jdbcType="NUMERIC"/>
         <result property="enable" column="enable" jdbcType="INTEGER"/>
-        <result property="deptId" column="dept_id" jdbcType="VARCHAR"/>
-        <result property="deptName" column="dept_name" jdbcType="VARCHAR"/>
+        <result property="cityCode" column="city_code" jdbcType="VARCHAR"/>
+        <result property="cityName" column="city_name" jdbcType="VARCHAR"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="isDelete" column="is_delete" jdbcType="INTEGER"/>