diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java index 49b64670..eef400f6 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapper.java @@ -55,10 +55,11 @@ public interface HighOrderMapper extends HighOrderMapperExt { "refund_price, refund_content, ", "refusal_refund_content, Identification_code, ", "profit_sharing_status, profit_sharing_ratio, ", - "account_merchant_num, print_status, ", - "print_num, region_id, ", - "company_id, merch_id, ", - "ext_1, ext_2, ext_3)", + "account_merchant_num, product_type, ", + "print_status, print_num, ", + "region_id, company_id, ", + "merch_id, ext_1, ext_2, ", + "ext_3)", "values (#{orderNo,jdbcType=VARCHAR}, #{memDiscountId,jdbcType=BIGINT}, ", "#{memDiscountName,jdbcType=VARCHAR}, #{memId,jdbcType=BIGINT}, ", "#{memName,jdbcType=VARCHAR}, #{memPhone,jdbcType=VARCHAR}, ", @@ -75,10 +76,11 @@ public interface HighOrderMapper extends HighOrderMapperExt { "#{refundPrice,jdbcType=DECIMAL}, #{refundContent,jdbcType=VARCHAR}, ", "#{refusalRefundContent,jdbcType=VARCHAR}, #{identificationCode,jdbcType=BIGINT}, ", "#{profitSharingStatus,jdbcType=BIT}, #{profitSharingRatio,jdbcType=DECIMAL}, ", - "#{accountMerchantNum,jdbcType=VARCHAR}, #{printStatus,jdbcType=BIT}, ", - "#{printNum,jdbcType=INTEGER}, #{regionId,jdbcType=VARCHAR}, ", - "#{companyId,jdbcType=BIGINT}, #{merchId,jdbcType=VARCHAR}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{accountMerchantNum,jdbcType=VARCHAR}, #{productType,jdbcType=INTEGER}, ", + "#{printStatus,jdbcType=BIT}, #{printNum,jdbcType=INTEGER}, ", + "#{regionId,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", + "#{merchId,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", + "#{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighOrder record); @@ -123,6 +125,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT), @Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL), @Result(column="account_merchant_num", property="accountMerchantNum", jdbcType=JdbcType.VARCHAR), + @Result(column="product_type", property="productType", jdbcType=JdbcType.INTEGER), @Result(column="print_status", property="printStatus", jdbcType=JdbcType.BIT), @Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER), @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), @@ -141,8 +144,8 @@ public interface HighOrderMapper extends HighOrderMapperExt { "pay_real_price, pay_serial_no, deduction_price, order_status, total_price, create_time, ", "pay_time, cancel_time, cancel_remarks, finish_time, remarks, refund_no, refund_time, ", "refund_price, refund_content, refusal_refund_content, Identification_code, profit_sharing_status, ", - "profit_sharing_ratio, account_merchant_num, print_status, print_num, region_id, ", - "company_id, merch_id, ext_1, ext_2, ext_3", + "profit_sharing_ratio, account_merchant_num, product_type, print_status, print_num, ", + "region_id, company_id, merch_id, ext_1, ext_2, ext_3", "from high_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -181,6 +184,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { @Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT), @Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL), @Result(column="account_merchant_num", property="accountMerchantNum", jdbcType=JdbcType.VARCHAR), + @Result(column="product_type", property="productType", jdbcType=JdbcType.INTEGER), @Result(column="print_status", property="printStatus", jdbcType=JdbcType.BIT), @Result(column="print_num", property="printNum", jdbcType=JdbcType.INTEGER), @Result(column="region_id", property="regionId", jdbcType=JdbcType.VARCHAR), @@ -236,6 +240,7 @@ public interface HighOrderMapper extends HighOrderMapperExt { "profit_sharing_status = #{profitSharingStatus,jdbcType=BIT},", "profit_sharing_ratio = #{profitSharingRatio,jdbcType=DECIMAL},", "account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR},", + "product_type = #{productType,jdbcType=INTEGER},", "print_status = #{printStatus,jdbcType=BIT},", "print_num = #{printNum,jdbcType=INTEGER},", "region_id = #{regionId,jdbcType=VARCHAR},", diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java index 8faf0a9a..888875df 100644 --- a/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighOrderSqlProvider.java @@ -160,6 +160,10 @@ public class HighOrderSqlProvider { sql.VALUES("account_merchant_num", "#{accountMerchantNum,jdbcType=VARCHAR}"); } + if (record.getProductType() != null) { + sql.VALUES("product_type", "#{productType,jdbcType=INTEGER}"); + } + if (record.getPrintStatus() != null) { sql.VALUES("print_status", "#{printStatus,jdbcType=BIT}"); } @@ -235,6 +239,7 @@ public class HighOrderSqlProvider { sql.SELECT("profit_sharing_status"); sql.SELECT("profit_sharing_ratio"); sql.SELECT("account_merchant_num"); + sql.SELECT("product_type"); sql.SELECT("print_status"); sql.SELECT("print_num"); sql.SELECT("region_id"); @@ -396,6 +401,10 @@ public class HighOrderSqlProvider { sql.SET("account_merchant_num = #{record.accountMerchantNum,jdbcType=VARCHAR}"); } + if (record.getProductType() != null) { + sql.SET("product_type = #{record.productType,jdbcType=INTEGER}"); + } + if (record.getPrintStatus() != null) { sql.SET("print_status = #{record.printStatus,jdbcType=BIT}"); } @@ -470,6 +479,7 @@ public class HighOrderSqlProvider { sql.SET("profit_sharing_status = #{record.profitSharingStatus,jdbcType=BIT}"); sql.SET("profit_sharing_ratio = #{record.profitSharingRatio,jdbcType=DECIMAL}"); sql.SET("account_merchant_num = #{record.accountMerchantNum,jdbcType=VARCHAR}"); + sql.SET("product_type = #{record.productType,jdbcType=INTEGER}"); sql.SET("print_status = #{record.printStatus,jdbcType=BIT}"); sql.SET("print_num = #{record.printNum,jdbcType=INTEGER}"); sql.SET("region_id = #{record.regionId,jdbcType=VARCHAR}"); @@ -620,6 +630,10 @@ public class HighOrderSqlProvider { sql.SET("account_merchant_num = #{accountMerchantNum,jdbcType=VARCHAR}"); } + if (record.getProductType() != null) { + sql.SET("product_type = #{productType,jdbcType=INTEGER}"); + } + if (record.getPrintStatus() != null) { sql.SET("print_status = #{printStatus,jdbcType=BIT}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighOrder.java b/hai-service/src/main/java/com/hai/entity/HighOrder.java index 2f7e5a8e..13a47d8d 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrder.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrder.java @@ -184,6 +184,11 @@ public class HighOrder implements Serializable { */ private String accountMerchantNum; + /** + * 产品类型 1:星巴克 2:肯德基 3:会员充值 + */ + private Integer productType; + /** * 打印状态 */ @@ -486,6 +491,14 @@ public class HighOrder implements Serializable { this.accountMerchantNum = accountMerchantNum; } + public Integer getProductType() { + return productType; + } + + public void setProductType(Integer productType) { + this.productType = productType; + } + public Boolean getPrintStatus() { return printStatus; } @@ -596,6 +609,7 @@ public class HighOrder implements Serializable { && (this.getProfitSharingStatus() == null ? other.getProfitSharingStatus() == null : this.getProfitSharingStatus().equals(other.getProfitSharingStatus())) && (this.getProfitSharingRatio() == null ? other.getProfitSharingRatio() == null : this.getProfitSharingRatio().equals(other.getProfitSharingRatio())) && (this.getAccountMerchantNum() == null ? other.getAccountMerchantNum() == null : this.getAccountMerchantNum().equals(other.getAccountMerchantNum())) + && (this.getProductType() == null ? other.getProductType() == null : this.getProductType().equals(other.getProductType())) && (this.getPrintStatus() == null ? other.getPrintStatus() == null : this.getPrintStatus().equals(other.getPrintStatus())) && (this.getPrintNum() == null ? other.getPrintNum() == null : this.getPrintNum().equals(other.getPrintNum())) && (this.getRegionId() == null ? other.getRegionId() == null : this.getRegionId().equals(other.getRegionId())) @@ -644,6 +658,7 @@ public class HighOrder implements Serializable { result = prime * result + ((getProfitSharingStatus() == null) ? 0 : getProfitSharingStatus().hashCode()); result = prime * result + ((getProfitSharingRatio() == null) ? 0 : getProfitSharingRatio().hashCode()); result = prime * result + ((getAccountMerchantNum() == null) ? 0 : getAccountMerchantNum().hashCode()); + result = prime * result + ((getProductType() == null) ? 0 : getProductType().hashCode()); result = prime * result + ((getPrintStatus() == null) ? 0 : getPrintStatus().hashCode()); result = prime * result + ((getPrintNum() == null) ? 0 : getPrintNum().hashCode()); result = prime * result + ((getRegionId() == null) ? 0 : getRegionId().hashCode()); @@ -695,6 +710,7 @@ public class HighOrder implements Serializable { sb.append(", profitSharingStatus=").append(profitSharingStatus); sb.append(", profitSharingRatio=").append(profitSharingRatio); sb.append(", accountMerchantNum=").append(accountMerchantNum); + sb.append(", productType=").append(productType); sb.append(", printStatus=").append(printStatus); sb.append(", printNum=").append(printNum); sb.append(", regionId=").append(regionId); diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java index bd775cb6..0007c5b6 100644 --- a/hai-service/src/main/java/com/hai/entity/HighOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighOrderExample.java @@ -2286,6 +2286,66 @@ public class HighOrderExample { return (Criteria) this; } + public Criteria andProductTypeIsNull() { + addCriterion("product_type is null"); + return (Criteria) this; + } + + public Criteria andProductTypeIsNotNull() { + addCriterion("product_type is not null"); + return (Criteria) this; + } + + public Criteria andProductTypeEqualTo(Integer value) { + addCriterion("product_type =", value, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeNotEqualTo(Integer value) { + addCriterion("product_type <>", value, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeGreaterThan(Integer value) { + addCriterion("product_type >", value, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("product_type >=", value, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeLessThan(Integer value) { + addCriterion("product_type <", value, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeLessThanOrEqualTo(Integer value) { + addCriterion("product_type <=", value, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeIn(List values) { + addCriterion("product_type in", values, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeNotIn(List values) { + addCriterion("product_type not in", values, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeBetween(Integer value1, Integer value2) { + addCriterion("product_type between", value1, value2, "productType"); + return (Criteria) this; + } + + public Criteria andProductTypeNotBetween(Integer value1, Integer value2) { + addCriterion("product_type not between", value1, value2, "productType"); + return (Criteria) this; + } + public Criteria andPrintStatusIsNull() { addCriterion("print_status is null"); return (Criteria) this;