Merge remote-tracking branch 'origin/master'

luodangjia

2024-05-27 f4dd86819fc25ab6244158753f3acc12621de762

Merge remote-tracking branch 'origin/master'

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TInvoiceController.java

@@ -108,7 +108,7 @@
    @ResponseBody
    public Object again(@RequestParam Integer tInvoiceId) {
        TInvoice tInvoice = tInvoiceService.selectById(tInvoiceId);

        // TODO 对接诺诺
        return SUCCESS_TIP;
    }


 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TActivityGeneralizationMapper.java

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

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.TActivityGeneralization;
import com.stylefeng.guns.modular.system.model.TOrderTape;

/**
 * <p>
 * 推广活动 Mapper 接口
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-09
 */
public interface TActivityGeneralizationMapper extends BaseMapper<TActivityGeneralization> {

}

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TOrderTapeMapper.java

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

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.stylefeng.guns.modular.system.model.TOrderTape;
import com.stylefeng.guns.modular.system.model.TPhone;

/**
 * <p>
 * 行程录音 Mapper 接口
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-09
 */
public interface TOrderTapeMapper extends BaseMapper<TOrderTape> {

}

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TActivityGeneralizationMapper.xml

New file
@@ -0,0 +1,24 @@
<?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.TActivityGeneralizationMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TActivityGeneralization">
        <id column="id" property="id" />
        <result column="activityName" property="activityName" />
        <result column="participateCount" property="participateCount" />
        <result column="startTime" property="startTime" />
        <result column="endTime" property="endTime" />
        <result column="couponId" property="couponId" />
        <result column="userGrantCount" property="userGrantCount" />
        <result column="monthUseCount" property="monthUseCount" />
        <result column="useExplain" property="useExplain" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, activityName, participateCount, startTime, endTime, couponId, userGrantCount, monthUseCount, useExplain, isDelete
    </sql>

</mapper>

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTapeMapper.xml

New file
@@ -0,0 +1,24 @@
<?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.TOrderTapeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TOrderTape">
        <id column="id" property="id" />
        <result column="orderId" property="orderId" />
        <result column="orderType" property="orderType" />
        <result column="fileLink" property="fileLink" />
        <result column="fileName" property="fileName" />
        <result column="fileFormat" property="fileFormat" />
        <result column="fileSize" property="fileSize" />
        <result column="afterTime" property="afterTime" />
        <result column="insertTime" property="insertTime" />
        <result column="isDelete" property="isDelete" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id,orderId,orderType,fileLink,fileName,fileFormat,fileSize,afterTime,insertTime,isDelete
    </sql>

</mapper>

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TActivityGeneralization.java

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

import com.baomidou.mybatisplus.activerecord.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 io.swagger.annotations.ApiModelProperty;

import java.io.Serializable;
import java.util.Date;

/**
 * <p>
 * 推广活动设置
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-09
 */
@TableName("t_activity_generalization")
public class TActivityGeneralization extends Model<TActivityGeneralization> {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "活动名称")
    @TableField(value = "activityName")
    private String activityName;

    @ApiModelProperty(value = "最多参与人数")
    @TableField(value = "participateCount")
    private Integer participateCount;

    @ApiModelProperty(value = "开始时间")
    @TableField(value = "startTime")
    private Date startTime;

    @ApiModelProperty(value = "结束时间")
    @TableField(value = "endTime")
    private Date endTime;

    @ApiModelProperty(value = "优惠券id")
    @TableField(value = "couponId")
    private Integer couponId;

    @ApiModelProperty(value = "发放数量")
    @TableField(value = "userGrantCount")
    private Integer userGrantCount;

    @ApiModelProperty(value = "每月使用数量")
    @TableField(value = "monthUseCount")
    private Integer monthUseCount;

    @ApiModelProperty(value = "使用说明")
    @TableField(value = "useExplain")
    private String useExplain;

    @ApiModelProperty(value = "是否删除  1=否 2=是")
    @TableField(value = "isDelete")
    private Integer isDelete;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public String getActivityName() {
        return activityName;
    }

    public void setActivityName(String activityName) {
        this.activityName = activityName;
    }

    public Integer getParticipateCount() {
        return participateCount;
    }

    public void setParticipateCount(Integer participateCount) {
        this.participateCount = participateCount;
    }

    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 getCouponId() {
        return couponId;
    }

    public void setCouponId(Integer couponId) {
        this.couponId = couponId;
    }

    public Integer getUserGrantCount() {
        return userGrantCount;
    }

    public void setUserGrantCount(Integer userGrantCount) {
        this.userGrantCount = userGrantCount;
    }

    public Integer getMonthUseCount() {
        return monthUseCount;
    }

    public void setMonthUseCount(Integer monthUseCount) {
        this.monthUseCount = monthUseCount;
    }

    public String getUseExplain() {
        return useExplain;
    }

    public void setUseExplain(String useExplain) {
        this.useExplain = useExplain;
    }

    public Integer getIsDelete() {
        return isDelete;
    }

    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }

    @Override
    protected Serializable pkVal() {
        return this.id;
    }

    @Override
    public String toString() {
        return "TActivityGeneralization{" +
                "id=" + id +
                ", activityName='" + activityName + '\'' +
                ", participateCount=" + participateCount +
                ", startTime=" + startTime +
                ", endTime=" + endTime +
                ", couponId=" + couponId +
                ", userGrantCount=" + userGrantCount +
                ", monthUseCount=" + monthUseCount +
                ", useExplain='" + useExplain + '\'' +
                ", isDelete=" + isDelete +
                '}';
    }
}

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrderTape.java

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

