diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java b/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java index 803416f9..6297e957 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighCouponController.java @@ -66,8 +66,12 @@ public class HighCouponController { || StringUtils.isNotBlank(highCoupon.getCouponName()) || StringUtils.isNotBlank(highCoupon.getCouponValue()) || StringUtils.isNotBlank(highCoupon.getCouponImg()) - || highCoupon.getIsPresent() == null - || highCoupon.getCouponPrice() == null) { + || StringUtils.isNotBlank(highCoupon.getCouponCarouselImg()) + || StringUtils.isNotBlank(highCoupon.getCouponDesc()) + || highCoupon.getCouponType() == null + || highCoupon.getLimitNumber()== null + || highCoupon.getSalesPrice()== null + || highCoupon.getIsPresent() == null) { log.error("HighCouponController -> insertCoupon() error!","参数错误"); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } @@ -122,8 +126,7 @@ public class HighCouponController { || StringUtils.isNotBlank(highCoupon.getCouponName()) || StringUtils.isNotBlank(highCoupon.getCouponValue()) || StringUtils.isNotBlank(highCoupon.getCouponImg()) - || highCoupon.getIsPresent() == null - || highCoupon.getCouponPrice() == null) { + || highCoupon.getIsPresent() == null) { log.error("HighCouponController -> updateCoupon() error!","参数错误"); throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } diff --git a/hai-bweb/src/main/resources/dev/config.properties b/hai-bweb/src/main/resources/dev/config.properties index f0aa7b68..44ea8fc8 100644 --- a/hai-bweb/src/main/resources/dev/config.properties +++ b/hai-bweb/src/main/resources/dev/config.properties @@ -1,2 +1,2 @@ -fileUrl=F:/hurui_probject/filesystem -cmsPath=F:/hurui_probject/filesystem +fileUrl=/home/project/hsg/filesystem +cmsPath=/home/project/hsg/filesystem/cmsPath diff --git a/hai-cweb/src/main/resources/dev/config.properties b/hai-cweb/src/main/resources/dev/config.properties index 669cf7ca..3ce860c5 100644 --- a/hai-cweb/src/main/resources/dev/config.properties +++ b/hai-cweb/src/main/resources/dev/config.properties @@ -1,5 +1,5 @@ -wxAppId=wx01898d5209357d68 -wxAppSecret=5c52d0526fcdb425075f6d51381d5c03 - -fileUrl=F:/hurui_probject/filesystem -cmsPath=F:/hurui_probject/filesystem +wxAppId=wx8d49e2f83025229d +wxAppSecret=d8d6dcaef77d3b659258a01b5ddba5df +mvn +fileUrl=/home/project/hsg/filesystem +cmsPath=/home/project/hsg/filesystem/cmsPath diff --git a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java index e1f11ca5..da39cff6 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java @@ -43,16 +43,16 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "goods_id, goods_name, ", "goods_img, goods_spec_name, ", "goods_price, sale_count, ", - "total_price, child_orde_status, ", - "praise_status, ext_1, ", - "ext_2, ext_3)", + "total_price, giveaway_type, ", + "child_orde_status, praise_status, ", + "ext_1, ext_2, ext_3)", "values (#{orderId,jdbcType=BIGINT}, #{goodsType,jdbcType=INTEGER}, ", "#{goodsId,jdbcType=BIGINT}, #{goodsName,jdbcType=VARCHAR}, ", "#{goodsImg,jdbcType=VARCHAR}, #{goodsSpecName,jdbcType=VARCHAR}, ", "#{goodsPrice,jdbcType=REAL}, #{saleCount,jdbcType=INTEGER}, ", - "#{totalPrice,jdbcType=REAL}, #{childOrdeStatus,jdbcType=INTEGER}, ", - "#{praiseStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{totalPrice,jdbcType=REAL}, #{giveawayType,jdbcType=BIT}, ", + "#{childOrdeStatus,jdbcType=INTEGER}, #{praiseStatus,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighChildOrder record); @@ -73,6 +73,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="goods_price", property="goodsPrice", jdbcType=JdbcType.REAL), @Result(column="sale_count", property="saleCount", jdbcType=JdbcType.INTEGER), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.REAL), + @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT), @Result(column="child_orde_status", property="childOrdeStatus", jdbcType=JdbcType.INTEGER), @Result(column="praise_status", property="praiseStatus", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @@ -84,8 +85,8 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Select({ "select", "id, order_id, goods_type, goods_id, goods_name, goods_img, goods_spec_name, ", - "goods_price, sale_count, total_price, child_orde_status, praise_status, ext_1, ", - "ext_2, ext_3", + "goods_price, sale_count, total_price, giveaway_type, child_orde_status, praise_status, ", + "ext_1, ext_2, ext_3", "from high_child_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -100,6 +101,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { @Result(column="goods_price", property="goodsPrice", jdbcType=JdbcType.REAL), @Result(column="sale_count", property="saleCount", jdbcType=JdbcType.INTEGER), @Result(column="total_price", property="totalPrice", jdbcType=JdbcType.REAL), + @Result(column="giveaway_type", property="giveawayType", jdbcType=JdbcType.BIT), @Result(column="child_orde_status", property="childOrdeStatus", jdbcType=JdbcType.INTEGER), @Result(column="praise_status", property="praiseStatus", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @@ -128,6 +130,7 @@ public interface HighChildOrderMapper extends HighChildOrderMapperExt { "goods_price = #{goodsPrice,jdbcType=REAL},", "sale_count = #{saleCount,jdbcType=INTEGER},", "total_price = #{totalPrice,jdbcType=REAL},", + "giveaway_type = #{giveawayType,jdbcType=BIT},", "child_orde_status = #{childOrdeStatus,jdbcType=INTEGER},", "praise_status = #{praiseStatus,jdbcType=INTEGER},", "ext_1 = #{ext1,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java index b9c9ccff..fa73e176 100644 --- a/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java @@ -64,6 +64,10 @@ public class HighChildOrderSqlProvider { sql.VALUES("total_price", "#{totalPrice,jdbcType=REAL}"); } + if (record.getGiveawayType() != null) { + sql.VALUES("giveaway_type", "#{giveawayType,jdbcType=BIT}"); + } + if (record.getChildOrdeStatus() != null) { sql.VALUES("child_orde_status", "#{childOrdeStatus,jdbcType=INTEGER}"); } @@ -103,6 +107,7 @@ public class HighChildOrderSqlProvider { sql.SELECT("goods_price"); sql.SELECT("sale_count"); sql.SELECT("total_price"); + sql.SELECT("giveaway_type"); sql.SELECT("child_orde_status"); sql.SELECT("praise_status"); sql.SELECT("ext_1"); @@ -165,6 +170,10 @@ public class HighChildOrderSqlProvider { sql.SET("total_price = #{record.totalPrice,jdbcType=REAL}"); } + if (record.getGiveawayType() != null) { + sql.SET("giveaway_type = #{record.giveawayType,jdbcType=BIT}"); + } + if (record.getChildOrdeStatus() != null) { sql.SET("child_orde_status = #{record.childOrdeStatus,jdbcType=INTEGER}"); } @@ -203,6 +212,7 @@ public class HighChildOrderSqlProvider { sql.SET("goods_price = #{record.goodsPrice,jdbcType=REAL}"); sql.SET("sale_count = #{record.saleCount,jdbcType=INTEGER}"); sql.SET("total_price = #{record.totalPrice,jdbcType=REAL}"); + sql.SET("giveaway_type = #{record.giveawayType,jdbcType=BIT}"); sql.SET("child_orde_status = #{record.childOrdeStatus,jdbcType=INTEGER}"); sql.SET("praise_status = #{record.praiseStatus,jdbcType=INTEGER}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); @@ -254,6 +264,10 @@ public class HighChildOrderSqlProvider { sql.SET("total_price = #{totalPrice,jdbcType=REAL}"); } + if (record.getGiveawayType() != null) { + sql.SET("giveaway_type = #{giveawayType,jdbcType=BIT}"); + } + if (record.getChildOrdeStatus() != null) { sql.SET("child_orde_status = #{childOrdeStatus,jdbcType=INTEGER}"); } diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponMapper.java b/hai-service/src/main/java/com/hai/dao/HighCouponMapper.java index 6a553864..9a5e5516 100644 --- a/hai-service/src/main/java/com/hai/dao/HighCouponMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighCouponMapper.java @@ -42,19 +42,23 @@ public interface HighCouponMapper extends HighCouponMapperExt { "insert into high_coupon (company_id, merchant_id, ", "coupon_key, coupon_name, ", "coupon_value, coupon_img, ", - "coupon_price, is_present, ", - "create_time, update_time, ", - "operator_id, operator_name, ", - "`status`, ext_1, ext_2, ", - "ext_3)", + "coupon_carousel_img, coupon_desc, ", + "coupon_type, limit_number, ", + "sales_price, sales_count, ", + "is_present, create_time, ", + "update_time, operator_id, ", + "operator_name, `status`, ", + "ext_1, ext_2, ext_3)", "values (#{companyId,jdbcType=BIGINT}, #{merchantId,jdbcType=BIGINT}, ", "#{couponKey,jdbcType=VARCHAR}, #{couponName,jdbcType=VARCHAR}, ", "#{couponValue,jdbcType=VARCHAR}, #{couponImg,jdbcType=VARCHAR}, ", - "#{couponPrice,jdbcType=DECIMAL}, #{isPresent,jdbcType=BIT}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ", - "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "#{couponCarouselImg,jdbcType=VARCHAR}, #{couponDesc,jdbcType=VARCHAR}, ", + "#{couponType,jdbcType=INTEGER}, #{limitNumber,jdbcType=INTEGER}, ", + "#{salesPrice,jdbcType=DECIMAL}, #{salesCount,jdbcType=INTEGER}, ", + "#{isPresent,jdbcType=BIT}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{operatorId,jdbcType=BIGINT}, ", + "#{operatorName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighCoupon record); @@ -72,7 +76,12 @@ public interface HighCouponMapper extends HighCouponMapperExt { @Result(column="coupon_name", property="couponName", jdbcType=JdbcType.VARCHAR), @Result(column="coupon_value", property="couponValue", jdbcType=JdbcType.VARCHAR), @Result(column="coupon_img", property="couponImg", jdbcType=JdbcType.VARCHAR), - @Result(column="coupon_price", property="couponPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="coupon_carousel_img", property="couponCarouselImg", jdbcType=JdbcType.VARCHAR), + @Result(column="coupon_desc", property="couponDesc", jdbcType=JdbcType.VARCHAR), + @Result(column="coupon_type", property="couponType", jdbcType=JdbcType.INTEGER), + @Result(column="limit_number", property="limitNumber", jdbcType=JdbcType.INTEGER), + @Result(column="sales_price", property="salesPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="sales_count", property="salesCount", jdbcType=JdbcType.INTEGER), @Result(column="is_present", property="isPresent", jdbcType=JdbcType.BIT), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -88,8 +97,9 @@ public interface HighCouponMapper extends HighCouponMapperExt { @Select({ "select", "id, company_id, merchant_id, coupon_key, coupon_name, coupon_value, coupon_img, ", - "coupon_price, is_present, create_time, update_time, operator_id, operator_name, ", - "`status`, ext_1, ext_2, ext_3", + "coupon_carousel_img, coupon_desc, coupon_type, limit_number, sales_price, sales_count, ", + "is_present, create_time, update_time, operator_id, operator_name, `status`, ", + "ext_1, ext_2, ext_3", "from high_coupon", "where id = #{id,jdbcType=BIGINT}" }) @@ -101,7 +111,12 @@ public interface HighCouponMapper extends HighCouponMapperExt { @Result(column="coupon_name", property="couponName", jdbcType=JdbcType.VARCHAR), @Result(column="coupon_value", property="couponValue", jdbcType=JdbcType.VARCHAR), @Result(column="coupon_img", property="couponImg", jdbcType=JdbcType.VARCHAR), - @Result(column="coupon_price", property="couponPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="coupon_carousel_img", property="couponCarouselImg", jdbcType=JdbcType.VARCHAR), + @Result(column="coupon_desc", property="couponDesc", jdbcType=JdbcType.VARCHAR), + @Result(column="coupon_type", property="couponType", jdbcType=JdbcType.INTEGER), + @Result(column="limit_number", property="limitNumber", jdbcType=JdbcType.INTEGER), + @Result(column="sales_price", property="salesPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="sales_count", property="salesCount", jdbcType=JdbcType.INTEGER), @Result(column="is_present", property="isPresent", jdbcType=JdbcType.BIT), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -131,7 +146,12 @@ public interface HighCouponMapper extends HighCouponMapperExt { "coupon_name = #{couponName,jdbcType=VARCHAR},", "coupon_value = #{couponValue,jdbcType=VARCHAR},", "coupon_img = #{couponImg,jdbcType=VARCHAR},", - "coupon_price = #{couponPrice,jdbcType=DECIMAL},", + "coupon_carousel_img = #{couponCarouselImg,jdbcType=VARCHAR},", + "coupon_desc = #{couponDesc,jdbcType=VARCHAR},", + "coupon_type = #{couponType,jdbcType=INTEGER},", + "limit_number = #{limitNumber,jdbcType=INTEGER},", + "sales_price = #{salesPrice,jdbcType=DECIMAL},", + "sales_count = #{salesCount,jdbcType=INTEGER},", "is_present = #{isPresent,jdbcType=BIT},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", diff --git a/hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java index 9cd2de91..9c2acd23 100644 --- a/hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighCouponSqlProvider.java @@ -52,8 +52,28 @@ public class HighCouponSqlProvider { sql.VALUES("coupon_img", "#{couponImg,jdbcType=VARCHAR}"); } - if (record.getCouponPrice() != null) { - sql.VALUES("coupon_price", "#{couponPrice,jdbcType=DECIMAL}"); + if (record.getCouponCarouselImg() != null) { + sql.VALUES("coupon_carousel_img", "#{couponCarouselImg,jdbcType=VARCHAR}"); + } + + if (record.getCouponDesc() != null) { + sql.VALUES("coupon_desc", "#{couponDesc,jdbcType=VARCHAR}"); + } + + if (record.getCouponType() != null) { + sql.VALUES("coupon_type", "#{couponType,jdbcType=INTEGER}"); + } + + if (record.getLimitNumber() != null) { + sql.VALUES("limit_number", "#{limitNumber,jdbcType=INTEGER}"); + } + + if (record.getSalesPrice() != null) { + sql.VALUES("sales_price", "#{salesPrice,jdbcType=DECIMAL}"); + } + + if (record.getSalesCount() != null) { + sql.VALUES("sales_count", "#{salesCount,jdbcType=INTEGER}"); } if (record.getIsPresent() != null) { @@ -108,7 +128,12 @@ public class HighCouponSqlProvider { sql.SELECT("coupon_name"); sql.SELECT("coupon_value"); sql.SELECT("coupon_img"); - sql.SELECT("coupon_price"); + sql.SELECT("coupon_carousel_img"); + sql.SELECT("coupon_desc"); + sql.SELECT("coupon_type"); + sql.SELECT("limit_number"); + sql.SELECT("sales_price"); + sql.SELECT("sales_count"); sql.SELECT("is_present"); sql.SELECT("create_time"); sql.SELECT("update_time"); @@ -163,8 +188,28 @@ public class HighCouponSqlProvider { sql.SET("coupon_img = #{record.couponImg,jdbcType=VARCHAR}"); } - if (record.getCouponPrice() != null) { - sql.SET("coupon_price = #{record.couponPrice,jdbcType=DECIMAL}"); + if (record.getCouponCarouselImg() != null) { + sql.SET("coupon_carousel_img = #{record.couponCarouselImg,jdbcType=VARCHAR}"); + } + + if (record.getCouponDesc() != null) { + sql.SET("coupon_desc = #{record.couponDesc,jdbcType=VARCHAR}"); + } + + if (record.getCouponType() != null) { + sql.SET("coupon_type = #{record.couponType,jdbcType=INTEGER}"); + } + + if (record.getLimitNumber() != null) { + sql.SET("limit_number = #{record.limitNumber,jdbcType=INTEGER}"); + } + + if (record.getSalesPrice() != null) { + sql.SET("sales_price = #{record.salesPrice,jdbcType=DECIMAL}"); + } + + if (record.getSalesCount() != null) { + sql.SET("sales_count = #{record.salesCount,jdbcType=INTEGER}"); } if (record.getIsPresent() != null) { @@ -218,7 +263,12 @@ public class HighCouponSqlProvider { sql.SET("coupon_name = #{record.couponName,jdbcType=VARCHAR}"); sql.SET("coupon_value = #{record.couponValue,jdbcType=VARCHAR}"); sql.SET("coupon_img = #{record.couponImg,jdbcType=VARCHAR}"); - sql.SET("coupon_price = #{record.couponPrice,jdbcType=DECIMAL}"); + sql.SET("coupon_carousel_img = #{record.couponCarouselImg,jdbcType=VARCHAR}"); + sql.SET("coupon_desc = #{record.couponDesc,jdbcType=VARCHAR}"); + sql.SET("coupon_type = #{record.couponType,jdbcType=INTEGER}"); + sql.SET("limit_number = #{record.limitNumber,jdbcType=INTEGER}"); + sql.SET("sales_price = #{record.salesPrice,jdbcType=DECIMAL}"); + sql.SET("sales_count = #{record.salesCount,jdbcType=INTEGER}"); sql.SET("is_present = #{record.isPresent,jdbcType=BIT}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); @@ -262,8 +312,28 @@ public class HighCouponSqlProvider { sql.SET("coupon_img = #{couponImg,jdbcType=VARCHAR}"); } - if (record.getCouponPrice() != null) { - sql.SET("coupon_price = #{couponPrice,jdbcType=DECIMAL}"); + if (record.getCouponCarouselImg() != null) { + sql.SET("coupon_carousel_img = #{couponCarouselImg,jdbcType=VARCHAR}"); + } + + if (record.getCouponDesc() != null) { + sql.SET("coupon_desc = #{couponDesc,jdbcType=VARCHAR}"); + } + + if (record.getCouponType() != null) { + sql.SET("coupon_type = #{couponType,jdbcType=INTEGER}"); + } + + if (record.getLimitNumber() != null) { + sql.SET("limit_number = #{limitNumber,jdbcType=INTEGER}"); + } + + if (record.getSalesPrice() != null) { + sql.SET("sales_price = #{salesPrice,jdbcType=DECIMAL}"); + } + + if (record.getSalesCount() != null) { + sql.SET("sales_count = #{salesCount,jdbcType=INTEGER}"); } if (record.getIsPresent() != null) { diff --git a/hai-service/src/main/java/com/hai/dao/HighGoodsPriceReferMapper.java b/hai-service/src/main/java/com/hai/dao/HighGoodsPriceReferMapper.java index 7ed90f91..502c691e 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGoodsPriceReferMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighGoodsPriceReferMapper.java @@ -39,18 +39,18 @@ public interface HighGoodsPriceReferMapper extends HighGoodsPriceReferMapperExt int deleteByPrimaryKey(Long id); @Insert({ - "insert into high_goods_price_refer (goods_type, goods_id, ", - "new_sale_price, effective_time, ", - "create_time, update_time, ", - "operator_id, operator_name, ", - "`status`, ext_1, ext_2, ", - "ext_3)", - "values (#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ", - "#{newSalePrice,jdbcType=REAL}, #{effectiveTime,jdbcType=TIMESTAMP}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ", - "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "insert into high_goods_price_refer (object_type, object_id, ", + "new_sale_price, promptly_type, ", + "effective_time, remark, ", + "create_time, operator_id, ", + "operator_name, `status`, ", + "ext_1, ext_2, ext_3)", + "values (#{objectType,jdbcType=INTEGER}, #{objectId,jdbcType=BIGINT}, ", + "#{newSalePrice,jdbcType=REAL}, #{promptlyType,jdbcType=BIT}, ", + "#{effectiveTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{operatorId,jdbcType=BIGINT}, ", + "#{operatorName,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighGoodsPriceRefer record); @@ -62,12 +62,13 @@ public interface HighGoodsPriceReferMapper extends HighGoodsPriceReferMapperExt @SelectProvider(type=HighGoodsPriceReferSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.INTEGER), - @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), + @Result(column="object_type", property="objectType", jdbcType=JdbcType.INTEGER), + @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), @Result(column="new_sale_price", property="newSalePrice", jdbcType=JdbcType.REAL), + @Result(column="promptly_type", property="promptlyType", jdbcType=JdbcType.BIT), @Result(column="effective_time", property="effectiveTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @@ -79,19 +80,20 @@ public interface HighGoodsPriceReferMapper extends HighGoodsPriceReferMapperExt @Select({ "select", - "id, goods_type, goods_id, new_sale_price, effective_time, create_time, update_time, ", - "operator_id, operator_name, `status`, ext_1, ext_2, ext_3", + "id, object_type, object_id, new_sale_price, promptly_type, effective_time, remark, ", + "create_time, operator_id, operator_name, `status`, ext_1, ext_2, ext_3", "from high_goods_price_refer", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.INTEGER), - @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), + @Result(column="object_type", property="objectType", jdbcType=JdbcType.INTEGER), + @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), @Result(column="new_sale_price", property="newSalePrice", jdbcType=JdbcType.REAL), + @Result(column="promptly_type", property="promptlyType", jdbcType=JdbcType.BIT), @Result(column="effective_time", property="effectiveTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), - @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="operator_id", property="operatorId", jdbcType=JdbcType.BIGINT), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @@ -112,12 +114,13 @@ public interface HighGoodsPriceReferMapper extends HighGoodsPriceReferMapperExt @Update({ "update high_goods_price_refer", - "set goods_type = #{goodsType,jdbcType=INTEGER},", - "goods_id = #{goodsId,jdbcType=BIGINT},", + "set object_type = #{objectType,jdbcType=INTEGER},", + "object_id = #{objectId,jdbcType=BIGINT},", "new_sale_price = #{newSalePrice,jdbcType=REAL},", + "promptly_type = #{promptlyType,jdbcType=BIT},", "effective_time = #{effectiveTime,jdbcType=TIMESTAMP},", + "remark = #{remark,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", - "update_time = #{updateTime,jdbcType=TIMESTAMP},", "operator_id = #{operatorId,jdbcType=BIGINT},", "operator_name = #{operatorName,jdbcType=VARCHAR},", "`status` = #{status,jdbcType=INTEGER},", diff --git a/hai-service/src/main/java/com/hai/dao/HighGoodsPriceReferSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighGoodsPriceReferSqlProvider.java index a00c804c..81f1513b 100644 --- a/hai-service/src/main/java/com/hai/dao/HighGoodsPriceReferSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighGoodsPriceReferSqlProvider.java @@ -28,28 +28,32 @@ public class HighGoodsPriceReferSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("high_goods_price_refer"); - if (record.getGoodsType() != null) { - sql.VALUES("goods_type", "#{goodsType,jdbcType=INTEGER}"); + if (record.getObjectType() != null) { + sql.VALUES("object_type", "#{objectType,jdbcType=INTEGER}"); } - if (record.getGoodsId() != null) { - sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}"); + if (record.getObjectId() != null) { + sql.VALUES("object_id", "#{objectId,jdbcType=BIGINT}"); } if (record.getNewSalePrice() != null) { sql.VALUES("new_sale_price", "#{newSalePrice,jdbcType=REAL}"); } + if (record.getPromptlyType() != null) { + sql.VALUES("promptly_type", "#{promptlyType,jdbcType=BIT}"); + } + if (record.getEffectiveTime() != null) { sql.VALUES("effective_time", "#{effectiveTime,jdbcType=TIMESTAMP}"); } - if (record.getCreateTime() != null) { - sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + if (record.getRemark() != null) { + sql.VALUES("remark", "#{remark,jdbcType=VARCHAR}"); } - if (record.getUpdateTime() != null) { - sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}"); + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); } if (record.getOperatorId() != null) { @@ -86,12 +90,13 @@ public class HighGoodsPriceReferSqlProvider { } else { sql.SELECT("id"); } - sql.SELECT("goods_type"); - sql.SELECT("goods_id"); + sql.SELECT("object_type"); + sql.SELECT("object_id"); sql.SELECT("new_sale_price"); + sql.SELECT("promptly_type"); sql.SELECT("effective_time"); + sql.SELECT("remark"); sql.SELECT("create_time"); - sql.SELECT("update_time"); sql.SELECT("operator_id"); sql.SELECT("operator_name"); sql.SELECT("`status`"); @@ -119,28 +124,32 @@ public class HighGoodsPriceReferSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } - if (record.getGoodsType() != null) { - sql.SET("goods_type = #{record.goodsType,jdbcType=INTEGER}"); + if (record.getObjectType() != null) { + sql.SET("object_type = #{record.objectType,jdbcType=INTEGER}"); } - if (record.getGoodsId() != null) { - sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); + if (record.getObjectId() != null) { + sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); } if (record.getNewSalePrice() != null) { sql.SET("new_sale_price = #{record.newSalePrice,jdbcType=REAL}"); } + if (record.getPromptlyType() != null) { + sql.SET("promptly_type = #{record.promptlyType,jdbcType=BIT}"); + } + if (record.getEffectiveTime() != null) { sql.SET("effective_time = #{record.effectiveTime,jdbcType=TIMESTAMP}"); } - if (record.getCreateTime() != null) { - sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + if (record.getRemark() != null) { + sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); } - if (record.getUpdateTime() != null) { - sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); } if (record.getOperatorId() != null) { @@ -176,12 +185,13 @@ public class HighGoodsPriceReferSqlProvider { sql.UPDATE("high_goods_price_refer"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); - sql.SET("goods_type = #{record.goodsType,jdbcType=INTEGER}"); - sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); + sql.SET("object_type = #{record.objectType,jdbcType=INTEGER}"); + sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); sql.SET("new_sale_price = #{record.newSalePrice,jdbcType=REAL}"); + sql.SET("promptly_type = #{record.promptlyType,jdbcType=BIT}"); sql.SET("effective_time = #{record.effectiveTime,jdbcType=TIMESTAMP}"); + sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); - sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("operator_id = #{record.operatorId,jdbcType=BIGINT}"); sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); @@ -198,28 +208,32 @@ public class HighGoodsPriceReferSqlProvider { SQL sql = new SQL(); sql.UPDATE("high_goods_price_refer"); - if (record.getGoodsType() != null) { - sql.SET("goods_type = #{goodsType,jdbcType=INTEGER}"); + if (record.getObjectType() != null) { + sql.SET("object_type = #{objectType,jdbcType=INTEGER}"); } - if (record.getGoodsId() != null) { - sql.SET("goods_id = #{goodsId,jdbcType=BIGINT}"); + if (record.getObjectId() != null) { + sql.SET("object_id = #{objectId,jdbcType=BIGINT}"); } if (record.getNewSalePrice() != null) { sql.SET("new_sale_price = #{newSalePrice,jdbcType=REAL}"); } + if (record.getPromptlyType() != null) { + sql.SET("promptly_type = #{promptlyType,jdbcType=BIT}"); + } + if (record.getEffectiveTime() != null) { sql.SET("effective_time = #{effectiveTime,jdbcType=TIMESTAMP}"); } - if (record.getCreateTime() != null) { - sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + if (record.getRemark() != null) { + sql.SET("remark = #{remark,jdbcType=VARCHAR}"); } - if (record.getUpdateTime() != null) { - sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}"); + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); } if (record.getOperatorId() != null) { diff --git a/hai-service/src/main/java/com/hai/dao/HighUserCouponMapper.java b/hai-service/src/main/java/com/hai/dao/HighUserCouponMapper.java new file mode 100644 index 00000000..037641d4 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighUserCouponMapper.java @@ -0,0 +1,105 @@ +package com.hai.dao; + +import com.hai.entity.HighUserCoupon; +import com.hai.entity.HighUserCouponExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface HighUserCouponMapper extends HighUserCouponMapperExt { + @SelectProvider(type=HighUserCouponSqlProvider.class, method="countByExample") + long countByExample(HighUserCouponExample example); + + @DeleteProvider(type=HighUserCouponSqlProvider.class, method="deleteByExample") + int deleteByExample(HighUserCouponExample example); + + @Delete({ + "delete from high_user_coupon", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into high_user_coupon (user_id, coupon_code_id, ", + "ext_1, ext_2, ext_3, ", + "ext_4)", + "values (#{userId,jdbcType=VARCHAR}, #{couponCodeId,jdbcType=VARCHAR}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ", + "#{ext4,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(HighUserCoupon record); + + @InsertProvider(type=HighUserCouponSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(HighUserCoupon record); + + @SelectProvider(type=HighUserCouponSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="user_id", property="userId", jdbcType=JdbcType.VARCHAR), + @Result(column="coupon_code_id", property="couponCodeId", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_4", property="ext4", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(HighUserCouponExample example); + + @Select({ + "select", + "id, user_id, coupon_code_id, ext_1, ext_2, ext_3, ext_4", + "from high_user_coupon", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="user_id", property="userId", jdbcType=JdbcType.VARCHAR), + @Result(column="coupon_code_id", property="couponCodeId", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_4", property="ext4", jdbcType=JdbcType.VARCHAR) + }) + HighUserCoupon selectByPrimaryKey(Long id); + + @UpdateProvider(type=HighUserCouponSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") HighUserCoupon record, @Param("example") HighUserCouponExample example); + + @UpdateProvider(type=HighUserCouponSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") HighUserCoupon record, @Param("example") HighUserCouponExample example); + + @UpdateProvider(type=HighUserCouponSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(HighUserCoupon record); + + @Update({ + "update high_user_coupon", + "set user_id = #{userId,jdbcType=VARCHAR},", + "coupon_code_id = #{couponCodeId,jdbcType=VARCHAR},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR},", + "ext_4 = #{ext4,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(HighUserCoupon record); +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighUserCouponMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighUserCouponMapperExt.java new file mode 100644 index 00000000..7b57eda1 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighUserCouponMapperExt.java @@ -0,0 +1,7 @@ +package com.hai.dao; + +/** + * mapper扩展类 + */ +public interface HighUserCouponMapperExt { +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/dao/HighUserCouponSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighUserCouponSqlProvider.java new file mode 100644 index 00000000..83fae1e9 --- /dev/null +++ b/hai-service/src/main/java/com/hai/dao/HighUserCouponSqlProvider.java @@ -0,0 +1,262 @@ +package com.hai.dao; + +import com.hai.entity.HighUserCoupon; +import com.hai.entity.HighUserCouponExample.Criteria; +import com.hai.entity.HighUserCouponExample.Criterion; +import com.hai.entity.HighUserCouponExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class HighUserCouponSqlProvider { + + public String countByExample(HighUserCouponExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("high_user_coupon"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(HighUserCouponExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("high_user_coupon"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(HighUserCoupon record) { + SQL sql = new SQL(); + sql.INSERT_INTO("high_user_coupon"); + + if (record.getUserId() != null) { + sql.VALUES("user_id", "#{userId,jdbcType=VARCHAR}"); + } + + if (record.getCouponCodeId() != null) { + sql.VALUES("coupon_code_id", "#{couponCodeId,jdbcType=VARCHAR}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + if (record.getExt4() != null) { + sql.VALUES("ext_4", "#{ext4,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(HighUserCouponExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("user_id"); + sql.SELECT("coupon_code_id"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.SELECT("ext_4"); + sql.FROM("high_user_coupon"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + HighUserCoupon record = (HighUserCoupon) parameter.get("record"); + HighUserCouponExample example = (HighUserCouponExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("high_user_coupon"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getUserId() != null) { + sql.SET("user_id = #{record.userId,jdbcType=VARCHAR}"); + } + + if (record.getCouponCodeId() != null) { + sql.SET("coupon_code_id = #{record.couponCodeId,jdbcType=VARCHAR}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + if (record.getExt4() != null) { + sql.SET("ext_4 = #{record.ext4,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("high_user_coupon"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("user_id = #{record.userId,jdbcType=VARCHAR}"); + sql.SET("coupon_code_id = #{record.couponCodeId,jdbcType=VARCHAR}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + sql.SET("ext_4 = #{record.ext4,jdbcType=VARCHAR}"); + + HighUserCouponExample example = (HighUserCouponExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(HighUserCoupon record) { + SQL sql = new SQL(); + sql.UPDATE("high_user_coupon"); + + if (record.getUserId() != null) { + sql.SET("user_id = #{userId,jdbcType=VARCHAR}"); + } + + if (record.getCouponCodeId() != null) { + sql.SET("coupon_code_id = #{couponCodeId,jdbcType=VARCHAR}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + if (record.getExt4() != null) { + sql.SET("ext_4 = #{ext4,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, HighUserCouponExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighChildOrder.java b/hai-service/src/main/java/com/hai/entity/HighChildOrder.java index 58c96b90..5cfd277a 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrder.java @@ -62,6 +62,11 @@ public class HighChildOrder implements Serializable { */ private Float totalPrice; + /** + * 是否是赠品 0:否 1:是 + */ + private Boolean giveawayType; + /** * 子订单状态:1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 */ @@ -160,6 +165,14 @@ public class HighChildOrder implements Serializable { this.totalPrice = totalPrice; } + public Boolean getGiveawayType() { + return giveawayType; + } + + public void setGiveawayType(Boolean giveawayType) { + this.giveawayType = giveawayType; + } + public Integer getChildOrdeStatus() { return childOrdeStatus; } @@ -222,6 +235,7 @@ public class HighChildOrder implements Serializable { && (this.getGoodsPrice() == null ? other.getGoodsPrice() == null : this.getGoodsPrice().equals(other.getGoodsPrice())) && (this.getSaleCount() == null ? other.getSaleCount() == null : this.getSaleCount().equals(other.getSaleCount())) && (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice())) + && (this.getGiveawayType() == null ? other.getGiveawayType() == null : this.getGiveawayType().equals(other.getGiveawayType())) && (this.getChildOrdeStatus() == null ? other.getChildOrdeStatus() == null : this.getChildOrdeStatus().equals(other.getChildOrdeStatus())) && (this.getPraiseStatus() == null ? other.getPraiseStatus() == null : this.getPraiseStatus().equals(other.getPraiseStatus())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) @@ -243,6 +257,7 @@ public class HighChildOrder implements Serializable { result = prime * result + ((getGoodsPrice() == null) ? 0 : getGoodsPrice().hashCode()); result = prime * result + ((getSaleCount() == null) ? 0 : getSaleCount().hashCode()); result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode()); + result = prime * result + ((getGiveawayType() == null) ? 0 : getGiveawayType().hashCode()); result = prime * result + ((getChildOrdeStatus() == null) ? 0 : getChildOrdeStatus().hashCode()); result = prime * result + ((getPraiseStatus() == null) ? 0 : getPraiseStatus().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); @@ -267,6 +282,7 @@ public class HighChildOrder implements Serializable { sb.append(", goodsPrice=").append(goodsPrice); sb.append(", saleCount=").append(saleCount); sb.append(", totalPrice=").append(totalPrice); + sb.append(", giveawayType=").append(giveawayType); sb.append(", childOrdeStatus=").append(childOrdeStatus); sb.append(", praiseStatus=").append(praiseStatus); sb.append(", ext1=").append(ext1); diff --git a/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java b/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java index a57741d1..d84a661c 100644 --- a/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java @@ -754,6 +754,66 @@ public class HighChildOrderExample { return (Criteria) this; } + public Criteria andGiveawayTypeIsNull() { + addCriterion("giveaway_type is null"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeIsNotNull() { + addCriterion("giveaway_type is not null"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeEqualTo(Boolean value) { + addCriterion("giveaway_type =", value, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeNotEqualTo(Boolean value) { + addCriterion("giveaway_type <>", value, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeGreaterThan(Boolean value) { + addCriterion("giveaway_type >", value, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeGreaterThanOrEqualTo(Boolean value) { + addCriterion("giveaway_type >=", value, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeLessThan(Boolean value) { + addCriterion("giveaway_type <", value, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeLessThanOrEqualTo(Boolean value) { + addCriterion("giveaway_type <=", value, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeIn(List values) { + addCriterion("giveaway_type in", values, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeNotIn(List values) { + addCriterion("giveaway_type not in", values, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeBetween(Boolean value1, Boolean value2) { + addCriterion("giveaway_type between", value1, value2, "giveawayType"); + return (Criteria) this; + } + + public Criteria andGiveawayTypeNotBetween(Boolean value1, Boolean value2) { + addCriterion("giveaway_type not between", value1, value2, "giveawayType"); + return (Criteria) this; + } + public Criteria andChildOrdeStatusIsNull() { addCriterion("child_orde_status is null"); return (Criteria) this; diff --git a/hai-service/src/main/java/com/hai/entity/HighCoupon.java b/hai-service/src/main/java/com/hai/entity/HighCoupon.java index 4b6cc9ec..663490aa 100644 --- a/hai-service/src/main/java/com/hai/entity/HighCoupon.java +++ b/hai-service/src/main/java/com/hai/entity/HighCoupon.java @@ -1,7 +1,5 @@ package com.hai.entity; -import com.hai.model.HighCouponModel; - import java.io.Serializable; import java.util.Date; @@ -50,10 +48,35 @@ public class HighCoupon implements Serializable { */ private String couponImg; + /** + * 卡卷轮播图 + */ + private String couponCarouselImg; + + /** + * 卡卷描述 + */ + private String couponDesc; + + /** + * 卡卷类型 1:内部卷 2:外部卷 + */ + private Integer couponType; + + /** + * 限购数量 + */ + private Integer limitNumber; + /** * 销售价格 */ - private Long couponPrice; + private Long salesPrice; + + /** + * 销售数量 + */ + private Integer salesCount; /** * 是否可赠送卡券 @@ -149,12 +172,52 @@ public class HighCoupon implements Serializable { this.couponImg = couponImg; } - public Long getCouponPrice() { - return couponPrice; + public String getCouponCarouselImg() { + return couponCarouselImg; + } + + public void setCouponCarouselImg(String couponCarouselImg) { + this.couponCarouselImg = couponCarouselImg; + } + + public String getCouponDesc() { + return couponDesc; + } + + public void setCouponDesc(String couponDesc) { + this.couponDesc = couponDesc; + } + + public Integer getCouponType() { + return couponType; + } + + public void setCouponType(Integer couponType) { + this.couponType = couponType; + } + + public Integer getLimitNumber() { + return limitNumber; + } + + public void setLimitNumber(Integer limitNumber) { + this.limitNumber = limitNumber; + } + + public Long getSalesPrice() { + return salesPrice; + } + + public void setSalesPrice(Long salesPrice) { + this.salesPrice = salesPrice; + } + + public Integer getSalesCount() { + return salesCount; } - public void setCouponPrice(Long couponPrice) { - this.couponPrice = couponPrice; + public void setSalesCount(Integer salesCount) { + this.salesCount = salesCount; } public Boolean getIsPresent() { @@ -248,7 +311,12 @@ public class HighCoupon implements Serializable { && (this.getCouponName() == null ? other.getCouponName() == null : this.getCouponName().equals(other.getCouponName())) && (this.getCouponValue() == null ? other.getCouponValue() == null : this.getCouponValue().equals(other.getCouponValue())) && (this.getCouponImg() == null ? other.getCouponImg() == null : this.getCouponImg().equals(other.getCouponImg())) - && (this.getCouponPrice() == null ? other.getCouponPrice() == null : this.getCouponPrice().equals(other.getCouponPrice())) + && (this.getCouponCarouselImg() == null ? other.getCouponCarouselImg() == null : this.getCouponCarouselImg().equals(other.getCouponCarouselImg())) + && (this.getCouponDesc() == null ? other.getCouponDesc() == null : this.getCouponDesc().equals(other.getCouponDesc())) + && (this.getCouponType() == null ? other.getCouponType() == null : this.getCouponType().equals(other.getCouponType())) + && (this.getLimitNumber() == null ? other.getLimitNumber() == null : this.getLimitNumber().equals(other.getLimitNumber())) + && (this.getSalesPrice() == null ? other.getSalesPrice() == null : this.getSalesPrice().equals(other.getSalesPrice())) + && (this.getSalesCount() == null ? other.getSalesCount() == null : this.getSalesCount().equals(other.getSalesCount())) && (this.getIsPresent() == null ? other.getIsPresent() == null : this.getIsPresent().equals(other.getIsPresent())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) @@ -271,7 +339,12 @@ public class HighCoupon implements Serializable { result = prime * result + ((getCouponName() == null) ? 0 : getCouponName().hashCode()); result = prime * result + ((getCouponValue() == null) ? 0 : getCouponValue().hashCode()); result = prime * result + ((getCouponImg() == null) ? 0 : getCouponImg().hashCode()); - result = prime * result + ((getCouponPrice() == null) ? 0 : getCouponPrice().hashCode()); + result = prime * result + ((getCouponCarouselImg() == null) ? 0 : getCouponCarouselImg().hashCode()); + result = prime * result + ((getCouponDesc() == null) ? 0 : getCouponDesc().hashCode()); + result = prime * result + ((getCouponType() == null) ? 0 : getCouponType().hashCode()); + result = prime * result + ((getLimitNumber() == null) ? 0 : getLimitNumber().hashCode()); + result = prime * result + ((getSalesPrice() == null) ? 0 : getSalesPrice().hashCode()); + result = prime * result + ((getSalesCount() == null) ? 0 : getSalesCount().hashCode()); result = prime * result + ((getIsPresent() == null) ? 0 : getIsPresent().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); @@ -297,7 +370,12 @@ public class HighCoupon implements Serializable { sb.append(", couponName=").append(couponName); sb.append(", couponValue=").append(couponValue); sb.append(", couponImg=").append(couponImg); - sb.append(", couponPrice=").append(couponPrice); + sb.append(", couponCarouselImg=").append(couponCarouselImg); + sb.append(", couponDesc=").append(couponDesc); + sb.append(", couponType=").append(couponType); + sb.append(", limitNumber=").append(limitNumber); + sb.append(", salesPrice=").append(salesPrice); + sb.append(", salesCount=").append(salesCount); sb.append(", isPresent=").append(isPresent); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); @@ -311,4 +389,4 @@ public class HighCoupon implements Serializable { sb.append("]"); return sb.toString(); } -} +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighCouponExample.java b/hai-service/src/main/java/com/hai/entity/HighCouponExample.java index d34e993b..486fb08f 100644 --- a/hai-service/src/main/java/com/hai/entity/HighCouponExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighCouponExample.java @@ -585,63 +585,383 @@ public class HighCouponExample { return (Criteria) this; } - public Criteria andCouponPriceIsNull() { - addCriterion("coupon_price is null"); + public Criteria andCouponCarouselImgIsNull() { + addCriterion("coupon_carousel_img is null"); return (Criteria) this; } - public Criteria andCouponPriceIsNotNull() { - addCriterion("coupon_price is not null"); + public Criteria andCouponCarouselImgIsNotNull() { + addCriterion("coupon_carousel_img is not null"); return (Criteria) this; } - public Criteria andCouponPriceEqualTo(Long value) { - addCriterion("coupon_price =", value, "couponPrice"); + public Criteria andCouponCarouselImgEqualTo(String value) { + addCriterion("coupon_carousel_img =", value, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceNotEqualTo(Long value) { - addCriterion("coupon_price <>", value, "couponPrice"); + public Criteria andCouponCarouselImgNotEqualTo(String value) { + addCriterion("coupon_carousel_img <>", value, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceGreaterThan(Long value) { - addCriterion("coupon_price >", value, "couponPrice"); + public Criteria andCouponCarouselImgGreaterThan(String value) { + addCriterion("coupon_carousel_img >", value, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceGreaterThanOrEqualTo(Long value) { - addCriterion("coupon_price >=", value, "couponPrice"); + public Criteria andCouponCarouselImgGreaterThanOrEqualTo(String value) { + addCriterion("coupon_carousel_img >=", value, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceLessThan(Long value) { - addCriterion("coupon_price <", value, "couponPrice"); + public Criteria andCouponCarouselImgLessThan(String value) { + addCriterion("coupon_carousel_img <", value, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceLessThanOrEqualTo(Long value) { - addCriterion("coupon_price <=", value, "couponPrice"); + public Criteria andCouponCarouselImgLessThanOrEqualTo(String value) { + addCriterion("coupon_carousel_img <=", value, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceIn(List values) { - addCriterion("coupon_price in", values, "couponPrice"); + public Criteria andCouponCarouselImgLike(String value) { + addCriterion("coupon_carousel_img like", value, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceNotIn(List values) { - addCriterion("coupon_price not in", values, "couponPrice"); + public Criteria andCouponCarouselImgNotLike(String value) { + addCriterion("coupon_carousel_img not like", value, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceBetween(Long value1, Long value2) { - addCriterion("coupon_price between", value1, value2, "couponPrice"); + public Criteria andCouponCarouselImgIn(List values) { + addCriterion("coupon_carousel_img in", values, "couponCarouselImg"); return (Criteria) this; } - public Criteria andCouponPriceNotBetween(Long value1, Long value2) { - addCriterion("coupon_price not between", value1, value2, "couponPrice"); + public Criteria andCouponCarouselImgNotIn(List values) { + addCriterion("coupon_carousel_img not in", values, "couponCarouselImg"); + return (Criteria) this; + } + + public Criteria andCouponCarouselImgBetween(String value1, String value2) { + addCriterion("coupon_carousel_img between", value1, value2, "couponCarouselImg"); + return (Criteria) this; + } + + public Criteria andCouponCarouselImgNotBetween(String value1, String value2) { + addCriterion("coupon_carousel_img not between", value1, value2, "couponCarouselImg"); + return (Criteria) this; + } + + public Criteria andCouponDescIsNull() { + addCriterion("coupon_desc is null"); + return (Criteria) this; + } + + public Criteria andCouponDescIsNotNull() { + addCriterion("coupon_desc is not null"); + return (Criteria) this; + } + + public Criteria andCouponDescEqualTo(String value) { + addCriterion("coupon_desc =", value, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescNotEqualTo(String value) { + addCriterion("coupon_desc <>", value, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescGreaterThan(String value) { + addCriterion("coupon_desc >", value, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescGreaterThanOrEqualTo(String value) { + addCriterion("coupon_desc >=", value, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescLessThan(String value) { + addCriterion("coupon_desc <", value, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescLessThanOrEqualTo(String value) { + addCriterion("coupon_desc <=", value, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescLike(String value) { + addCriterion("coupon_desc like", value, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescNotLike(String value) { + addCriterion("coupon_desc not like", value, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescIn(List values) { + addCriterion("coupon_desc in", values, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescNotIn(List values) { + addCriterion("coupon_desc not in", values, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescBetween(String value1, String value2) { + addCriterion("coupon_desc between", value1, value2, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponDescNotBetween(String value1, String value2) { + addCriterion("coupon_desc not between", value1, value2, "couponDesc"); + return (Criteria) this; + } + + public Criteria andCouponTypeIsNull() { + addCriterion("coupon_type is null"); + return (Criteria) this; + } + + public Criteria andCouponTypeIsNotNull() { + addCriterion("coupon_type is not null"); + return (Criteria) this; + } + + public Criteria andCouponTypeEqualTo(Integer value) { + addCriterion("coupon_type =", value, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeNotEqualTo(Integer value) { + addCriterion("coupon_type <>", value, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeGreaterThan(Integer value) { + addCriterion("coupon_type >", value, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("coupon_type >=", value, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeLessThan(Integer value) { + addCriterion("coupon_type <", value, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeLessThanOrEqualTo(Integer value) { + addCriterion("coupon_type <=", value, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeIn(List values) { + addCriterion("coupon_type in", values, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeNotIn(List values) { + addCriterion("coupon_type not in", values, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeBetween(Integer value1, Integer value2) { + addCriterion("coupon_type between", value1, value2, "couponType"); + return (Criteria) this; + } + + public Criteria andCouponTypeNotBetween(Integer value1, Integer value2) { + addCriterion("coupon_type not between", value1, value2, "couponType"); + return (Criteria) this; + } + + public Criteria andLimitNumberIsNull() { + addCriterion("limit_number is null"); + return (Criteria) this; + } + + public Criteria andLimitNumberIsNotNull() { + addCriterion("limit_number is not null"); + return (Criteria) this; + } + + public Criteria andLimitNumberEqualTo(Integer value) { + addCriterion("limit_number =", value, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberNotEqualTo(Integer value) { + addCriterion("limit_number <>", value, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberGreaterThan(Integer value) { + addCriterion("limit_number >", value, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberGreaterThanOrEqualTo(Integer value) { + addCriterion("limit_number >=", value, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberLessThan(Integer value) { + addCriterion("limit_number <", value, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberLessThanOrEqualTo(Integer value) { + addCriterion("limit_number <=", value, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberIn(List values) { + addCriterion("limit_number in", values, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberNotIn(List values) { + addCriterion("limit_number not in", values, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberBetween(Integer value1, Integer value2) { + addCriterion("limit_number between", value1, value2, "limitNumber"); + return (Criteria) this; + } + + public Criteria andLimitNumberNotBetween(Integer value1, Integer value2) { + addCriterion("limit_number not between", value1, value2, "limitNumber"); + return (Criteria) this; + } + + public Criteria andSalesPriceIsNull() { + addCriterion("sales_price is null"); + return (Criteria) this; + } + + public Criteria andSalesPriceIsNotNull() { + addCriterion("sales_price is not null"); + return (Criteria) this; + } + + public Criteria andSalesPriceEqualTo(Long value) { + addCriterion("sales_price =", value, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceNotEqualTo(Long value) { + addCriterion("sales_price <>", value, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceGreaterThan(Long value) { + addCriterion("sales_price >", value, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceGreaterThanOrEqualTo(Long value) { + addCriterion("sales_price >=", value, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceLessThan(Long value) { + addCriterion("sales_price <", value, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceLessThanOrEqualTo(Long value) { + addCriterion("sales_price <=", value, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceIn(List values) { + addCriterion("sales_price in", values, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceNotIn(List values) { + addCriterion("sales_price not in", values, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceBetween(Long value1, Long value2) { + addCriterion("sales_price between", value1, value2, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesPriceNotBetween(Long value1, Long value2) { + addCriterion("sales_price not between", value1, value2, "salesPrice"); + return (Criteria) this; + } + + public Criteria andSalesCountIsNull() { + addCriterion("sales_count is null"); + return (Criteria) this; + } + + public Criteria andSalesCountIsNotNull() { + addCriterion("sales_count is not null"); + return (Criteria) this; + } + + public Criteria andSalesCountEqualTo(Integer value) { + addCriterion("sales_count =", value, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountNotEqualTo(Integer value) { + addCriterion("sales_count <>", value, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountGreaterThan(Integer value) { + addCriterion("sales_count >", value, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountGreaterThanOrEqualTo(Integer value) { + addCriterion("sales_count >=", value, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountLessThan(Integer value) { + addCriterion("sales_count <", value, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountLessThanOrEqualTo(Integer value) { + addCriterion("sales_count <=", value, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountIn(List values) { + addCriterion("sales_count in", values, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountNotIn(List values) { + addCriterion("sales_count not in", values, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountBetween(Integer value1, Integer value2) { + addCriterion("sales_count between", value1, value2, "salesCount"); + return (Criteria) this; + } + + public Criteria andSalesCountNotBetween(Integer value1, Integer value2) { + addCriterion("sales_count not between", value1, value2, "salesCount"); return (Criteria) this; } diff --git a/hai-service/src/main/java/com/hai/entity/HighGoodsPriceRefer.java b/hai-service/src/main/java/com/hai/entity/HighGoodsPriceRefer.java index fb294dbf..e8cebc31 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGoodsPriceRefer.java +++ b/hai-service/src/main/java/com/hai/entity/HighGoodsPriceRefer.java @@ -21,32 +21,37 @@ public class HighGoodsPriceRefer implements Serializable { /** * 类型 1.卡卷 */ - private Integer goodsType; + private Integer objectType; /** - * 商品id + * 对象id */ - private Long goodsId; + private Long objectId; /** * 新销售价格 */ private Float newSalePrice; + /** + * 及时生效 0:否 1:是 + */ + private Boolean promptlyType; + /** * 新销售价格 生效时间 */ private Date effectiveTime; /** - * 创建时间 + * 备注 */ - private Date createTime; + private String remark; /** - * 更新时间 + * 创建时间 */ - private Date updateTime; + private Date createTime; /** * 操作人id @@ -59,7 +64,7 @@ public class HighGoodsPriceRefer implements Serializable { private String operatorName; /** - * 状态: 0 不可用 1 可用 + * 状态: 0:删除 1:未生效 2:已生效 3:已失效 101.审批中 102.审批驳回 */ private Integer status; @@ -79,20 +84,20 @@ public class HighGoodsPriceRefer implements Serializable { this.id = id; } - public Integer getGoodsType() { - return goodsType; + public Integer getObjectType() { + return objectType; } - public void setGoodsType(Integer goodsType) { - this.goodsType = goodsType; + public void setObjectType(Integer objectType) { + this.objectType = objectType; } - public Long getGoodsId() { - return goodsId; + public Long getObjectId() { + return objectId; } - public void setGoodsId(Long goodsId) { - this.goodsId = goodsId; + public void setObjectId(Long objectId) { + this.objectId = objectId; } public Float getNewSalePrice() { @@ -103,6 +108,14 @@ public class HighGoodsPriceRefer implements Serializable { this.newSalePrice = newSalePrice; } + public Boolean getPromptlyType() { + return promptlyType; + } + + public void setPromptlyType(Boolean promptlyType) { + this.promptlyType = promptlyType; + } + public Date getEffectiveTime() { return effectiveTime; } @@ -111,20 +124,20 @@ public class HighGoodsPriceRefer implements Serializable { this.effectiveTime = effectiveTime; } - public Date getCreateTime() { - return createTime; + public String getRemark() { + return remark; } - public void setCreateTime(Date createTime) { - this.createTime = createTime; + public void setRemark(String remark) { + this.remark = remark; } - public Date getUpdateTime() { - return updateTime; + public Date getCreateTime() { + return createTime; } - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } public Long getOperatorId() { @@ -188,12 +201,13 @@ public class HighGoodsPriceRefer implements Serializable { } HighGoodsPriceRefer other = (HighGoodsPriceRefer) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getGoodsType() == null ? other.getGoodsType() == null : this.getGoodsType().equals(other.getGoodsType())) - && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) + && (this.getObjectType() == null ? other.getObjectType() == null : this.getObjectType().equals(other.getObjectType())) + && (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId())) && (this.getNewSalePrice() == null ? other.getNewSalePrice() == null : this.getNewSalePrice().equals(other.getNewSalePrice())) + && (this.getPromptlyType() == null ? other.getPromptlyType() == null : this.getPromptlyType().equals(other.getPromptlyType())) && (this.getEffectiveTime() == null ? other.getEffectiveTime() == null : this.getEffectiveTime().equals(other.getEffectiveTime())) + && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getOperatorId() == null ? other.getOperatorId() == null : this.getOperatorId().equals(other.getOperatorId())) && (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) @@ -207,12 +221,13 @@ public class HighGoodsPriceRefer implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getGoodsType() == null) ? 0 : getGoodsType().hashCode()); - result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); + result = prime * result + ((getObjectType() == null) ? 0 : getObjectType().hashCode()); + result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode()); result = prime * result + ((getNewSalePrice() == null) ? 0 : getNewSalePrice().hashCode()); + result = prime * result + ((getPromptlyType() == null) ? 0 : getPromptlyType().hashCode()); result = prime * result + ((getEffectiveTime() == null) ? 0 : getEffectiveTime().hashCode()); + result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getOperatorId() == null) ? 0 : getOperatorId().hashCode()); result = prime * result + ((getOperatorName() == null) ? 0 : getOperatorName().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); @@ -229,12 +244,13 @@ public class HighGoodsPriceRefer implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", goodsType=").append(goodsType); - sb.append(", goodsId=").append(goodsId); + sb.append(", objectType=").append(objectType); + sb.append(", objectId=").append(objectId); sb.append(", newSalePrice=").append(newSalePrice); + sb.append(", promptlyType=").append(promptlyType); sb.append(", effectiveTime=").append(effectiveTime); + sb.append(", remark=").append(remark); sb.append(", createTime=").append(createTime); - sb.append(", updateTime=").append(updateTime); sb.append(", operatorId=").append(operatorId); sb.append(", operatorName=").append(operatorName); sb.append(", status=").append(status); diff --git a/hai-service/src/main/java/com/hai/entity/HighGoodsPriceReferExample.java b/hai-service/src/main/java/com/hai/entity/HighGoodsPriceReferExample.java index aac9779e..ba483a9a 100644 --- a/hai-service/src/main/java/com/hai/entity/HighGoodsPriceReferExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighGoodsPriceReferExample.java @@ -185,123 +185,123 @@ public class HighGoodsPriceReferExample { return (Criteria) this; } - public Criteria andGoodsTypeIsNull() { - addCriterion("goods_type is null"); + public Criteria andObjectTypeIsNull() { + addCriterion("object_type is null"); return (Criteria) this; } - public Criteria andGoodsTypeIsNotNull() { - addCriterion("goods_type is not null"); + public Criteria andObjectTypeIsNotNull() { + addCriterion("object_type is not null"); return (Criteria) this; } - public Criteria andGoodsTypeEqualTo(Integer value) { - addCriterion("goods_type =", value, "goodsType"); + public Criteria andObjectTypeEqualTo(Integer value) { + addCriterion("object_type =", value, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeNotEqualTo(Integer value) { - addCriterion("goods_type <>", value, "goodsType"); + public Criteria andObjectTypeNotEqualTo(Integer value) { + addCriterion("object_type <>", value, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeGreaterThan(Integer value) { - addCriterion("goods_type >", value, "goodsType"); + public Criteria andObjectTypeGreaterThan(Integer value) { + addCriterion("object_type >", value, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("goods_type >=", value, "goodsType"); + public Criteria andObjectTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("object_type >=", value, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeLessThan(Integer value) { - addCriterion("goods_type <", value, "goodsType"); + public Criteria andObjectTypeLessThan(Integer value) { + addCriterion("object_type <", value, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeLessThanOrEqualTo(Integer value) { - addCriterion("goods_type <=", value, "goodsType"); + public Criteria andObjectTypeLessThanOrEqualTo(Integer value) { + addCriterion("object_type <=", value, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeIn(List values) { - addCriterion("goods_type in", values, "goodsType"); + public Criteria andObjectTypeIn(List values) { + addCriterion("object_type in", values, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeNotIn(List values) { - addCriterion("goods_type not in", values, "goodsType"); + public Criteria andObjectTypeNotIn(List values) { + addCriterion("object_type not in", values, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeBetween(Integer value1, Integer value2) { - addCriterion("goods_type between", value1, value2, "goodsType"); + public Criteria andObjectTypeBetween(Integer value1, Integer value2) { + addCriterion("object_type between", value1, value2, "objectType"); return (Criteria) this; } - public Criteria andGoodsTypeNotBetween(Integer value1, Integer value2) { - addCriterion("goods_type not between", value1, value2, "goodsType"); + public Criteria andObjectTypeNotBetween(Integer value1, Integer value2) { + addCriterion("object_type not between", value1, value2, "objectType"); return (Criteria) this; } - public Criteria andGoodsIdIsNull() { - addCriterion("goods_id is null"); + public Criteria andObjectIdIsNull() { + addCriterion("object_id is null"); return (Criteria) this; } - public Criteria andGoodsIdIsNotNull() { - addCriterion("goods_id is not null"); + public Criteria andObjectIdIsNotNull() { + addCriterion("object_id is not null"); return (Criteria) this; } - public Criteria andGoodsIdEqualTo(Long value) { - addCriterion("goods_id =", value, "goodsId"); + public Criteria andObjectIdEqualTo(Long value) { + addCriterion("object_id =", value, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdNotEqualTo(Long value) { - addCriterion("goods_id <>", value, "goodsId"); + public Criteria andObjectIdNotEqualTo(Long value) { + addCriterion("object_id <>", value, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdGreaterThan(Long value) { - addCriterion("goods_id >", value, "goodsId"); + public Criteria andObjectIdGreaterThan(Long value) { + addCriterion("object_id >", value, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdGreaterThanOrEqualTo(Long value) { - addCriterion("goods_id >=", value, "goodsId"); + public Criteria andObjectIdGreaterThanOrEqualTo(Long value) { + addCriterion("object_id >=", value, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdLessThan(Long value) { - addCriterion("goods_id <", value, "goodsId"); + public Criteria andObjectIdLessThan(Long value) { + addCriterion("object_id <", value, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdLessThanOrEqualTo(Long value) { - addCriterion("goods_id <=", value, "goodsId"); + public Criteria andObjectIdLessThanOrEqualTo(Long value) { + addCriterion("object_id <=", value, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdIn(List values) { - addCriterion("goods_id in", values, "goodsId"); + public Criteria andObjectIdIn(List values) { + addCriterion("object_id in", values, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdNotIn(List values) { - addCriterion("goods_id not in", values, "goodsId"); + public Criteria andObjectIdNotIn(List values) { + addCriterion("object_id not in", values, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdBetween(Long value1, Long value2) { - addCriterion("goods_id between", value1, value2, "goodsId"); + public Criteria andObjectIdBetween(Long value1, Long value2) { + addCriterion("object_id between", value1, value2, "objectId"); return (Criteria) this; } - public Criteria andGoodsIdNotBetween(Long value1, Long value2) { - addCriterion("goods_id not between", value1, value2, "goodsId"); + public Criteria andObjectIdNotBetween(Long value1, Long value2) { + addCriterion("object_id not between", value1, value2, "objectId"); return (Criteria) this; } @@ -365,6 +365,66 @@ public class HighGoodsPriceReferExample { return (Criteria) this; } + public Criteria andPromptlyTypeIsNull() { + addCriterion("promptly_type is null"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeIsNotNull() { + addCriterion("promptly_type is not null"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeEqualTo(Boolean value) { + addCriterion("promptly_type =", value, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeNotEqualTo(Boolean value) { + addCriterion("promptly_type <>", value, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeGreaterThan(Boolean value) { + addCriterion("promptly_type >", value, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeGreaterThanOrEqualTo(Boolean value) { + addCriterion("promptly_type >=", value, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeLessThan(Boolean value) { + addCriterion("promptly_type <", value, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeLessThanOrEqualTo(Boolean value) { + addCriterion("promptly_type <=", value, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeIn(List values) { + addCriterion("promptly_type in", values, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeNotIn(List values) { + addCriterion("promptly_type not in", values, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeBetween(Boolean value1, Boolean value2) { + addCriterion("promptly_type between", value1, value2, "promptlyType"); + return (Criteria) this; + } + + public Criteria andPromptlyTypeNotBetween(Boolean value1, Boolean value2) { + addCriterion("promptly_type not between", value1, value2, "promptlyType"); + return (Criteria) this; + } + public Criteria andEffectiveTimeIsNull() { addCriterion("effective_time is null"); return (Criteria) this; @@ -425,123 +485,133 @@ public class HighGoodsPriceReferExample { return (Criteria) this; } - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); return (Criteria) this; } - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); return (Criteria) this; } - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); return (Criteria) this; } - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); return (Criteria) this; } - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); return (Criteria) this; } - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); return (Criteria) this; } - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); return (Criteria) this; } - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); return (Criteria) this; } - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); return (Criteria) this; } - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); return (Criteria) this; } - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); return (Criteria) this; } - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); return (Criteria) this; } - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); return (Criteria) this; } - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); return (Criteria) this; } - public Criteria andUpdateTimeEqualTo(Date value) { - addCriterion("update_time =", value, "updateTime"); + public Criteria andCreateTimeIsNull() { + addCriterion("create_time is null"); return (Criteria) this; } - public Criteria andUpdateTimeNotEqualTo(Date value) { - addCriterion("update_time <>", value, "updateTime"); + public Criteria andCreateTimeIsNotNull() { + addCriterion("create_time is not null"); return (Criteria) this; } - public Criteria andUpdateTimeGreaterThan(Date value) { - addCriterion("update_time >", value, "updateTime"); + public Criteria andCreateTimeEqualTo(Date value) { + addCriterion("create_time =", value, "createTime"); return (Criteria) this; } - public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("update_time >=", value, "updateTime"); + public Criteria andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); return (Criteria) this; } - public Criteria andUpdateTimeLessThan(Date value) { - addCriterion("update_time <", value, "updateTime"); + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); return (Criteria) this; } - public Criteria andUpdateTimeLessThanOrEqualTo(Date value) { - addCriterion("update_time <=", value, "updateTime"); + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); return (Criteria) this; } - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); + public Criteria andCreateTimeIn(List values) { + addCriterion("create_time in", values, "createTime"); return (Criteria) this; } - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); + public Criteria andCreateTimeNotIn(List values) { + addCriterion("create_time not in", values, "createTime"); return (Criteria) this; } - public Criteria andUpdateTimeBetween(Date value1, Date value2) { - addCriterion("update_time between", value1, value2, "updateTime"); + public Criteria andCreateTimeBetween(Date value1, Date value2) { + addCriterion("create_time between", value1, value2, "createTime"); return (Criteria) this; } - public Criteria andUpdateTimeNotBetween(Date value1, Date value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); + public Criteria andCreateTimeNotBetween(Date value1, Date value2) { + addCriterion("create_time not between", value1, value2, "createTime"); return (Criteria) this; } diff --git a/hai-service/src/main/java/com/hai/entity/HighUserCoupon.java b/hai-service/src/main/java/com/hai/entity/HighUserCoupon.java new file mode 100644 index 00000000..5fff3555 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighUserCoupon.java @@ -0,0 +1,148 @@ +package com.hai.entity; + +import java.io.Serializable; + +/** + * high_user_coupon + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class HighUserCoupon implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 用户id + */ + private String userId; + + /** + * 昵称 + */ + private String couponCodeId; + + private String ext1; + + private String ext2; + + private String ext3; + + private String ext4; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getCouponCodeId() { + return couponCodeId; + } + + public void setCouponCodeId(String couponCodeId) { + this.couponCodeId = couponCodeId; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + public String getExt4() { + return ext4; + } + + public void setExt4(String ext4) { + this.ext4 = ext4; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + HighUserCoupon other = (HighUserCoupon) 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.getCouponCodeId() == null ? other.getCouponCodeId() == null : this.getCouponCodeId().equals(other.getCouponCodeId())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())) + && (this.getExt4() == null ? other.getExt4() == null : this.getExt4().equals(other.getExt4())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); + result = prime * result + ((getCouponCodeId() == null) ? 0 : getCouponCodeId().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + result = prime * result + ((getExt4() == null) ? 0 : getExt4().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", userId=").append(userId); + sb.append(", couponCodeId=").append(couponCodeId); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", ext4=").append(ext4); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/entity/HighUserCouponExample.java b/hai-service/src/main/java/com/hai/entity/HighUserCouponExample.java new file mode 100644 index 00000000..0ababa73 --- /dev/null +++ b/hai-service/src/main/java/com/hai/entity/HighUserCouponExample.java @@ -0,0 +1,702 @@ +package com.hai.entity; + +import java.util.ArrayList; +import java.util.List; + +public class HighUserCouponExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public HighUserCouponExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andUserIdIsNull() { + addCriterion("user_id is null"); + return (Criteria) this; + } + + public Criteria andUserIdIsNotNull() { + addCriterion("user_id is not null"); + return (Criteria) this; + } + + public Criteria andUserIdEqualTo(String value) { + addCriterion("user_id =", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotEqualTo(String value) { + addCriterion("user_id <>", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThan(String value) { + addCriterion("user_id >", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdGreaterThanOrEqualTo(String value) { + addCriterion("user_id >=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThan(String value) { + addCriterion("user_id <", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLessThanOrEqualTo(String value) { + addCriterion("user_id <=", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdLike(String value) { + addCriterion("user_id like", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotLike(String value) { + addCriterion("user_id not like", value, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdIn(List values) { + addCriterion("user_id in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotIn(List values) { + addCriterion("user_id not in", values, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdBetween(String value1, String value2) { + addCriterion("user_id between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andUserIdNotBetween(String value1, String value2) { + addCriterion("user_id not between", value1, value2, "userId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdIsNull() { + addCriterion("coupon_code_id is null"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdIsNotNull() { + addCriterion("coupon_code_id is not null"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdEqualTo(String value) { + addCriterion("coupon_code_id =", value, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdNotEqualTo(String value) { + addCriterion("coupon_code_id <>", value, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdGreaterThan(String value) { + addCriterion("coupon_code_id >", value, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdGreaterThanOrEqualTo(String value) { + addCriterion("coupon_code_id >=", value, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdLessThan(String value) { + addCriterion("coupon_code_id <", value, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdLessThanOrEqualTo(String value) { + addCriterion("coupon_code_id <=", value, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdLike(String value) { + addCriterion("coupon_code_id like", value, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdNotLike(String value) { + addCriterion("coupon_code_id not like", value, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdIn(List values) { + addCriterion("coupon_code_id in", values, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdNotIn(List values) { + addCriterion("coupon_code_id not in", values, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdBetween(String value1, String value2) { + addCriterion("coupon_code_id between", value1, value2, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andCouponCodeIdNotBetween(String value1, String value2) { + addCriterion("coupon_code_id not between", value1, value2, "couponCodeId"); + return (Criteria) this; + } + + public Criteria andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt4IsNull() { + addCriterion("ext_4 is null"); + return (Criteria) this; + } + + public Criteria andExt4IsNotNull() { + addCriterion("ext_4 is not null"); + return (Criteria) this; + } + + public Criteria andExt4EqualTo(String value) { + addCriterion("ext_4 =", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4NotEqualTo(String value) { + addCriterion("ext_4 <>", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4GreaterThan(String value) { + addCriterion("ext_4 >", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4GreaterThanOrEqualTo(String value) { + addCriterion("ext_4 >=", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4LessThan(String value) { + addCriterion("ext_4 <", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4LessThanOrEqualTo(String value) { + addCriterion("ext_4 <=", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4Like(String value) { + addCriterion("ext_4 like", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4NotLike(String value) { + addCriterion("ext_4 not like", value, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4In(List values) { + addCriterion("ext_4 in", values, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4NotIn(List values) { + addCriterion("ext_4 not in", values, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4Between(String value1, String value2) { + addCriterion("ext_4 between", value1, value2, "ext4"); + return (Criteria) this; + } + + public Criteria andExt4NotBetween(String value1, String value2) { + addCriterion("ext_4 not between", value1, value2, "ext4"); + return (Criteria) this; + } + } + + /** + */ + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java index d5cde4d8..6b7712a2 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighCouponServiceImpl.java @@ -28,6 +28,8 @@ public class HighCouponServiceImpl implements HighCouponService { @Resource private HighCouponHandselMapper highCouponHandselMapper; + + @Override @Transactional public void insertCoupon(HighCouponModel highCouponModel) {