diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java index 4a7a4b21..680a7781 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetail.java @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; - @ApiModel(value = "销售单明细表") @TableName(value = "t_sale_detail", autoResultMap = true) public class SaleDetail implements Serializable { @@ -57,6 +56,15 @@ public class SaleDetail implements Serializable { @ApiModelProperty(value = "销售数量") private Integer productCount; + @ApiModelProperty(value = "折扣") + private BigDecimal discount; + + @ApiModelProperty(value = "优惠金额") + private BigDecimal discountAmount; + + @ApiModelProperty(value = "实际价格") + private BigDecimal realPrice; + private static final long serialVersionUID = 1L; public String getId() { @@ -195,6 +203,30 @@ public class SaleDetail implements Serializable { this.productCount = productCount; } + public BigDecimal getDiscount() { + return discount; + } + + public void setDiscount(BigDecimal discount) { + this.discount = discount; + } + + public BigDecimal getDiscountAmount() { + return discountAmount; + } + + public void setDiscountAmount(BigDecimal discountAmount) { + this.discountAmount = discountAmount; + } + + public BigDecimal getRealPrice() { + return realPrice; + } + + public void setRealPrice(BigDecimal realPrice) { + this.realPrice = realPrice; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -218,6 +250,9 @@ public class SaleDetail implements Serializable { sb.append(", purchasePrice=").append(purchasePrice); sb.append(", wholesalePrice=").append(wholesalePrice); sb.append(", productCount=").append(productCount); + sb.append(", discount=").append(discount); + sb.append(", discountAmount=").append(discountAmount); + sb.append(", realPrice=").append(realPrice); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetailExample.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetailExample.java index 15f6d4bb..5b59f943 100644 --- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetailExample.java +++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/entity/SaleDetailExample.java @@ -1225,6 +1225,186 @@ public class SaleDetailExample { addCriterion("product_count not between", value1, value2, "productCount"); return (Criteria) this; } + + public Criteria andDiscountIsNull() { + addCriterion("discount is null"); + return (Criteria) this; + } + + public Criteria andDiscountIsNotNull() { + addCriterion("discount is not null"); + return (Criteria) this; + } + + public Criteria andDiscountEqualTo(BigDecimal value) { + addCriterion("discount =", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotEqualTo(BigDecimal value) { + addCriterion("discount <>", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountGreaterThan(BigDecimal value) { + addCriterion("discount >", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("discount >=", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountLessThan(BigDecimal value) { + addCriterion("discount <", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountLessThanOrEqualTo(BigDecimal value) { + addCriterion("discount <=", value, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountIn(List values) { + addCriterion("discount in", values, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotIn(List values) { + addCriterion("discount not in", values, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount between", value1, value2, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount not between", value1, value2, "discount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIsNull() { + addCriterion("discount_amount is null"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIsNotNull() { + addCriterion("discount_amount is not null"); + return (Criteria) this; + } + + public Criteria andDiscountAmountEqualTo(BigDecimal value) { + addCriterion("discount_amount =", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotEqualTo(BigDecimal value) { + addCriterion("discount_amount <>", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountGreaterThan(BigDecimal value) { + addCriterion("discount_amount >", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("discount_amount >=", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountLessThan(BigDecimal value) { + addCriterion("discount_amount <", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("discount_amount <=", value, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountIn(List values) { + addCriterion("discount_amount in", values, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotIn(List values) { + addCriterion("discount_amount not in", values, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_amount between", value1, value2, "discountAmount"); + return (Criteria) this; + } + + public Criteria andDiscountAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("discount_amount not between", value1, value2, "discountAmount"); + return (Criteria) this; + } + + public Criteria andRealPriceIsNull() { + addCriterion("real_price is null"); + return (Criteria) this; + } + + public Criteria andRealPriceIsNotNull() { + addCriterion("real_price is not null"); + return (Criteria) this; + } + + public Criteria andRealPriceEqualTo(BigDecimal value) { + addCriterion("real_price =", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceNotEqualTo(BigDecimal value) { + addCriterion("real_price <>", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceGreaterThan(BigDecimal value) { + addCriterion("real_price >", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("real_price >=", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceLessThan(BigDecimal value) { + addCriterion("real_price <", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("real_price <=", value, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceIn(List values) { + addCriterion("real_price in", values, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceNotIn(List values) { + addCriterion("real_price not in", values, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("real_price between", value1, value2, "realPrice"); + return (Criteria) this; + } + + public Criteria andRealPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("real_price not between", value1, value2, "realPrice"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml index 78005085..c366b7b9 100644 --- a/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml +++ b/hiver-modules/hiver-mall/src/main/resources/mapper/SaleDetailMapper.xml @@ -19,6 +19,9 @@ + + + @@ -81,7 +84,7 @@ id, create_by, create_time, del_flag, update_by, update_time, sale_id, product_id, product_name, unit, shop_id, category_id, attribute_list, price, purchase_price, - wholesale_price, product_count + wholesale_price, product_count, discount, discount_amount, real_price @@ -296,6 +319,15 @@ product_count = #{record.productCount,jdbcType=INTEGER}, + + discount = #{record.discount,jdbcType=DECIMAL}, + + + discount_amount = #{record.discountAmount,jdbcType=DECIMAL}, + + + real_price = #{record.realPrice,jdbcType=DECIMAL}, + @@ -319,7 +351,10 @@ price = #{record.price,jdbcType=DECIMAL}, purchase_price = #{record.purchasePrice,jdbcType=DECIMAL}, wholesale_price = #{record.wholesalePrice,jdbcType=DECIMAL}, - product_count = #{record.productCount,jdbcType=INTEGER} + product_count = #{record.productCount,jdbcType=INTEGER}, + discount = #{record.discount,jdbcType=DECIMAL}, + discount_amount = #{record.discountAmount,jdbcType=DECIMAL}, + real_price = #{record.realPrice,jdbcType=DECIMAL} @@ -375,6 +410,15 @@ product_count = #{productCount,jdbcType=INTEGER}, + + discount = #{discount,jdbcType=DECIMAL}, + + + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + + + real_price = #{realPrice,jdbcType=DECIMAL}, + where id = #{id,jdbcType=VARCHAR} @@ -395,7 +439,10 @@ price = #{price,jdbcType=DECIMAL}, purchase_price = #{purchasePrice,jdbcType=DECIMAL}, wholesale_price = #{wholesalePrice,jdbcType=DECIMAL}, - product_count = #{productCount,jdbcType=INTEGER} + product_count = #{productCount,jdbcType=INTEGER}, + discount = #{discount,jdbcType=DECIMAL}, + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + real_price = #{realPrice,jdbcType=DECIMAL} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file