修改bug

Pu Zhibing

昨天 10605ab6dd65845b7adf52ab319a4087813e6808

修改bug

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -70,6 +70,9 @@
    private UserActivityDiscount1Mapper userActivityDiscount1Mapper;

    @Resource
    private UserActivityDiscount2Mapper userActivityDiscount2Mapper;

    @Resource
    private SysIntegralMapper sysIntegralMapper;

    @Resource
@@ -302,9 +305,9 @@
        }

        //计算折扣
        UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderCrossCity.getCompanyId());
        UserActivityDiscount2 query2 = userActivityDiscount2Mapper.query(orderCrossCity.getLineId());
        if(null != query2){
            Double special = query2.getSpecial();
            Double special = query2.getDiscount();
            orderCrossCity.setDiscount(special);
            double v = new BigDecimal(orderMoney).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
            if(orderMoney.compareTo(v) > 0){

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/UserActivityDiscount2Mapper.java

New file
@@ -0,0 +1,16 @@
package com.stylefeng.guns.modular.system.dao;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.UserActivityDiscount2;
import org.apache.ibatis.annotations.Param;

/**
 * @author zhibing.pu
 * @Date 2025/5/21 10:31
 */
public interface UserActivityDiscount2Mapper extends BaseMapper<UserActivityDiscount2>{
	
	
	
    UserActivityDiscount2 query(@Param("lineId") Integer lineId);
}

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount1Mapper.xml

@@ -27,6 +27,6 @@
        a.`enable` as `enable`
        from t_user_activity_discount1 a
        left join t_user_activity b on (a.userActivityId = b.id)
        where now() between a.startTime and a.endTime and b.`status` = 3 and b.companyId = #{companyId} order by b.insertTime desc limit 0,1
        where now() between a.startTime and a.endTime and a.enable = 2 and b.`status` = 3 and b.companyId = #{companyId} order by b.insertTime desc limit 0,1
    </select>
</mapper>

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserActivityDiscount2Mapper.xml

New file
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.stylefeng.guns.modular.system.dao.UserActivityDiscount2Mapper">


	
	
    <select id="query" resultType="com.stylefeng.guns.modular.system.model.UserActivityDiscount2">
        select a.* from t_user_activity_discount2 a
        left join t_user_activity b on (a.userActivityId = b.id)
        where a.lineId = #{lineId} and a.now() between startTime and endTime and a.enable = 2 and b.`status` = 3  order by b.insertTime desc limit 1
    </select>
</mapper>

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserActivityDiscount2.java

New file
@@ -0,0 +1,108 @@
package com.stylefeng.guns.modular.system.model;

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;

import java.util.Date;

/**
 * 用户折扣活动
 */
@TableName("t_user_activity_discount2")
public class UserActivityDiscount2 {
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    @TableField("id")
    private Integer id;
    /**
     * 活动id
     */
    @TableField("userActivityId")
    private Integer userActivityId;
    /**
     * 跨城线路id
     */
    @TableField("lineId")
    private Integer lineId;
    /**
     * 折扣（8.5）
     */
    @TableField("discount")
    private Double discount;
    /**
     * 活动有效开始时间
     */
    @TableField("startTime")
    private Date startTime;
    /**
     * 活动有效结束时间
     */
    @TableField("endTime")
    private Date endTime;
    /**
     * 是否启用（1=不启用，2=启用）
     */
    @TableField("enable")
    private Integer enable;
    
    
    public Integer getId() {
        return id;
    }
    
    public void setId(Integer id) {
        this.id = id;
    }
    
    public Integer getUserActivityId() {
        return userActivityId;
    }
    
    public void setUserActivityId(Integer userActivityId) {
        this.userActivityId = userActivityId;
    }
    
    public Integer getLineId() {
        return lineId;
    }
    
    public void setLineId(Integer lineId) {
        this.lineId = lineId;
    }
    
    public Double getDiscount() {
        return discount;
    }
    
    public void setDiscount(Double discount) {
        this.discount = discount;
    }
    
    public Date getStartTime() {
        return startTime;
    }
    
    public void setStartTime(Date startTime) {
        this.startTime = startTime;
    }
    
    public Date getEndTime() {
        return endTime;
    }
    
    public void setEndTime(Date endTime) {
        this.endTime = endTime;
    }
    
    public Integer getEnable() {
        return enable;
    }
    
    public void setEnable(Integer enable) {
        this.enable = enable;
    }
}