From 66ace06ed8586d60cf642b1392eac0bdf9d51277 Mon Sep 17 00:00:00 2001 From: YuanYe <418471657@qq.com> Date: Wed, 18 Sep 2024 11:48:30 +0800 Subject: [PATCH] 1 --- .../com/hfkj/dao/BsOrderMeituanMapper.java | 75 ++++++++++--------- .../hfkj/dao/BsOrderMeituanSqlProvider.java | 18 ++++- .../java/com/hfkj/entity/BsOrderMeituan.java | 16 ++++ .../hfkj/entity/BsOrderMeituanExample.java | 60 +++++++++++++++ 4 files changed, 131 insertions(+), 38 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java index 95feaeb..d602131 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java @@ -7,6 +7,7 @@ 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; @@ -38,10 +39,9 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into bs_order_meituan (id, order_no, ", - "child_order_no, trade_no, ", - "sqt_biz_order_id, mer_id, ", - "mer_name, user_id, ", + "insert into bs_order_meituan (order_no, child_order_no, ", + "trade_no, sqt_biz_order_id, ", + "mer_id, mer_name, user_id, ", "user_phone, first_business_type, ", "second_business_type, ent_id, ", "img, goods_name, ", @@ -50,21 +50,21 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { "coupon_discount_price, integral_discount_price, ", "platform_code, notify_url, ", "return_url, pay_real_price, ", - "ent_pay_amount, business_discount_pay_amount, ", - "service_fee_amount, service_price, ", - "pay_channel, pay_serial_no, ", - "pay_type, `status`, ", - "meituan_status, staff_info, ", - "business_info, trade_expiring_time, ", - "create_time, pay_time, ", - "cancel_time, refund_time, ", - "finish_time, update_time, ", - "exception_status, exception_msg, ", - "ext_1, ext_2, ext_3)", - "values (#{id,jdbcType=BIGINT}, #{orderNo,jdbcType=VARCHAR}, ", - "#{childOrderNo,jdbcType=VARCHAR}, #{tradeNo,jdbcType=VARCHAR}, ", - "#{sqtBizOrderId,jdbcType=VARCHAR}, #{merId,jdbcType=BIGINT}, ", - "#{merName,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ", + "ent_pay_amount, trade_amount, ", + "business_discount_pay_amount, service_fee_amount, ", + "service_price, pay_channel, ", + "pay_serial_no, pay_type, ", + "`status`, meituan_status, ", + "staff_info, business_info, ", + "trade_expiring_time, create_time, ", + "pay_time, cancel_time, ", + "refund_time, finish_time, ", + "update_time, exception_status, ", + "exception_msg, ext_1, ", + "ext_2, ext_3)", + "values (#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", + "#{tradeNo,jdbcType=VARCHAR}, #{sqtBizOrderId,jdbcType=VARCHAR}, ", + "#{merId,jdbcType=BIGINT}, #{merName,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ", "#{userPhone,jdbcType=VARCHAR}, #{firstBusinessType,jdbcType=VARCHAR}, ", "#{secondBusinessType,jdbcType=VARCHAR}, #{entId,jdbcType=BIGINT}, ", "#{img,jdbcType=VARCHAR}, #{goodsName,jdbcType=VARCHAR}, ", @@ -73,21 +73,24 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ", "#{platformCode,jdbcType=VARCHAR}, #{notifyUrl,jdbcType=VARCHAR}, ", "#{returnUrl,jdbcType=VARCHAR}, #{payRealPrice,jdbcType=DECIMAL}, ", - "#{entPayAmount,jdbcType=DECIMAL}, #{businessDiscountPayAmount,jdbcType=DECIMAL}, ", - "#{serviceFeeAmount,jdbcType=DECIMAL}, #{servicePrice,jdbcType=DECIMAL}, ", - "#{payChannel,jdbcType=INTEGER}, #{paySerialNo,jdbcType=VARCHAR}, ", - "#{payType,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, ", - "#{meituanStatus,jdbcType=INTEGER}, #{staffInfo,jdbcType=VARCHAR}, ", - "#{businessInfo,jdbcType=VARCHAR}, #{tradeExpiringTime,jdbcType=TIMESTAMP}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, ", - "#{cancelTime,jdbcType=TIMESTAMP}, #{refundTime,jdbcType=TIMESTAMP}, ", - "#{finishTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{exceptionStatus,jdbcType=BIT}, #{exceptionMsg,jdbcType=VARCHAR}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{entPayAmount,jdbcType=DECIMAL}, #{tradeAmount,jdbcType=DECIMAL}, ", + "#{businessDiscountPayAmount,jdbcType=DECIMAL}, #{serviceFeeAmount,jdbcType=DECIMAL}, ", + "#{servicePrice,jdbcType=DECIMAL}, #{payChannel,jdbcType=INTEGER}, ", + "#{paySerialNo,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", + "#{status,jdbcType=INTEGER}, #{meituanStatus,jdbcType=INTEGER}, ", + "#{staffInfo,jdbcType=VARCHAR}, #{businessInfo,jdbcType=VARCHAR}, ", + "#{tradeExpiringTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, ", + "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", + "#{refundTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ", + "#{updateTime,jdbcType=TIMESTAMP}, #{exceptionStatus,jdbcType=BIT}, ", + "#{exceptionMsg,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) + @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsOrderMeituan record); @InsertProvider(type=BsOrderMeituanSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") int insertSelective(BsOrderMeituan record); @SelectProvider(type=BsOrderMeituanSqlProvider.class, method="selectByExample") @@ -117,6 +120,7 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { @Result(column="return_url", property="returnUrl", jdbcType=JdbcType.VARCHAR), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="ent_pay_amount", property="entPayAmount", jdbcType=JdbcType.DECIMAL), + @Result(column="trade_amount", property="tradeAmount", jdbcType=JdbcType.DECIMAL), @Result(column="business_discount_pay_amount", property="businessDiscountPayAmount", jdbcType=JdbcType.DECIMAL), @Result(column="service_fee_amount", property="serviceFeeAmount", jdbcType=JdbcType.DECIMAL), @Result(column="service_price", property="servicePrice", jdbcType=JdbcType.DECIMAL), @@ -148,10 +152,11 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { "user_id, user_phone, first_business_type, second_business_type, ent_id, img, ", "goods_name, trace_id, goods_count, total_price, total_deduction_price, coupon_discount_price, ", "integral_discount_price, platform_code, notify_url, return_url, pay_real_price, ", - "ent_pay_amount, business_discount_pay_amount, service_fee_amount, service_price, ", - "pay_channel, pay_serial_no, pay_type, `status`, meituan_status, staff_info, ", - "business_info, trade_expiring_time, create_time, pay_time, cancel_time, refund_time, ", - "finish_time, update_time, exception_status, exception_msg, ext_1, ext_2, ext_3", + "ent_pay_amount, trade_amount, business_discount_pay_amount, service_fee_amount, ", + "service_price, pay_channel, pay_serial_no, pay_type, `status`, meituan_status, ", + "staff_info, business_info, trade_expiring_time, create_time, pay_time, cancel_time, ", + "refund_time, finish_time, update_time, exception_status, exception_msg, ext_1, ", + "ext_2, ext_3", "from bs_order_meituan", "where id = #{id,jdbcType=BIGINT}" }) @@ -181,6 +186,7 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { @Result(column="return_url", property="returnUrl", jdbcType=JdbcType.VARCHAR), @Result(column="pay_real_price", property="payRealPrice", jdbcType=JdbcType.DECIMAL), @Result(column="ent_pay_amount", property="entPayAmount", jdbcType=JdbcType.DECIMAL), + @Result(column="trade_amount", property="tradeAmount", jdbcType=JdbcType.DECIMAL), @Result(column="business_discount_pay_amount", property="businessDiscountPayAmount", jdbcType=JdbcType.DECIMAL), @Result(column="service_fee_amount", property="serviceFeeAmount", jdbcType=JdbcType.DECIMAL), @Result(column="service_price", property="servicePrice", jdbcType=JdbcType.DECIMAL), @@ -241,6 +247,7 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { "return_url = #{returnUrl,jdbcType=VARCHAR},", "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", "ent_pay_amount = #{entPayAmount,jdbcType=DECIMAL},", + "trade_amount = #{tradeAmount,jdbcType=DECIMAL},", "business_discount_pay_amount = #{businessDiscountPayAmount,jdbcType=DECIMAL},", "service_fee_amount = #{serviceFeeAmount,jdbcType=DECIMAL},", "service_price = #{servicePrice,jdbcType=DECIMAL},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java index efc65f5..5ff8fa9 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java @@ -28,10 +28,6 @@ public class BsOrderMeituanSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("bs_order_meituan"); - if (record.getId() != null) { - sql.VALUES("id", "#{id,jdbcType=BIGINT}"); - } - if (record.getOrderNo() != null) { sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } @@ -128,6 +124,10 @@ public class BsOrderMeituanSqlProvider { sql.VALUES("ent_pay_amount", "#{entPayAmount,jdbcType=DECIMAL}"); } + if (record.getTradeAmount() != null) { + sql.VALUES("trade_amount", "#{tradeAmount,jdbcType=DECIMAL}"); + } + if (record.getBusinessDiscountPayAmount() != null) { sql.VALUES("business_discount_pay_amount", "#{businessDiscountPayAmount,jdbcType=DECIMAL}"); } @@ -250,6 +250,7 @@ public class BsOrderMeituanSqlProvider { sql.SELECT("return_url"); sql.SELECT("pay_real_price"); sql.SELECT("ent_pay_amount"); + sql.SELECT("trade_amount"); sql.SELECT("business_discount_pay_amount"); sql.SELECT("service_fee_amount"); sql.SELECT("service_price"); @@ -389,6 +390,10 @@ public class BsOrderMeituanSqlProvider { sql.SET("ent_pay_amount = #{record.entPayAmount,jdbcType=DECIMAL}"); } + if (record.getTradeAmount() != null) { + sql.SET("trade_amount = #{record.tradeAmount,jdbcType=DECIMAL}"); + } + if (record.getBusinessDiscountPayAmount() != null) { sql.SET("business_discount_pay_amount = #{record.businessDiscountPayAmount,jdbcType=DECIMAL}"); } @@ -510,6 +515,7 @@ public class BsOrderMeituanSqlProvider { sql.SET("return_url = #{record.returnUrl,jdbcType=VARCHAR}"); sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("ent_pay_amount = #{record.entPayAmount,jdbcType=DECIMAL}"); + sql.SET("trade_amount = #{record.tradeAmount,jdbcType=DECIMAL}"); sql.SET("business_discount_pay_amount = #{record.businessDiscountPayAmount,jdbcType=DECIMAL}"); sql.SET("service_fee_amount = #{record.serviceFeeAmount,jdbcType=DECIMAL}"); sql.SET("service_price = #{record.servicePrice,jdbcType=DECIMAL}"); @@ -638,6 +644,10 @@ public class BsOrderMeituanSqlProvider { sql.SET("ent_pay_amount = #{entPayAmount,jdbcType=DECIMAL}"); } + if (record.getTradeAmount() != null) { + sql.SET("trade_amount = #{tradeAmount,jdbcType=DECIMAL}"); + } + if (record.getBusinessDiscountPayAmount() != null) { sql.SET("business_discount_pay_amount = #{businessDiscountPayAmount,jdbcType=DECIMAL}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java b/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java index 8f6594b..a2ef03c 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java @@ -139,6 +139,11 @@ public class BsOrderMeituan implements Serializable { */ private BigDecimal entPayAmount; + /** + * 支付金额(不包含服务费)，单位元，支持小数点后两位 + */ + private BigDecimal tradeAmount; + /** * 优惠承担支付金额，单位元；NULL 代表无优惠承担金额 */ @@ -446,6 +451,14 @@ public class BsOrderMeituan implements Serializable { this.entPayAmount = entPayAmount; } + public BigDecimal getTradeAmount() { + return tradeAmount; + } + + public void setTradeAmount(BigDecimal tradeAmount) { + this.tradeAmount = tradeAmount; + } + public BigDecimal getBusinessDiscountPayAmount() { return businessDiscountPayAmount; } @@ -659,6 +672,7 @@ public class BsOrderMeituan implements Serializable { && (this.getReturnUrl() == null ? other.getReturnUrl() == null : this.getReturnUrl().equals(other.getReturnUrl())) && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) && (this.getEntPayAmount() == null ? other.getEntPayAmount() == null : this.getEntPayAmount().equals(other.getEntPayAmount())) + && (this.getTradeAmount() == null ? other.getTradeAmount() == null : this.getTradeAmount().equals(other.getTradeAmount())) && (this.getBusinessDiscountPayAmount() == null ? other.getBusinessDiscountPayAmount() == null : this.getBusinessDiscountPayAmount().equals(other.getBusinessDiscountPayAmount())) && (this.getServiceFeeAmount() == null ? other.getServiceFeeAmount() == null : this.getServiceFeeAmount().equals(other.getServiceFeeAmount())) && (this.getServicePrice() == null ? other.getServicePrice() == null : this.getServicePrice().equals(other.getServicePrice())) @@ -712,6 +726,7 @@ public class BsOrderMeituan implements Serializable { result = prime * result + ((getReturnUrl() == null) ? 0 : getReturnUrl().hashCode()); result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); result = prime * result + ((getEntPayAmount() == null) ? 0 : getEntPayAmount().hashCode()); + result = prime * result + ((getTradeAmount() == null) ? 0 : getTradeAmount().hashCode()); result = prime * result + ((getBusinessDiscountPayAmount() == null) ? 0 : getBusinessDiscountPayAmount().hashCode()); result = prime * result + ((getServiceFeeAmount() == null) ? 0 : getServiceFeeAmount().hashCode()); result = prime * result + ((getServicePrice() == null) ? 0 : getServicePrice().hashCode()); @@ -768,6 +783,7 @@ public class BsOrderMeituan implements Serializable { sb.append(", returnUrl=").append(returnUrl); sb.append(", payRealPrice=").append(payRealPrice); sb.append(", entPayAmount=").append(entPayAmount); + sb.append(", tradeAmount=").append(tradeAmount); sb.append(", businessDiscountPayAmount=").append(businessDiscountPayAmount); sb.append(", serviceFeeAmount=").append(serviceFeeAmount); sb.append(", servicePrice=").append(servicePrice); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java b/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java index e92cfb4..9ea99aa 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java @@ -1766,6 +1766,66 @@ public class BsOrderMeituanExample { return (Criteria) this; } + public Criteria andTradeAmountIsNull() { + addCriterion("trade_amount is null"); + return (Criteria) this; + } + + public Criteria andTradeAmountIsNotNull() { + addCriterion("trade_amount is not null"); + return (Criteria) this; + } + + public Criteria andTradeAmountEqualTo(BigDecimal value) { + addCriterion("trade_amount =", value, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountNotEqualTo(BigDecimal value) { + addCriterion("trade_amount <>", value, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountGreaterThan(BigDecimal value) { + addCriterion("trade_amount >", value, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("trade_amount >=", value, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountLessThan(BigDecimal value) { + addCriterion("trade_amount <", value, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("trade_amount <=", value, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountIn(List values) { + addCriterion("trade_amount in", values, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountNotIn(List values) { + addCriterion("trade_amount not in", values, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("trade_amount between", value1, value2, "tradeAmount"); + return (Criteria) this; + } + + public Criteria andTradeAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("trade_amount not between", value1, value2, "tradeAmount"); + return (Criteria) this; + } + public Criteria andBusinessDiscountPayAmountIsNull() { addCriterion("business_discount_pay_amount is null"); return (Criteria) this;