From 3cace5aa50228e64b00d81996030aaedcc25cd6b Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Mon, 30 May 2022 14:57:33 +0800 Subject: [PATCH] 1 --- .../com/hai/dao/OutRechargeOrderMapper.java | 8 ++++---- .../hai/dao/OutRechargeOrderSqlProvider.java | 8 ++++---- .../java/com/hai/entity/OutRechargeOrder.java | 6 +++--- .../hai/entity/OutRechargeOrderExample.java | 20 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java index db55d356..ffdbb91a 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -63,7 +63,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "#{userName,jdbcType=VARCHAR}, #{userPhone,jdbcType=VARCHAR}, ", "#{goodsId,jdbcType=BIGINT}, #{rechargeContent,jdbcType=VARCHAR}, ", "#{payType,jdbcType=INTEGER}, #{laborUnionCard,jdbcType=VARCHAR}, ", - "#{integralNum,jdbcType=BIGINT}, #{discountDeductionPrice,jdbcType=DECIMAL}, ", + "#{integralNum,jdbcType=DECIMAL}, #{discountDeductionPrice,jdbcType=DECIMAL}, ", "#{integralDeductionPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", "#{paySerialNo,jdbcType=VARCHAR}, #{createTimed,jdbcType=TIMESTAMP}, ", "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", @@ -98,7 +98,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Result(column="recharge_content", property="rechargeContent", jdbcType=JdbcType.VARCHAR), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="labor_union_card", property="laborUnionCard", jdbcType=JdbcType.VARCHAR), - @Result(column="integral_num", property="integralNum", jdbcType=JdbcType.BIGINT), + @Result(column="integral_num", property="integralNum", jdbcType=JdbcType.DECIMAL), @Result(column="discount_deduction_price", property="discountDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="integral_deduction_price", property="integralDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @@ -149,7 +149,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Result(column="recharge_content", property="rechargeContent", jdbcType=JdbcType.VARCHAR), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @Result(column="labor_union_card", property="laborUnionCard", jdbcType=JdbcType.VARCHAR), - @Result(column="integral_num", property="integralNum", jdbcType=JdbcType.BIGINT), + @Result(column="integral_num", property="integralNum", jdbcType=JdbcType.DECIMAL), @Result(column="discount_deduction_price", property="discountDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="integral_deduction_price", property="integralDeductionPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @@ -198,7 +198,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "recharge_content = #{rechargeContent,jdbcType=VARCHAR},", "pay_type = #{payType,jdbcType=INTEGER},", "labor_union_card = #{laborUnionCard,jdbcType=VARCHAR},", - "integral_num = #{integralNum,jdbcType=BIGINT},", + "integral_num = #{integralNum,jdbcType=DECIMAL},", "discount_deduction_price = #{discountDeductionPrice,jdbcType=DECIMAL},", "integral_deduction_price = #{integralDeductionPrice,jdbcType=DECIMAL},", "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java index 5c46f614..ee704500 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -85,7 +85,7 @@ public class OutRechargeOrderSqlProvider { } if (record.getIntegralNum() != null) { - sql.VALUES("integral_num", "#{integralNum,jdbcType=BIGINT}"); + sql.VALUES("integral_num", "#{integralNum,jdbcType=DECIMAL}"); } if (record.getDiscountDeductionPrice() != null) { @@ -291,7 +291,7 @@ public class OutRechargeOrderSqlProvider { } if (record.getIntegralNum() != null) { - sql.SET("integral_num = #{record.integralNum,jdbcType=BIGINT}"); + sql.SET("integral_num = #{record.integralNum,jdbcType=DECIMAL}"); } if (record.getDiscountDeductionPrice() != null) { @@ -397,7 +397,7 @@ public class OutRechargeOrderSqlProvider { sql.SET("recharge_content = #{record.rechargeContent,jdbcType=VARCHAR}"); sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); sql.SET("labor_union_card = #{record.laborUnionCard,jdbcType=VARCHAR}"); - sql.SET("integral_num = #{record.integralNum,jdbcType=BIGINT}"); + sql.SET("integral_num = #{record.integralNum,jdbcType=DECIMAL}"); sql.SET("discount_deduction_price = #{record.discountDeductionPrice,jdbcType=DECIMAL}"); sql.SET("integral_deduction_price = #{record.integralDeductionPrice,jdbcType=DECIMAL}"); sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); @@ -485,7 +485,7 @@ public class OutRechargeOrderSqlProvider { } if (record.getIntegralNum() != null) { - sql.SET("integral_num = #{integralNum,jdbcType=BIGINT}"); + sql.SET("integral_num = #{integralNum,jdbcType=DECIMAL}"); } if (record.getDiscountDeductionPrice() != null) { diff --git a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java index 454ed4bf..5a86b475 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java @@ -92,7 +92,7 @@ public class OutRechargeOrder implements Serializable { /** * 积分数量 */ - private Long integralNum; + private BigDecimal integralNum; /** * 优惠券抵扣金额 @@ -307,11 +307,11 @@ public class OutRechargeOrder implements Serializable { this.laborUnionCard = laborUnionCard; } - public Long getIntegralNum() { + public BigDecimal getIntegralNum() { return integralNum; } - public void setIntegralNum(Long integralNum) { + public void setIntegralNum(BigDecimal integralNum) { this.integralNum = integralNum; } diff --git a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java index 3bf307d0..75aba6c0 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java @@ -1106,52 +1106,52 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andIntegralNumEqualTo(Long value) { + public Criteria andIntegralNumEqualTo(BigDecimal value) { addCriterion("integral_num =", value, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumNotEqualTo(Long value) { + public Criteria andIntegralNumNotEqualTo(BigDecimal value) { addCriterion("integral_num <>", value, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumGreaterThan(Long value) { + public Criteria andIntegralNumGreaterThan(BigDecimal value) { addCriterion("integral_num >", value, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumGreaterThanOrEqualTo(Long value) { + public Criteria andIntegralNumGreaterThanOrEqualTo(BigDecimal value) { addCriterion("integral_num >=", value, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumLessThan(Long value) { + public Criteria andIntegralNumLessThan(BigDecimal value) { addCriterion("integral_num <", value, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumLessThanOrEqualTo(Long value) { + public Criteria andIntegralNumLessThanOrEqualTo(BigDecimal value) { addCriterion("integral_num <=", value, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumIn(List values) { + public Criteria andIntegralNumIn(List values) { addCriterion("integral_num in", values, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumNotIn(List values) { + public Criteria andIntegralNumNotIn(List values) { addCriterion("integral_num not in", values, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumBetween(Long value1, Long value2) { + public Criteria andIntegralNumBetween(BigDecimal value1, BigDecimal value2) { addCriterion("integral_num between", value1, value2, "integralNum"); return (Criteria) this; } - public Criteria andIntegralNumNotBetween(Long value1, Long value2) { + public Criteria andIntegralNumNotBetween(BigDecimal value1, BigDecimal value2) { addCriterion("integral_num not between", value1, value2, "integralNum"); return (Criteria) this; }