存在文化代码提交

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreCouponScrm.java

@@ -1,6 +1,7 @@
 package com.fs.hisStore.domain;
 
 import java.math.BigDecimal;
+
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -8,60 +9,86 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 优惠券对象 fs_store_coupon
- * 
+ *
  * @author fs
  * @date 2022-03-15
  */
-public class FsStoreCouponScrm extends BaseEntity
-{
+public class FsStoreCouponScrm extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 优惠券表ID */
+    /**
+     * 优惠券表ID
+     */
     private Long couponId;
 
-    /** 优惠券名称 */
+    /**
+     * 优惠券名称
+     */
     @Excel(name = "优惠券名称")
     private String title;
 
-    /** 兑换消耗积分值 */
+    /**
+     * 兑换消耗积分值
+     */
     @Excel(name = "兑换消耗积分值")
     private Long integral;
 
-    /** 兑换的优惠券面值 */
+    /**
+     * 兑换的优惠券面值
+     */
     @Excel(name = "兑换的优惠券面值")
     private BigDecimal couponPrice;
 
-    /** 最低消费多少金额可用优惠券 */
+    /**
+     * 最低消费多少金额可用优惠券
+     */
     @Excel(name = "最低消费多少金额可用优惠券")
     private BigDecimal useMinPrice;
 
-    /** 优惠券有效期限（单位：天） */
+    /**
+     * 优惠券有效期限（单位：天）
+     */
     @Excel(name = "优惠券有效期限", readConverterExp = "单=位：天")
     private Long couponTime;
 
-    /** 排序 */
+    /**
+     * 排序
+     */
     @Excel(name = "排序")
     private Long sort;
 
-    /** 状态（0：关闭，1：开启） */
+    /**
+     * 状态（0：关闭，1：开启）
+     */
     @Excel(name = "状态", readConverterExp = "0=：关闭，1：开启")
     private Integer status;
 
-    /** 商品ids */
+    /**
+     * 商品ids
+     */
     @Excel(name = "商品ids")
     private String productIds;
 
     @Excel(name = "套餐分类IDS")
     private String packageCateIds;
 
-    /** 优惠券类型 0-通用 1-商品券 */
+    /**
+     * 优惠券类型 0-通用 1-商品券
+     */
     @Excel(name = "优惠券类型 0-通用 1-商品券")
     private Integer type;
 
-    /** 是否删除 */
+    /**
+     * 是否删除
+     */
     @Excel(name = "是否删除")
     private Integer isDel;
 
+    /***
+     * 立减金支付金额
+     * **/
+    private BigDecimal payPrice;
+
     public String getPackageCateIds() {
         return packageCateIds;
     }
@@ -70,122 +97,119 @@ public class FsStoreCouponScrm extends BaseEntity
         this.packageCateIds = packageCateIds;
     }
 
-    public void setCouponId(Long couponId)
-    {
+    public void setCouponId(Long couponId) {
         this.couponId = couponId;
     }
 
-    public Long getCouponId() 
-    {
+    public Long getCouponId() {
         return couponId;
     }
-    public void setTitle(String title) 
-    {
+
+    public void setTitle(String title) {
         this.title = title;
     }
 
-    public String getTitle() 
-    {
+    public String getTitle() {
         return title;
     }
-    public void setIntegral(Long integral) 
-    {
+
+    public void setIntegral(Long integral) {
         this.integral = integral;
     }
 
-    public Long getIntegral() 
-    {
+    public Long getIntegral() {
         return integral;
     }
-    public void setCouponPrice(BigDecimal couponPrice) 
-    {
+
+    public void setCouponPrice(BigDecimal couponPrice) {
         this.couponPrice = couponPrice;
     }
 
-    public BigDecimal getCouponPrice() 
-    {
+    public BigDecimal getCouponPrice() {
         return couponPrice;
     }
-    public void setUseMinPrice(BigDecimal useMinPrice) 
-    {
+
+    public void setUseMinPrice(BigDecimal useMinPrice) {
         this.useMinPrice = useMinPrice;
     }
 
-    public BigDecimal getUseMinPrice() 
-    {
+    public BigDecimal getUseMinPrice() {
         return useMinPrice;
     }
-    public void setCouponTime(Long couponTime) 
-    {
+
+    public void setCouponTime(Long couponTime) {
         this.couponTime = couponTime;
     }
 
-    public Long getCouponTime() 
-    {
+    public Long getCouponTime() {
         return couponTime;
     }
-    public void setSort(Long sort) 
-    {
+
+    public void setSort(Long sort) {
         this.sort = sort;
     }
 
-    public Long getSort() 
-    {
+    public Long getSort() {
         return sort;
     }
-    public void setStatus(Integer status) 
-    {
+
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
-    public Integer getStatus() 
-    {
+    public Integer getStatus() {
         return status;
     }
-    public void setProductIds(String productIds) 
-    {
+
+    public void setProductIds(String productIds) {
         this.productIds = productIds;
     }
 
-    public String getProductIds() 
-    {
+    public String getProductIds() {
         return productIds;
     }
-    public void setType(Integer type)
-    {
+
+    public void setType(Integer type) {
         this.type = type;
     }
 
-    public Integer getType()
-    {
+    public Integer getType() {
         return type;
     }
-    public void setIsDel(Integer isDel) 
-    {
+
+    public void setIsDel(Integer isDel) {
         this.isDel = isDel;
     }
 
-    public Integer getIsDel() 
-    {
+    public Integer getIsDel() {
         return isDel;
     }
 
+    public BigDecimal getPayPrice() {
+        return payPrice;
+    }
+
+    public void setPayPrice(BigDecimal payPrice) {
+        this.payPrice = payPrice;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("couponId", getCouponId())
-            .append("title", getTitle())
-            .append("integral", getIntegral())
-            .append("couponPrice", getCouponPrice())
-            .append("useMinPrice", getUseMinPrice())
-            .append("couponTime", getCouponTime())
-            .append("sort", getSort())
-            .append("status", getStatus())
-            .append("productIds", getProductIds())
-            .append("type", getType())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("isDel", getIsDel())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("couponId", getCouponId())
+                .append("title", getTitle())
+                .append("integral", getIntegral())
+                .append("couponPrice", getCouponPrice())
+                .append("useMinPrice", getUseMinPrice())
+                .append("couponTime", getCouponTime())
+                .append("sort", getSort())
+                .append("status", getStatus())
+                .append("productIds", getProductIds())
+                .append("type", getType())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("isDel", getIsDel())
+                .append("payPrice", getPayPrice())
+                .toString();
     }
 }

fs-service/src/main/resources/mapper/hisStore/FsStoreCouponScrmMapper.xml

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
         <result property="isDel"    column="is_del"    />
+        <result property="payPrice"    column="pay_price"    />
     </resultMap>
 
     <sql id="selectFsStoreCouponVo">
-        select coupon_id, title, integral, coupon_price, use_min_price, coupon_time, sort, status, product_ids,package_cate_ids, type, create_time, update_time, is_del from fs_store_coupon_scrm
+        select coupon_id, title, integral, coupon_price, use_min_price, coupon_time, sort, status, product_ids,package_cate_ids, type, create_time, update_time, is_del,pay_price from fs_store_coupon_scrm
     </sql>
 
     <select id="selectFsStoreCouponList" parameterType="FsStoreCouponScrm" resultMap="FsStoreCouponResult">
@@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productIds != null  and productIds != ''"> and product_ids = #{productIds}</if>
             <if test="packageCateIds != null  and packageCateIds != ''"> and package_cate_ids = #{packageCateIds}</if>
             <if test="type != null "> and type = #{type}</if>
+            <if test="type == null "> and type != 3</if>
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="beginTime != null and beginTime != ''">
             and date_format(create_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d') </if>
@@ -68,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="isDel != null">is_del,</if>
+            <if test="payPrice != null">pay_price,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="title != null and title != ''">#{title},</if>
@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="isDel != null">#{isDel},</if>
+            <if test="payPrice != null">#{payPrice},</if>
          </trim>
     </insert>
 
@@ -102,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="payPrice != null">pay_price=#{payPrice},</if>
         </trim>
         where coupon_id = #{couponId}
     </update>