From 2df9618753e89aad92745e339074a94702c63c9e Mon Sep 17 00:00:00 2001 From: YuanYe <418471657@qq.com> Date: Sat, 14 Sep 2024 15:01:44 +0800 Subject: [PATCH] 1 --- .../com/hfkj/dao/BsOrderMeituanMapper.java | 51 ++++++++-------- .../hfkj/dao/BsOrderMeituanSqlProvider.java | 14 +++++ .../java/com/hfkj/entity/BsOrderMeituan.java | 16 +++++ .../hfkj/entity/BsOrderMeituanExample.java | 60 +++++++++++++++++++ 4 files changed, 117 insertions(+), 24 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java b/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java index 3402a8d..dee2e0d 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderMeituanMapper.java @@ -50,16 +50,16 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { "coupon_discount_price, integral_discount_price, ", "platform_code, pay_real_price, ", "ent_pay_amount, business_discount_pay_amount, ", - "service_fee_amount, 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)", + "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}, ", @@ -71,16 +71,16 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { "#{couponDiscountPrice,jdbcType=DECIMAL}, #{integralDiscountPrice,jdbcType=DECIMAL}, ", "#{platformCode,jdbcType=VARCHAR}, #{payRealPrice,jdbcType=DECIMAL}, ", "#{entPayAmount,jdbcType=DECIMAL}, #{businessDiscountPayAmount,jdbcType=DECIMAL}, ", - "#{serviceFeeAmount,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})" + "#{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); @@ -116,6 +116,7 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { @Result(column="ent_pay_amount", property="entPayAmount", 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), @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @@ -144,10 +145,10 @@ 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, pay_real_price, ent_pay_amount, business_discount_pay_amount, ", - "service_fee_amount, 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", + "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}" }) @@ -177,6 +178,7 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { @Result(column="ent_pay_amount", property="entPayAmount", 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), @Result(column="pay_channel", property="payChannel", jdbcType=JdbcType.INTEGER), @Result(column="pay_serial_no", property="paySerialNo", jdbcType=JdbcType.VARCHAR), @Result(column="pay_type", property="payType", jdbcType=JdbcType.INTEGER), @@ -234,6 +236,7 @@ public interface BsOrderMeituanMapper extends BsOrderMeituanMapperExt { "ent_pay_amount = #{entPayAmount,jdbcType=DECIMAL},", "business_discount_pay_amount = #{businessDiscountPayAmount,jdbcType=DECIMAL},", "service_fee_amount = #{serviceFeeAmount,jdbcType=DECIMAL},", + "service_price = #{servicePrice,jdbcType=DECIMAL},", "pay_channel = #{payChannel,jdbcType=INTEGER},", "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", "pay_type = #{payType,jdbcType=INTEGER},", diff --git a/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java index 720529c..c52c4dd 100644 --- a/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsOrderMeituanSqlProvider.java @@ -124,6 +124,10 @@ public class BsOrderMeituanSqlProvider { sql.VALUES("service_fee_amount", "#{serviceFeeAmount,jdbcType=DECIMAL}"); } + if (record.getServicePrice() != null) { + sql.VALUES("service_price", "#{servicePrice,jdbcType=DECIMAL}"); + } + if (record.getPayChannel() != null) { sql.VALUES("pay_channel", "#{payChannel,jdbcType=INTEGER}"); } @@ -234,6 +238,7 @@ public class BsOrderMeituanSqlProvider { sql.SELECT("ent_pay_amount"); sql.SELECT("business_discount_pay_amount"); sql.SELECT("service_fee_amount"); + sql.SELECT("service_price"); sql.SELECT("pay_channel"); sql.SELECT("pay_serial_no"); sql.SELECT("pay_type"); @@ -370,6 +375,10 @@ public class BsOrderMeituanSqlProvider { sql.SET("service_fee_amount = #{record.serviceFeeAmount,jdbcType=DECIMAL}"); } + if (record.getServicePrice() != null) { + sql.SET("service_price = #{record.servicePrice,jdbcType=DECIMAL}"); + } + if (record.getPayChannel() != null) { sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}"); } @@ -479,6 +488,7 @@ public class BsOrderMeituanSqlProvider { sql.SET("ent_pay_amount = #{record.entPayAmount,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}"); sql.SET("pay_channel = #{record.payChannel,jdbcType=INTEGER}"); sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); @@ -604,6 +614,10 @@ public class BsOrderMeituanSqlProvider { sql.SET("service_fee_amount = #{serviceFeeAmount,jdbcType=DECIMAL}"); } + if (record.getServicePrice() != null) { + sql.SET("service_price = #{servicePrice,jdbcType=DECIMAL}"); + } + if (record.getPayChannel() != null) { sql.SET("pay_channel = #{payChannel,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java b/service/src/main/java/com/hfkj/entity/BsOrderMeituan.java index 23dc5dd..f896c8e 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 serviceFeeAmount; + /** + * 平台服务费 + */ + private BigDecimal servicePrice; + /** * 支付渠道与bs_order订单表同步 */ @@ -431,6 +436,14 @@ public class BsOrderMeituan implements Serializable { this.serviceFeeAmount = serviceFeeAmount; } + public BigDecimal getServicePrice() { + return servicePrice; + } + + public void setServicePrice(BigDecimal servicePrice) { + this.servicePrice = servicePrice; + } + public Integer getPayChannel() { return payChannel; } @@ -620,6 +633,7 @@ public class BsOrderMeituan implements Serializable { && (this.getEntPayAmount() == null ? other.getEntPayAmount() == null : this.getEntPayAmount().equals(other.getEntPayAmount())) && (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())) && (this.getPayChannel() == null ? other.getPayChannel() == null : this.getPayChannel().equals(other.getPayChannel())) && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) @@ -670,6 +684,7 @@ public class BsOrderMeituan implements Serializable { result = prime * result + ((getEntPayAmount() == null) ? 0 : getEntPayAmount().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()); result = prime * result + ((getPayChannel() == null) ? 0 : getPayChannel().hashCode()); result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode()); @@ -723,6 +738,7 @@ public class BsOrderMeituan implements Serializable { sb.append(", entPayAmount=").append(entPayAmount); sb.append(", businessDiscountPayAmount=").append(businessDiscountPayAmount); sb.append(", serviceFeeAmount=").append(serviceFeeAmount); + sb.append(", servicePrice=").append(servicePrice); sb.append(", payChannel=").append(payChannel); sb.append(", paySerialNo=").append(paySerialNo); sb.append(", payType=").append(payType); diff --git a/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java b/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java index 4d528e9..3d774f0 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java +++ b/service/src/main/java/com/hfkj/entity/BsOrderMeituanExample.java @@ -1746,6 +1746,66 @@ public class BsOrderMeituanExample { return (Criteria) this; } + public Criteria andServicePriceIsNull() { + addCriterion("service_price is null"); + return (Criteria) this; + } + + public Criteria andServicePriceIsNotNull() { + addCriterion("service_price is not null"); + return (Criteria) this; + } + + public Criteria andServicePriceEqualTo(BigDecimal value) { + addCriterion("service_price =", value, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceNotEqualTo(BigDecimal value) { + addCriterion("service_price <>", value, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceGreaterThan(BigDecimal value) { + addCriterion("service_price >", value, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("service_price >=", value, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceLessThan(BigDecimal value) { + addCriterion("service_price <", value, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("service_price <=", value, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceIn(List values) { + addCriterion("service_price in", values, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceNotIn(List values) { + addCriterion("service_price not in", values, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("service_price between", value1, value2, "servicePrice"); + return (Criteria) this; + } + + public Criteria andServicePriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("service_price not between", value1, value2, "servicePrice"); + return (Criteria) this; + } + public Criteria andPayChannelIsNull() { addCriterion("pay_channel is null"); return (Criteria) this;