import com.baomidou.mybatisplus.activerecord.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 io.swagger.annotations.ApiModelProperty;

import java.io.Serializable;
import java.util.Date;

/**
 * <p>
 * 订单录音
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-09
 */
@TableName("t_order_tape")
public class TOrderTape extends Model<TOrderTape> {

    private static final long serialVersionUID = 1L;

    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "订单id")
    @TableField(value = "orderId")
    private Integer orderId;
    @ApiModelProperty(value = "订单类型  1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车，7=接送机")
    @TableField(value = "orderType")
    private Integer orderType;
    @ApiModelProperty(value = "文件地址")
    @TableField(value = "fileLink")
    private String fileLink;
    @ApiModelProperty(value = "文件名")
    @TableField(value = "fileName")
    private String fileName;
    @ApiModelProperty(value = "文件格式")
    @TableField(value = "fileFormat")
    private String fileFormat;
    @ApiModelProperty(value = "文件大小（mb）")
    @TableField(value = "fileSize")
    private Double fileSize;
    @ApiModelProperty(value = "过期时间")
    @TableField(value = "afterTime")
    private Date afterTime;
    @ApiModelProperty(value = "创建时间")
    @TableField(value = "insertTime")
    private Date insertTime;
    @ApiModelProperty(value = "是否删除  1=否 2=是")
    @TableField(value = "isDelete")
    private Integer isDelete;

    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public Integer getOrderId() {
        return orderId;
    }

    public void setOrderId(Integer orderId) {
        this.orderId = orderId;
    }

    public Integer getOrderType() {
        return orderType;
    }

    public void setOrderType(Integer orderType) {
        this.orderType = orderType;
    }

    public String getFileLink() {
        return fileLink;
    }

    public void setFileLink(String fileLink) {
        this.fileLink = fileLink;
    }

    public String getFileName() {
        return fileName;
    }

    public void setFileName(String fileName) {
        this.fileName = fileName;
    }

    public String getFileFormat() {
        return fileFormat;
    }

    public void setFileFormat(String fileFormat) {
        this.fileFormat = fileFormat;
    }

    public Double getFileSize() {
        return fileSize;
    }

    public void setFileSize(Double fileSize) {
        this.fileSize = fileSize;
    }

    public Date getAfterTime() {
        return afterTime;
    }

    public void setAfterTime(Date afterTime) {
        this.afterTime = afterTime;
    }

    public Date getInsertTime() {
        return insertTime;
    }

    public void setInsertTime(Date insertTime) {
        this.insertTime = insertTime;
    }

    public Integer getIsDelete() {
        return isDelete;
    }

    public void setIsDelete(Integer isDelete) {
        this.isDelete = isDelete;
    }

    @Override
    protected Serializable pkVal() {
        return this.id;
    }

    @Override
    public String toString() {
        return "TOrderTape{" +
                "id=" + id +
                ", orderId=" + orderId +
                ", orderType=" + orderType +
                ", fileLink='" + fileLink + '\'' +
                ", fileName='" + fileName + '\'' +
                ", fileFormat='" + fileFormat + '\'' +
                ", fileSize=" + fileSize +
                ", afterTime=" + afterTime +
                ", insertTime=" + insertTime +
                ", isDelete=" + isDelete +
                '}';
    }
}

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITActivityGeneralizationService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.TActivityGeneralization;
import com.stylefeng.guns.modular.system.model.TOrderTape;

/**
 * <p>
 * 推广活动 服务类
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-09
 */
public interface ITActivityGeneralizationService extends IService<TActivityGeneralization> {

}

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITOrderTapeService.java

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

import com.baomidou.mybatisplus.service.IService;
import com.stylefeng.guns.modular.system.model.TOrderTape;
import com.stylefeng.guns.modular.system.model.TPhone;

/**
 * <p>
 * 行程录音 服务类
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-09
 */
public interface ITOrderTapeService extends IService<TOrderTape> {

}

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TActivityGeneralizationServiceImpl.java

New file
@@ -0,0 +1,23 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.TActivityGeneralizationMapper;
import com.stylefeng.guns.modular.system.dao.TOrderTapeMapper;
import com.stylefeng.guns.modular.system.model.TActivityGeneralization;
import com.stylefeng.guns.modular.system.model.TOrderTape;
import com.stylefeng.guns.modular.system.service.ITActivityGeneralizationService;
import com.stylefeng.guns.modular.system.service.ITOrderTapeService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 推广活动 服务实现类
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-09
 */
@Service
public class TActivityGeneralizationServiceImpl extends ServiceImpl<TActivityGeneralizationMapper, TActivityGeneralization> implements ITActivityGeneralizationService {

}

 ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTapeServiceImpl.java

New file
@@ -0,0 +1,23 @@
package com.stylefeng.guns.modular.system.service.impl;

import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.TOrderTapeMapper;
import com.stylefeng.guns.modular.system.dao.TPhoneMapper;
import com.stylefeng.guns.modular.system.model.TOrderTape;
import com.stylefeng.guns.modular.system.model.TPhone;
import com.stylefeng.guns.modular.system.service.ITOrderTapeService;
import com.stylefeng.guns.modular.system.service.ITPhoneService;
import org.springframework.stereotype.Service;

/**
 * <p>
 * 行程录音 服务实现类
 * </p>
 *
 * @author 吕雪
 * @since 2020-06-09
 */
@Service
public class TOrderTapeServiceImpl extends ServiceImpl<TOrderTapeMapper, TOrderTape> implements ITOrderTapeService {

}