diff --git a/hai-service/src/main/java/com/hai/dao/GoodsDetailMapper.java b/hai-service/src/main/java/com/hai/dao/GoodsDetailMapper.java index 412a0fb9..674e3696 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsDetailMapper.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsDetailMapper.java @@ -39,20 +39,22 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into goods_detail (goods_type, `name`, ", - "list_describe, goods_describe, ", - "list_img, banner_img, ", - "detail_img, `status`, ", - "create_time, update_time, ", - "op_id, op_name, ext_1, ", - "ext_2, ext_3)", - "values (#{goodsType,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, ", - "#{listDescribe,jdbcType=VARCHAR}, #{goodsDescribe,jdbcType=VARCHAR}, ", - "#{listImg,jdbcType=VARCHAR}, #{bannerImg,jdbcType=VARCHAR}, ", - "#{detailImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{opId,jdbcType=BIGINT}, #{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "insert into goods_detail (company_id, goods_type, ", + "`name`, list_describe, ", + "goods_describe, list_img, ", + "banner_img, detail_img, ", + "`status`, create_time, ", + "update_time, op_id, ", + "op_name, ext_1, ext_2, ", + "ext_3)", + "values (#{companyId,jdbcType=BIGINT}, #{goodsType,jdbcType=BIGINT}, ", + "#{name,jdbcType=VARCHAR}, #{listDescribe,jdbcType=VARCHAR}, ", + "#{goodsDescribe,jdbcType=VARCHAR}, #{listImg,jdbcType=VARCHAR}, ", + "#{bannerImg,jdbcType=VARCHAR}, #{detailImg,jdbcType=VARCHAR}, ", + "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", + "#{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", + "#{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(GoodsDetail record); @@ -64,6 +66,7 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt { @SelectProvider(type=GoodsDetailSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.BIGINT), @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR), @Result(column="list_describe", property="listDescribe", jdbcType=JdbcType.VARCHAR), @@ -84,14 +87,15 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt { @Select({ "select", - "id, goods_type, `name`, list_describe, goods_describe, list_img, banner_img, ", - "detail_img, `status`, create_time, update_time, op_id, op_name, ext_1, ext_2, ", - "ext_3", + "id, company_id, goods_type, `name`, list_describe, goods_describe, list_img, ", + "banner_img, detail_img, `status`, create_time, update_time, op_id, op_name, ", + "ext_1, ext_2, ext_3", "from goods_detail", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.BIGINT), @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR), @Result(column="list_describe", property="listDescribe", jdbcType=JdbcType.VARCHAR), @@ -121,7 +125,8 @@ public interface GoodsDetailMapper extends GoodsDetailMapperExt { @Update({ "update goods_detail", - "set goods_type = #{goodsType,jdbcType=BIGINT},", + "set company_id = #{companyId,jdbcType=BIGINT},", + "goods_type = #{goodsType,jdbcType=BIGINT},", "`name` = #{name,jdbcType=VARCHAR},", "list_describe = #{listDescribe,jdbcType=VARCHAR},", "goods_describe = #{goodsDescribe,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/GoodsDetailSqlProvider.java b/hai-service/src/main/java/com/hai/dao/GoodsDetailSqlProvider.java index 419ef2ae..dddad9db 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsDetailSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsDetailSqlProvider.java @@ -28,6 +28,10 @@ public class GoodsDetailSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("goods_detail"); + if (record.getCompanyId() != null) { + sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); + } + if (record.getGoodsType() != null) { sql.VALUES("goods_type", "#{goodsType,jdbcType=BIGINT}"); } @@ -98,6 +102,7 @@ public class GoodsDetailSqlProvider { } else { sql.SELECT("id"); } + sql.SELECT("company_id"); sql.SELECT("goods_type"); sql.SELECT("`name`"); sql.SELECT("list_describe"); @@ -134,6 +139,10 @@ public class GoodsDetailSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } + if (record.getCompanyId() != null) { + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); + } + if (record.getGoodsType() != null) { sql.SET("goods_type = #{record.goodsType,jdbcType=BIGINT}"); } @@ -203,6 +212,7 @@ public class GoodsDetailSqlProvider { sql.UPDATE("goods_detail"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); sql.SET("goods_type = #{record.goodsType,jdbcType=BIGINT}"); sql.SET("`name` = #{record.name,jdbcType=VARCHAR}"); sql.SET("list_describe = #{record.listDescribe,jdbcType=VARCHAR}"); @@ -228,6 +238,10 @@ public class GoodsDetailSqlProvider { SQL sql = new SQL(); sql.UPDATE("goods_detail"); + if (record.getCompanyId() != null) { + sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); + } + if (record.getGoodsType() != null) { sql.SET("goods_type = #{goodsType,jdbcType=BIGINT}"); } diff --git a/hai-service/src/main/java/com/hai/dao/GoodsReviewMapper.java b/hai-service/src/main/java/com/hai/dao/GoodsReviewMapper.java index 92d34631..bd79fc2d 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsReviewMapper.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsReviewMapper.java @@ -30,14 +30,14 @@ public interface GoodsReviewMapper extends GoodsReviewMapperExt { int deleteByExample(GoodsReviewExample example); @Insert({ - "insert into goods_review (user_id, goods_id, ", - "sku_id, review_describe, ", + "insert into goods_review (user_id, order_id, ", + "goods_id, sku_id, review_describe, ", "show_img, `status`, ", "create_time, op_id, ", "op_name, ext_1, ext_2, ", "ext_3)", - "values (#{userId,jdbcType=BIGINT}, #{goodsId,jdbcType=BIGINT}, ", - "#{skuId,jdbcType=BIGINT}, #{reviewDescribe,jdbcType=VARCHAR}, ", + "values (#{userId,jdbcType=BIGINT}, #{orderId,jdbcType=BIGINT}, ", + "#{goodsId,jdbcType=BIGINT}, #{skuId,jdbcType=BIGINT}, #{reviewDescribe,jdbcType=VARCHAR}, ", "#{showImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", "#{createTime,jdbcType=TIMESTAMP}, #{opId,jdbcType=BIGINT}, ", "#{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", @@ -54,6 +54,7 @@ public interface GoodsReviewMapper extends GoodsReviewMapperExt { @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), + @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT), @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), @Result(column="sku_id", property="skuId", jdbcType=JdbcType.BIGINT), @Result(column="review_describe", property="reviewDescribe", jdbcType=JdbcType.VARCHAR), diff --git a/hai-service/src/main/java/com/hai/dao/GoodsReviewSqlProvider.java b/hai-service/src/main/java/com/hai/dao/GoodsReviewSqlProvider.java index 6b2c940f..56b4ebd4 100644 --- a/hai-service/src/main/java/com/hai/dao/GoodsReviewSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/GoodsReviewSqlProvider.java @@ -32,6 +32,10 @@ public class GoodsReviewSqlProvider { sql.VALUES("user_id", "#{userId,jdbcType=BIGINT}"); } + if (record.getOrderId() != null) { + sql.VALUES("order_id", "#{orderId,jdbcType=BIGINT}"); + } + if (record.getGoodsId() != null) { sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}"); } @@ -87,6 +91,7 @@ public class GoodsReviewSqlProvider { sql.SELECT("id"); } sql.SELECT("user_id"); + sql.SELECT("order_id"); sql.SELECT("goods_id"); sql.SELECT("sku_id"); sql.SELECT("review_describe"); @@ -123,6 +128,10 @@ public class GoodsReviewSqlProvider { sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); } + if (record.getOrderId() != null) { + sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); + } + if (record.getGoodsId() != null) { sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); } @@ -177,6 +186,7 @@ public class GoodsReviewSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); + sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}"); sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); sql.SET("sku_id = #{record.skuId,jdbcType=BIGINT}"); sql.SET("review_describe = #{record.reviewDescribe,jdbcType=VARCHAR}"); diff --git a/hai-service/src/main/java/com/hai/entity/GoodsDetail.java b/hai-service/src/main/java/com/hai/entity/GoodsDetail.java index 8a2d0659..5c6dba4c 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsDetail.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsDetail.java @@ -18,6 +18,11 @@ public class GoodsDetail implements Serializable { */ private Long id; + /** + * 公司id + */ + private Long companyId; + /** * 商品类型 */ @@ -103,6 +108,14 @@ public class GoodsDetail implements Serializable { this.id = id; } + public Long getCompanyId() { + return companyId; + } + + public void setCompanyId(Long companyId) { + this.companyId = companyId; + } + public Long getGoodsType() { return goodsType; } @@ -236,6 +249,7 @@ public class GoodsDetail implements Serializable { } GoodsDetail other = (GoodsDetail) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) && (this.getGoodsType() == null ? other.getGoodsType() == null : this.getGoodsType().equals(other.getGoodsType())) && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) && (this.getListDescribe() == null ? other.getListDescribe() == null : this.getListDescribe().equals(other.getListDescribe())) @@ -258,6 +272,7 @@ public class GoodsDetail implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); result = prime * result + ((getGoodsType() == null) ? 0 : getGoodsType().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((getListDescribe() == null) ? 0 : getListDescribe().hashCode()); @@ -283,6 +298,7 @@ public class GoodsDetail implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", companyId=").append(companyId); sb.append(", goodsType=").append(goodsType); sb.append(", name=").append(name); sb.append(", listDescribe=").append(listDescribe); diff --git a/hai-service/src/main/java/com/hai/entity/GoodsDetailExample.java b/hai-service/src/main/java/com/hai/entity/GoodsDetailExample.java index 1f47d30e..219926b9 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsDetailExample.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsDetailExample.java @@ -185,6 +185,66 @@ public class GoodsDetailExample { return (Criteria) this; } + public Criteria andCompanyIdIsNull() { + addCriterion("company_id is null"); + return (Criteria) this; + } + + public Criteria andCompanyIdIsNotNull() { + addCriterion("company_id is not null"); + return (Criteria) this; + } + + public Criteria andCompanyIdEqualTo(Long value) { + addCriterion("company_id =", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotEqualTo(Long value) { + addCriterion("company_id <>", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdGreaterThan(Long value) { + addCriterion("company_id >", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) { + addCriterion("company_id >=", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdLessThan(Long value) { + addCriterion("company_id <", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdLessThanOrEqualTo(Long value) { + addCriterion("company_id <=", value, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdIn(List values) { + addCriterion("company_id in", values, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotIn(List values) { + addCriterion("company_id not in", values, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdBetween(Long value1, Long value2) { + addCriterion("company_id between", value1, value2, "companyId"); + return (Criteria) this; + } + + public Criteria andCompanyIdNotBetween(Long value1, Long value2) { + addCriterion("company_id not between", value1, value2, "companyId"); + return (Criteria) this; + } + public Criteria andGoodsTypeIsNull() { addCriterion("goods_type is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/entity/GoodsReview.java b/hai-service/src/main/java/com/hai/entity/GoodsReview.java index 7e0e0013..f4ce61dc 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsReview.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsReview.java @@ -23,6 +23,11 @@ public class GoodsReview implements Serializable { */ private Long userId; + /** + * 订单id + */ + private Long orderId; + /** * 商品id */ @@ -96,6 +101,14 @@ public class GoodsReview implements Serializable { this.userId = userId; } + public Long getOrderId() { + return orderId; + } + + public void setOrderId(Long orderId) { + this.orderId = orderId; + } + public Long getGoodsId() { return goodsId; } @@ -198,6 +211,7 @@ public class GoodsReview implements Serializable { GoodsReview other = (GoodsReview) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) + && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) && (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId())) && (this.getReviewDescribe() == null ? other.getReviewDescribe() == null : this.getReviewDescribe().equals(other.getReviewDescribe())) @@ -217,6 +231,7 @@ public class GoodsReview implements Serializable { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); + result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode()); result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode()); result = prime * result + ((getReviewDescribe() == null) ? 0 : getReviewDescribe().hashCode()); @@ -239,6 +254,7 @@ public class GoodsReview implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", userId=").append(userId); + sb.append(", orderId=").append(orderId); sb.append(", goodsId=").append(goodsId); sb.append(", skuId=").append(skuId); sb.append(", reviewDescribe=").append(reviewDescribe); diff --git a/hai-service/src/main/java/com/hai/entity/GoodsReviewExample.java b/hai-service/src/main/java/com/hai/entity/GoodsReviewExample.java index be597318..e5da99cd 100644 --- a/hai-service/src/main/java/com/hai/entity/GoodsReviewExample.java +++ b/hai-service/src/main/java/com/hai/entity/GoodsReviewExample.java @@ -245,6 +245,66 @@ public class GoodsReviewExample { return (Criteria) this; } + public Criteria andOrderIdIsNull() { + addCriterion("order_id is null"); + return (Criteria) this; + } + + public Criteria andOrderIdIsNotNull() { + addCriterion("order_id is not null"); + return (Criteria) this; + } + + public Criteria andOrderIdEqualTo(Long value) { + addCriterion("order_id =", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdNotEqualTo(Long value) { + addCriterion("order_id <>", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdGreaterThan(Long value) { + addCriterion("order_id >", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdGreaterThanOrEqualTo(Long value) { + addCriterion("order_id >=", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdLessThan(Long value) { + addCriterion("order_id <", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdLessThanOrEqualTo(Long value) { + addCriterion("order_id <=", value, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdIn(List values) { + addCriterion("order_id in", values, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdNotIn(List values) { + addCriterion("order_id not in", values, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdBetween(Long value1, Long value2) { + addCriterion("order_id between", value1, value2, "orderId"); + return (Criteria) this; + } + + public Criteria andOrderIdNotBetween(Long value1, Long value2) { + addCriterion("order_id not between", value1, value2, "orderId"); + return (Criteria) this; + } + public Criteria andGoodsIdIsNull() { addCriterion("goods_id is null"); return (Criteria) this;