Skip to content

G
gxpt_ht
Commit 526d8d18 by 吕明尚
Options

修改订单表字段

parent 3359a3f6
Showing with 30 additions and 115 deletions
share-system/src/main/java/share/system/domain/SConsumerCoupon.java
......@@ -52,7 +52,9 @@ public class SConsumerCoupon extends BaseEntity
@Excel(name = "房间类型(1:标间，2：豪华间，3：总统套房，4：商务套房，5：行政套房，6：其他)")
private String roomType;
/** 门槛时长 */
@Excel(name = "门槛时长")
private String minDuration;
/** 折扣最大时长 */
@Excel(name = "折扣最大时长")
......
share-system/src/main/java/share/system/domain/SCoupon.java
......@@ -3,6 +3,7 @@ package share.system.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import share.common.annotation.Excel;
......@@ -14,6 +15,7 @@ import share.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2023-09-27
*/
@Data
public class SCoupon extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -29,6 +31,14 @@ public class SCoupon extends BaseEntity
@Excel(name = "优惠券类型(1：折扣券，2，团购券，3：满减券，4：核销券，5：充值送金额)")
private Integer couponType;
/** 门槛时长 */
@Excel(name = "门槛时长")
private String minDuration;
/** 折扣最大时长 */
@Excel(name = "折扣最大时长")
private String maxDuration;
/** 时长 */
@Excel(name = "时长")
private String duration;
......@@ -58,116 +68,4 @@ public class SCoupon extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "有效期结束", width = 30, dateFormat = "yyyy-MM-dd")
private Date endDate;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setCouponType(Integer couponType)
{
this.couponType = couponType;
}
public Integer getCouponType()
{
return couponType;
}
public void setDuration(String duration)
{
this.duration = duration;
}
public String getDuration()
{
return duration;
}
public void setMinPrice(BigDecimal minPrice)
{
this.minPrice = minPrice;
}
public BigDecimal getMinPrice()
{
return minPrice;
}
public void setSubPrice(BigDecimal subPrice)
{
this.subPrice = subPrice;
}
public BigDecimal getSubPrice()
{
return subPrice;
}
public void setPlatform(String platform)
{
this.platform = platform;
}
public String getPlatform()
{
return platform;
}
public void setPlatformType(Integer platformType)
{
this.platformType = platformType;
}
public Integer getPlatformType()
{
return platformType;
}
public void setStartDate(Date startDate)
{
this.startDate = startDate;
}
public Date getStartDate()
{
return startDate;
}
public void setEndDate(Date endDate)
{
this.endDate = endDate;
}
public Date getEndDate()
{
return endDate;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("couponType", getCouponType())
.append("duration", getDuration())
.append("minPrice", getMinPrice())
.append("subPrice", getSubPrice())
.append("platform", getPlatform())
.append("platformType", getPlatformType())
.append("startDate", getStartDate())
.append("endDate", getEndDate())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}
share-system/src/main/resources/mapper/system/SConsumerCouponMapper.xml
......@@ -11,6 +11,7 @@
<result property="couponCode" column="coupon_code" />
<result property="name" column="name" />
<result property="couponType" column="coupon_type" />
<result property="minDuration" column="min_duration" />
<result property="maxDuration" column="max_duration" />
<result property="duration" column="duration" />
<result property="minPrice" column="min_price" />
......@@ -34,7 +35,7 @@
</resultMap>
<sql id="selectSConsumerCouponVo">
select id, consumer_id, coupon_id, coupon_code, name, coupon_type, max_duration, duration, min_price, sub_price, source_type, platform_type, start_date, end_date, use_date, use_status, is_delete, create_by, create_time, update_by, update_time, delete_by, delete_time, remark,room_type,store_type from s_consumer_coupon
select id, consumer_id, coupon_id, coupon_code, name, coupon_type, max_duration,min_duration, duration, min_price, sub_price, source_type, platform_type, start_date, end_date, use_date, use_status, is_delete, create_by, create_time, update_by, update_time, delete_by, delete_time, remark,room_type,store_type from s_consumer_coupon
</sql>
<select id="selectSConsumerCouponList" parameterType="SConsumerCoupon" resultMap="SConsumerCouponResult">
......@@ -46,6 +47,7 @@
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="couponType != null and couponType != ''"> and coupon_type = #{couponType}</if>
<if test="maxDuration != null and maxDuration != ''"> and max_duration = #{maxDuration}</if>
<if test="minDuration != null and minDuration != ''"> and min_duration = #{minDuration}</if>
<if test="duration != null and duration != ''"> and duration = #{duration}</if>
<if test="minPrice != null "> and min_price = #{minPrice}</if>
<if test="subPrice != null "> and sub_price = #{subPrice}</if>
......@@ -75,6 +77,7 @@
<if test="name != null and name != ''">name,</if>
<if test="couponType != null">coupon_type,</if>
<if test="maxDuration != null">max_duration,</if>
<if test="minDuration != null">min_duration,</if>
<if test="duration != null and duration != ''">duration,</if>
<if test="minPrice != null">min_price,</if>
<if test="subPrice != null">sub_price,</if>
......@@ -102,6 +105,7 @@
<if test="name != null and name != ''">#{name},</if>
<if test="couponType != null">#{couponType},</if>
<if test="maxDuration != null">#{maxDuration},</if>
<if test="minDuration != null">#{minDuration},</if>
<if test="duration != null and duration != ''">#{duration},</if>
<if test="minPrice != null">#{minPrice},</if>
<if test="subPrice != null">#{subPrice},</if>
......@@ -133,6 +137,7 @@
<if test="name != null and name != ''">name = #{name},</if>
<if test="couponType != null">coupon_type = #{couponType},</if>
<if test="maxDuration != null">max_duration = #{maxDuration},</if>
<if test="minDuration != null">min_duration = #{minDuration},</if>
<if test="duration != null and duration != ''">duration = #{duration},</if>
<if test="minPrice != null">min_price = #{minPrice},</if>
<if test="subPrice != null">sub_price = #{subPrice},</if>
......
share-system/src/main/resources/mapper/system/SCouponMapper.xml
......@@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="name" column="name" />
<result property="couponType" column="coupon_type" />
<result property="duration" column="duration" />
<result property="minDuration" column="min_duration" />
<result property="maxDuration" column="max_duration" />
<result property="minPrice" column="min_price" />
<result property="subPrice" column="sub_price" />
<result property="platform" column="platform" />
......@@ -23,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectSCouponVo">
select id, name, coupon_type, duration, min_price, sub_price, platform, platform_type, start_date, end_date, create_by, create_time, update_by, update_time, remark from s_coupon
select id, name, coupon_type, duration,min_duration,max_duration, min_price, sub_price, platform, platform_type, start_date, end_date, create_by, create_time, update_by, update_time, remark from s_coupon
</sql>
<select id="selectSCouponList" parameterType="SCoupon" resultMap="SCouponResult">
......@@ -32,6 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="couponType != null "> and coupon_type = #{couponType}</if>
<if test="duration != null and duration != ''"> and duration = #{duration}</if>
<if test="minDuration != null and minDuration != ''"> and min_duration = #{minDuration},</if>
<if test="maxDuration != null and maxDuration != ''"> and max_duration = #{maxDuration},</if>
<if test="minPrice != null "> and min_price = #{minPrice}</if>
<if test="subPrice != null "> and sub_price = #{subPrice}</if>
<if test="platform != null and platform != ''"> and platform = #{platform}</if>
......@@ -52,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''">name,</if>
<if test="couponType != null">coupon_type,</if>
<if test="duration != null and duration != ''">duration,</if>
<if test="minDuration != null and minDuration != ''">min_duration = #{minDuration},</if>
<if test="maxDuration != null and maxDuration != ''">max_duration = #{maxDuration},</if>
<if test="minPrice != null">min_price,</if>
<if test="subPrice != null">sub_price,</if>
<if test="platform != null">platform,</if>
......@@ -68,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''">#{name},</if>
<if test="couponType != null">#{couponType},</if>
<if test="duration != null and duration != ''">#{duration},</if>
<if test="minDuration != null and minDuration != ''">#{minDuration},</if>
<if test="maxDuration != null and maxDuration != ''">#{maxDuration},</if>
<if test="minPrice != null">#{minPrice},</if>
<if test="subPrice != null">#{subPrice},</if>
<if test="platform != null">#{platform},</if>
......@@ -88,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="name != null and name != ''">name = #{name},</if>
<if test="couponType != null">coupon_type = #{couponType},</if>
<if test="duration != null and duration != ''">duration = #{duration},</if>
<if test="minDuration != null and minDuration != ''">min_duration = #{minDuration},</if>
<if test="maxDuration != null and maxDuration != ''">max_duration = #{maxDuration},</if>
<if test="minPrice != null">min_price = #{minPrice},</if>
<if test="subPrice != null">sub_price = #{subPrice},</if>
<if test="platform != null">platform = #{platform},</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment