Skip to content
GitLab
"src/main/vscode:/vscode.git/clone" did not exist on "67c3975bd714f01f775cba2e194e3255c8d7fc57"
Commit 7e6e3d00 authored by zhh's avatar zhh
Browse files

字段修改

parent c9e591ca
Hide whitespace changes
Inline Side-by-side
document/pdm/mall.pdb
View file @ 7e6e3d00
This source diff could not be displayed because it is too large. You can view the blob instead.
document/pdm/mall.pdm
View file @ 7e6e3d00
This source diff could not be displayed because it is too large. You can view the blob instead.
mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java
View file @ 7e6e3d00
...@@ -91,6 +91,13 @@ public class PmsProduct implements Serializable { ...@@ -91,6 +91,13 @@ public class PmsProduct implements Serializable {
*/ */
private BigDecimal promotionPrice; private BigDecimal promotionPrice;
/**
* 赠送的成长值
*
* @mbggenerated
*/
private Integer giftGrowth;
/** /**
* 赠送的积分 * 赠送的积分
* *
...@@ -406,6 +413,14 @@ public class PmsProduct implements Serializable { ...@@ -406,6 +413,14 @@ public class PmsProduct implements Serializable {
this.promotionPrice = promotionPrice; this.promotionPrice = promotionPrice;
} }
public Integer getGiftGrowth() {
return giftGrowth;
}
public void setGiftGrowth(Integer giftGrowth) {
this.giftGrowth = giftGrowth;
}
public Integer getGiftPoint() { public Integer getGiftPoint() {
return giftPoint; return giftPoint;
} }
...@@ -646,6 +661,7 @@ public class PmsProduct implements Serializable { ...@@ -646,6 +661,7 @@ public class PmsProduct implements Serializable {
sb.append(", sale=").append(sale); sb.append(", sale=").append(sale);
sb.append(", price=").append(price); sb.append(", price=").append(price);
sb.append(", promotionPrice=").append(promotionPrice); sb.append(", promotionPrice=").append(promotionPrice);
sb.append(", giftGrowth=").append(giftGrowth);
sb.append(", giftPoint=").append(giftPoint); sb.append(", giftPoint=").append(giftPoint);
sb.append(", usePointLimit=").append(usePointLimit); sb.append(", usePointLimit=").append(usePointLimit);
sb.append(", subTitle=").append(subTitle); sb.append(", subTitle=").append(subTitle);
......
mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java
View file @ 7e6e3d00
...@@ -1216,6 +1216,66 @@ public class PmsProductExample { ...@@ -1216,6 +1216,66 @@ public class PmsProductExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andGiftGrowthIsNull() {
addCriterion("gift_growth is null");
return (Criteria) this;
}
public Criteria andGiftGrowthIsNotNull() {
addCriterion("gift_growth is not null");
return (Criteria) this;
}
public Criteria andGiftGrowthEqualTo(Integer value) {
addCriterion("gift_growth =", value, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthNotEqualTo(Integer value) {
addCriterion("gift_growth <>", value, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthGreaterThan(Integer value) {
addCriterion("gift_growth >", value, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthGreaterThanOrEqualTo(Integer value) {
addCriterion("gift_growth >=", value, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthLessThan(Integer value) {
addCriterion("gift_growth <", value, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthLessThanOrEqualTo(Integer value) {
addCriterion("gift_growth <=", value, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthIn(List<Integer> values) {
addCriterion("gift_growth in", values, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthNotIn(List<Integer> values) {
addCriterion("gift_growth not in", values, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthBetween(Integer value1, Integer value2) {
addCriterion("gift_growth between", value1, value2, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftGrowthNotBetween(Integer value1, Integer value2) {
addCriterion("gift_growth not between", value1, value2, "giftGrowth");
return (Criteria) this;
}
public Criteria andGiftPointIsNull() { public Criteria andGiftPointIsNull() {
addCriterion("gift_point is null"); addCriterion("gift_point is null");
return (Criteria) this; return (Criteria) this;
......
mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductMapper.xml
View file @ 7e6e3d00
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<result column="sale" jdbcType="INTEGER" property="sale" /> <result column="sale" jdbcType="INTEGER" property="sale" />
<result column="price" jdbcType="DECIMAL" property="price" /> <result column="price" jdbcType="DECIMAL" property="price" />
<result column="promotion_price" jdbcType="DECIMAL" property="promotionPrice" /> <result column="promotion_price" jdbcType="DECIMAL" property="promotionPrice" />
<result column="gift_growth" jdbcType="INTEGER" property="giftGrowth" />
<result column="gift_point" jdbcType="INTEGER" property="giftPoint" /> <result column="gift_point" jdbcType="INTEGER" property="giftPoint" />
<result column="use_point_limit" jdbcType="INTEGER" property="usePointLimit" /> <result column="use_point_limit" jdbcType="INTEGER" property="usePointLimit" />
<result column="sub_title" jdbcType="VARCHAR" property="subTitle" /> <result column="sub_title" jdbcType="VARCHAR" property="subTitle" />
...@@ -111,11 +112,11 @@ ...@@ -111,11 +112,11 @@
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, id, brand_id, product_category_id, feight_template_id, product_attribute_category_id,
flash_promotion_id, name, pic, product_sn, delete_status, publish_status, new_status, flash_promotion_id, name, pic, product_sn, delete_status, publish_status, new_status,
recommand_status, verify_status, sort, sale, price, promotion_price, gift_point, recommand_status, verify_status, sort, sale, price, promotion_price, gift_growth,
use_point_limit, sub_title, original_price, stock, low_stock, unit, weight, preview_status, gift_point, use_point_limit, sub_title, original_price, stock, low_stock, unit, weight,
service_ids, keywords, note, album_pics, detail_title, flash_promotion_price, flash_promotion_count, preview_status, service_ids, keywords, note, album_pics, detail_title, flash_promotion_price,
flash_promotion_sort, promotion_start_time, promotion_end_time, promotion_per_limit, flash_promotion_count, flash_promotion_sort, promotion_start_time, promotion_end_time,
promotion_type, brand_name, product_category_name promotion_per_limit, promotion_type, brand_name, product_category_name
</sql> </sql>
<sql id="Blob_Column_List"> <sql id="Blob_Column_List">
description, detail_desc, detail_html, detail_mobile_html description, detail_desc, detail_html, detail_mobile_html
...@@ -178,32 +179,34 @@ ...@@ -178,32 +179,34 @@
delete_status, publish_status, new_status, delete_status, publish_status, new_status,
recommand_status, verify_status, sort, recommand_status, verify_status, sort,
sale, price, promotion_price, sale, price, promotion_price,
gift_point, use_point_limit, sub_title, gift_growth, gift_point, use_point_limit,
original_price, stock, low_stock, sub_title, original_price, stock,
unit, weight, preview_status, low_stock, unit, weight,
service_ids, keywords, note, preview_status, service_ids, keywords,
album_pics, detail_title, flash_promotion_price, note, album_pics, detail_title,
flash_promotion_count, flash_promotion_sort, flash_promotion_price, flash_promotion_count,
promotion_start_time, promotion_end_time, flash_promotion_sort, promotion_start_time,
promotion_per_limit, promotion_type, brand_name, promotion_end_time, promotion_per_limit,
product_category_name, description, detail_desc, promotion_type, brand_name, product_category_name,
detail_html, detail_mobile_html) description, detail_desc, detail_html,
detail_mobile_html)
values (#{brandId,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT}, #{feightTemplateId,jdbcType=BIGINT}, values (#{brandId,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT}, #{feightTemplateId,jdbcType=BIGINT},
#{productAttributeCategoryId,jdbcType=BIGINT}, #{flashPromotionId,jdbcType=INTEGER}, #{productAttributeCategoryId,jdbcType=BIGINT}, #{flashPromotionId,jdbcType=INTEGER},
#{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR},
#{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, #{newStatus,jdbcType=INTEGER}, #{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, #{newStatus,jdbcType=INTEGER},
#{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, #{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER},
#{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, #{promotionPrice,jdbcType=DECIMAL}, #{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, #{promotionPrice,jdbcType=DECIMAL},
#{giftPoint,jdbcType=INTEGER}, #{usePointLimit,jdbcType=INTEGER}, #{subTitle,jdbcType=VARCHAR}, #{giftGrowth,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER}, #{usePointLimit,jdbcType=INTEGER},
#{originalPrice,jdbcType=DECIMAL}, #{stock,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, #{subTitle,jdbcType=VARCHAR}, #{originalPrice,jdbcType=DECIMAL}, #{stock,jdbcType=INTEGER},
#{unit,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{previewStatus,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, #{unit,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL},
#{serviceIds,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{previewStatus,jdbcType=INTEGER}, #{serviceIds,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR},
#{albumPics,jdbcType=VARCHAR}, #{detailTitle,jdbcType=VARCHAR}, #{flashPromotionPrice,jdbcType=DECIMAL}, #{note,jdbcType=VARCHAR}, #{albumPics,jdbcType=VARCHAR}, #{detailTitle,jdbcType=VARCHAR},
#{flashPromotionCount,jdbcType=INTEGER}, #{flashPromotionSort,jdbcType=INTEGER}, #{flashPromotionPrice,jdbcType=DECIMAL}, #{flashPromotionCount,jdbcType=INTEGER},
#{promotionStartTime,jdbcType=TIMESTAMP}, #{promotionEndTime,jdbcType=TIMESTAMP}, #{flashPromotionSort,jdbcType=INTEGER}, #{promotionStartTime,jdbcType=TIMESTAMP},
#{promotionPerLimit,jdbcType=INTEGER}, #{promotionType,jdbcType=INTEGER}, #{brandName,jdbcType=VARCHAR}, #{promotionEndTime,jdbcType=TIMESTAMP}, #{promotionPerLimit,jdbcType=INTEGER},
#{productCategoryName,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}, #{detailDesc,jdbcType=LONGVARCHAR}, #{promotionType,jdbcType=INTEGER}, #{brandName,jdbcType=VARCHAR}, #{productCategoryName,jdbcType=VARCHAR},
#{detailHtml,jdbcType=LONGVARCHAR}, #{detailMobileHtml,jdbcType=LONGVARCHAR}) #{description,jdbcType=LONGVARCHAR}, #{detailDesc,jdbcType=LONGVARCHAR}, #{detailHtml,jdbcType=LONGVARCHAR},
#{detailMobileHtml,jdbcType=LONGVARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.macro.mall.model.PmsProduct"> <insert id="insertSelective" parameterType="com.macro.mall.model.PmsProduct">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
...@@ -262,6 +265,9 @@ ...@@ -262,6 +265,9 @@
<if test="promotionPrice != null"> <if test="promotionPrice != null">
promotion_price, promotion_price,
</if> </if>
<if test="giftGrowth != null">
gift_growth,
</if>
<if test="giftPoint != null"> <if test="giftPoint != null">
gift_point, gift_point,
</if> </if>
...@@ -396,6 +402,9 @@ ...@@ -396,6 +402,9 @@
<if test="promotionPrice != null"> <if test="promotionPrice != null">
#{promotionPrice,jdbcType=DECIMAL}, #{promotionPrice,jdbcType=DECIMAL},
</if> </if>
<if test="giftGrowth != null">
#{giftGrowth,jdbcType=INTEGER},
</if>
<if test="giftPoint != null"> <if test="giftPoint != null">
#{giftPoint,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER},
</if> </if>
...@@ -542,6 +551,9 @@ ...@@ -542,6 +551,9 @@
<if test="record.promotionPrice != null"> <if test="record.promotionPrice != null">
promotion_price = #{record.promotionPrice,jdbcType=DECIMAL}, promotion_price = #{record.promotionPrice,jdbcType=DECIMAL},
</if> </if>
<if test="record.giftGrowth != null">
gift_growth = #{record.giftGrowth,jdbcType=INTEGER},
</if>
<if test="record.giftPoint != null"> <if test="record.giftPoint != null">
gift_point = #{record.giftPoint,jdbcType=INTEGER}, gift_point = #{record.giftPoint,jdbcType=INTEGER},
</if> </if>
...@@ -648,6 +660,7 @@ ...@@ -648,6 +660,7 @@
sale = #{record.sale,jdbcType=INTEGER}, sale = #{record.sale,jdbcType=INTEGER},
price = #{record.price,jdbcType=DECIMAL}, price = #{record.price,jdbcType=DECIMAL},
promotion_price = #{record.promotionPrice,jdbcType=DECIMAL}, promotion_price = #{record.promotionPrice,jdbcType=DECIMAL},
gift_growth = #{record.giftGrowth,jdbcType=INTEGER},
gift_point = #{record.giftPoint,jdbcType=INTEGER}, gift_point = #{record.giftPoint,jdbcType=INTEGER},
use_point_limit = #{record.usePointLimit,jdbcType=INTEGER}, use_point_limit = #{record.usePointLimit,jdbcType=INTEGER},
sub_title = #{record.subTitle,jdbcType=VARCHAR}, sub_title = #{record.subTitle,jdbcType=VARCHAR},
...@@ -699,6 +712,7 @@ ...@@ -699,6 +712,7 @@
sale = #{record.sale,jdbcType=INTEGER}, sale = #{record.sale,jdbcType=INTEGER},
price = #{record.price,jdbcType=DECIMAL}, price = #{record.price,jdbcType=DECIMAL},
promotion_price = #{record.promotionPrice,jdbcType=DECIMAL}, promotion_price = #{record.promotionPrice,jdbcType=DECIMAL},
gift_growth = #{record.giftGrowth,jdbcType=INTEGER},
gift_point = #{record.giftPoint,jdbcType=INTEGER}, gift_point = #{record.giftPoint,jdbcType=INTEGER},
use_point_limit = #{record.usePointLimit,jdbcType=INTEGER}, use_point_limit = #{record.usePointLimit,jdbcType=INTEGER},
sub_title = #{record.subTitle,jdbcType=VARCHAR}, sub_title = #{record.subTitle,jdbcType=VARCHAR},
...@@ -780,6 +794,9 @@ ...@@ -780,6 +794,9 @@
<if test="promotionPrice != null"> <if test="promotionPrice != null">
promotion_price = #{promotionPrice,jdbcType=DECIMAL}, promotion_price = #{promotionPrice,jdbcType=DECIMAL},
</if> </if>
<if test="giftGrowth != null">
gift_growth = #{giftGrowth,jdbcType=INTEGER},
</if>
<if test="giftPoint != null"> <if test="giftPoint != null">
gift_point = #{giftPoint,jdbcType=INTEGER}, gift_point = #{giftPoint,jdbcType=INTEGER},
</if> </if>
...@@ -883,6 +900,7 @@ ...@@ -883,6 +900,7 @@
sale = #{sale,jdbcType=INTEGER}, sale = #{sale,jdbcType=INTEGER},
price = #{price,jdbcType=DECIMAL}, price = #{price,jdbcType=DECIMAL},
promotion_price = #{promotionPrice,jdbcType=DECIMAL}, promotion_price = #{promotionPrice,jdbcType=DECIMAL},
gift_growth = #{giftGrowth,jdbcType=INTEGER},
gift_point = #{giftPoint,jdbcType=INTEGER}, gift_point = #{giftPoint,jdbcType=INTEGER},
use_point_limit = #{usePointLimit,jdbcType=INTEGER}, use_point_limit = #{usePointLimit,jdbcType=INTEGER},
sub_title = #{subTitle,jdbcType=VARCHAR}, sub_title = #{subTitle,jdbcType=VARCHAR},
...@@ -931,6 +949,7 @@ ...@@ -931,6 +949,7 @@
sale = #{sale,jdbcType=INTEGER}, sale = #{sale,jdbcType=INTEGER},
price = #{price,jdbcType=DECIMAL}, price = #{price,jdbcType=DECIMAL},
promotion_price = #{promotionPrice,jdbcType=DECIMAL}, promotion_price = #{promotionPrice,jdbcType=DECIMAL},
gift_growth = #{giftGrowth,jdbcType=INTEGER},
gift_point = #{giftPoint,jdbcType=INTEGER}, gift_point = #{giftPoint,jdbcType=INTEGER},
use_point_limit = #{usePointLimit,jdbcType=INTEGER}, use_point_limit = #{usePointLimit,jdbcType=INTEGER},
sub_title = #{subTitle,jdbcType=VARCHAR}, sub_title = #{subTitle,jdbcType=VARCHAR},
......
Supports Markdown
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