From 639fef68a31e286b898026ec7aca38944221afef Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Wed, 1 Jun 2022 16:06:09 +0800 Subject: [PATCH] 1 --- .../com/hai/dao/OutRechargeOrderMapper.java | 47 ++++++++------- .../hai/dao/OutRechargeOrderSqlProvider.java | 14 +++++ .../java/com/hai/entity/OutRechargeOrder.java | 16 +++++ .../hai/entity/OutRechargeOrderExample.java | 60 +++++++++++++++++++ 4 files changed, 115 insertions(+), 22 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 313e23bd..06fe4433 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -48,15 +48,15 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "recharge_content, pay_type, ", "labor_union_card, integral_num, ", "discount_deduction_price, integral_deduction_price, ", - "pay_real_price, pay_serial_no, ", - "create_timed, pay_time, ", - "cancel_time, finish_time, ", - "out_refund_no, order_price, ", - "refund_time, tp_refund_order_no, ", - "refund_id, refund_fee, ", - "company_id, pay_status, ", - "recharge_status, ext_1, ", - "ext_2, ext_3)", + "pay_price, pay_real_price, ", + "pay_serial_no, create_timed, ", + "pay_time, cancel_time, ", + "finish_time, out_refund_no, ", + "order_price, refund_time, ", + "tp_refund_order_no, refund_id, ", + "refund_fee, company_id, ", + "pay_status, recharge_status, ", + "ext_1, ext_2, ext_3)", "values (#{rechargePrice,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, ", "#{operatorName,jdbcType=VARCHAR}, #{operatorType,jdbcType=INTEGER}, ", "#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ", @@ -66,15 +66,15 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "#{rechargeContent,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", "#{laborUnionCard,jdbcType=VARCHAR}, #{integralNum,jdbcType=DECIMAL}, ", "#{discountDeductionPrice,jdbcType=DECIMAL}, #{integralDeductionPrice,jdbcType=DECIMAL}, ", - "#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ", - "#{createTimed,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", - "#{cancelTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", - "#{outRefundNo,jdbcType=VARCHAR}, #{orderPrice,jdbcType=DECIMAL}, ", - "#{refundTime,jdbcType=TIMESTAMP}, #{tpRefundOrderNo,jdbcType=VARCHAR}, ", - "#{refundId,jdbcType=VARCHAR}, #{refundFee,jdbcType=DECIMAL}, ", - "#{companyId,jdbcType=BIGINT}, #{payStatus,jdbcType=INTEGER}, ", - "#{rechargeStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{payPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", + "#{paySerialNo,jdbcType=VARCHAR}, #{createTimed,jdbcType=TIMESTAMP}, ", + "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", + "#{finishTime,jdbcType=TIMESTAMP}, #{outRefundNo,jdbcType=VARCHAR}, ", + "#{orderPrice,jdbcType=DECIMAL}, #{refundTime,jdbcType=TIMESTAMP}, ", + "#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundId,jdbcType=VARCHAR}, ", + "#{refundFee,jdbcType=DECIMAL}, #{companyId,jdbcType=BIGINT}, ", + "#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(OutRechargeOrder record); @@ -104,6 +104,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @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_price", property="payPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @Result(column="create_timed", property="createTimed", jdbcType=JdbcType.TIMESTAMP), @@ -130,10 +131,10 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "id, recharge_price, `type`, operator_name, operator_type, order_no, recharge_type, ", "mem_discount_id, mem_discount_name, user_id, user_name, user_phone, goods_id, ", "recharge_content, pay_type, labor_union_card, integral_num, discount_deduction_price, ", - "integral_deduction_price, pay_real_price, pay_serial_no, create_timed, pay_time, ", - "cancel_time, finish_time, out_refund_no, order_price, refund_time, tp_refund_order_no, ", - "refund_id, refund_fee, company_id, pay_status, recharge_status, ext_1, ext_2, ", - "ext_3", + "integral_deduction_price, pay_price, pay_real_price, pay_serial_no, create_timed, ", + "pay_time, cancel_time, finish_time, out_refund_no, order_price, refund_time, ", + "tp_refund_order_no, refund_id, refund_fee, company_id, pay_status, recharge_status, ", + "ext_1, ext_2, ext_3", "from out_recharge_order", "where id = #{id,jdbcType=BIGINT}" }) @@ -157,6 +158,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @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_price", property="payPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @Result(column="create_timed", property="createTimed", jdbcType=JdbcType.TIMESTAMP), @@ -207,6 +209,7 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { "integral_num = #{integralNum,jdbcType=DECIMAL},", "discount_deduction_price = #{discountDeductionPrice,jdbcType=DECIMAL},", "integral_deduction_price = #{integralDeductionPrice,jdbcType=DECIMAL},", + "pay_price = #{payPrice,jdbcType=DECIMAL},", "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", "create_timed = #{createTimed,jdbcType=TIMESTAMP},", 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 13a330b5..cb2da988 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -100,6 +100,10 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("integral_deduction_price", "#{integralDeductionPrice,jdbcType=DECIMAL}"); } + if (record.getPayPrice() != null) { + sql.VALUES("pay_price", "#{payPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}"); } @@ -200,6 +204,7 @@ public class OutRechargeOrderSqlProvider { sql.SELECT("integral_num"); sql.SELECT("discount_deduction_price"); sql.SELECT("integral_deduction_price"); + sql.SELECT("pay_price"); sql.SELECT("pay_real_price"); sql.SELECT("pay_serial_no"); sql.SELECT("create_timed"); @@ -311,6 +316,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("integral_deduction_price = #{record.integralDeductionPrice,jdbcType=DECIMAL}"); } + if (record.getPayPrice() != null) { + sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); } @@ -410,6 +419,7 @@ public class OutRechargeOrderSqlProvider { 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_price = #{record.payPrice,jdbcType=DECIMAL}"); sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); sql.SET("create_timed = #{record.createTimed,jdbcType=TIMESTAMP}"); @@ -510,6 +520,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("integral_deduction_price = #{integralDeductionPrice,jdbcType=DECIMAL}"); } + if (record.getPayPrice() != null) { + sql.SET("pay_price = #{payPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}"); } 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 188fe3a4..07e9cf63 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java @@ -109,6 +109,11 @@ public class OutRechargeOrder implements Serializable { */ private BigDecimal integralDeductionPrice; + /** + * 应付金额 + */ + private BigDecimal payPrice; + /** * 实际金额 */ @@ -344,6 +349,14 @@ public class OutRechargeOrder implements Serializable { this.integralDeductionPrice = integralDeductionPrice; } + public BigDecimal getPayPrice() { + return payPrice; + } + + public void setPayPrice(BigDecimal payPrice) { + this.payPrice = payPrice; + } + public BigDecimal getPayRealPrice() { return payRealPrice; } @@ -519,6 +532,7 @@ public class OutRechargeOrder implements Serializable { && (this.getIntegralNum() == null ? other.getIntegralNum() == null : this.getIntegralNum().equals(other.getIntegralNum())) && (this.getDiscountDeductionPrice() == null ? other.getDiscountDeductionPrice() == null : this.getDiscountDeductionPrice().equals(other.getDiscountDeductionPrice())) && (this.getIntegralDeductionPrice() == null ? other.getIntegralDeductionPrice() == null : this.getIntegralDeductionPrice().equals(other.getIntegralDeductionPrice())) + && (this.getPayPrice() == null ? other.getPayPrice() == null : this.getPayPrice().equals(other.getPayPrice())) && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) && (this.getCreateTimed() == null ? other.getCreateTimed() == null : this.getCreateTimed().equals(other.getCreateTimed())) @@ -562,6 +576,7 @@ public class OutRechargeOrder implements Serializable { result = prime * result + ((getIntegralNum() == null) ? 0 : getIntegralNum().hashCode()); result = prime * result + ((getDiscountDeductionPrice() == null) ? 0 : getDiscountDeductionPrice().hashCode()); result = prime * result + ((getIntegralDeductionPrice() == null) ? 0 : getIntegralDeductionPrice().hashCode()); + result = prime * result + ((getPayPrice() == null) ? 0 : getPayPrice().hashCode()); result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); result = prime * result + ((getCreateTimed() == null) ? 0 : getCreateTimed().hashCode()); @@ -608,6 +623,7 @@ public class OutRechargeOrder implements Serializable { sb.append(", integralNum=").append(integralNum); sb.append(", discountDeductionPrice=").append(discountDeductionPrice); sb.append(", integralDeductionPrice=").append(integralDeductionPrice); + sb.append(", payPrice=").append(payPrice); sb.append(", payRealPrice=").append(payRealPrice); sb.append(", paySerialNo=").append(paySerialNo); sb.append(", createTimed=").append(createTimed); 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 452a2838..cd0aefcf 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java @@ -1336,6 +1336,66 @@ public class OutRechargeOrderExample { return (Criteria) this; } + public Criteria andPayPriceIsNull() { + addCriterion("pay_price is null"); + return (Criteria) this; + } + + public Criteria andPayPriceIsNotNull() { + addCriterion("pay_price is not null"); + return (Criteria) this; + } + + public Criteria andPayPriceEqualTo(BigDecimal value) { + addCriterion("pay_price =", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceNotEqualTo(BigDecimal value) { + addCriterion("pay_price <>", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceGreaterThan(BigDecimal value) { + addCriterion("pay_price >", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("pay_price >=", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceLessThan(BigDecimal value) { + addCriterion("pay_price <", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("pay_price <=", value, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceIn(List values) { + addCriterion("pay_price in", values, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceNotIn(List values) { + addCriterion("pay_price not in", values, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_price between", value1, value2, "payPrice"); + return (Criteria) this; + } + + public Criteria andPayPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("pay_price not between", value1, value2, "payPrice"); + return (Criteria) this; + } + public Criteria andPayRealPriceIsNull() { addCriterion("pay_real_price is null"); return (Criteria) this;