From fa9a65f37a96fcac3bfada83c804c1c25d7ff44b Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Wed, 2 Nov 2022 11:28:04 +0800 Subject: [PATCH] 1 --- .../com/hai/dao/OutRechargeOrderMapper.java | 169 ++- .../hai/dao/OutRechargeOrderSqlProvider.java | 298 ++-- .../java/com/hai/entity/OutRechargeOrder.java | 339 +++-- .../hai/entity/OutRechargeOrderExample.java | 1342 +++++++++-------- 4 files changed, 1130 insertions(+), 1018 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 2eeaf604..af13174d 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapper.java @@ -39,50 +39,50 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into out_recharge_order (recharge_price, `type`, ", - "operator_name, operator_type, ", - "order_no, recharge_type, ", + "insert into out_recharge_order (`type`, operator_name, ", + "operator_type, recharge_price, ", + "order_no, child_order_no, ", "mem_discount_id, mem_discount_name, ", "user_id, user_name, ", - "user_phone, goods_id, ", - "recharge_content, pay_type, ", + "user_phone, pay_type, ", "labor_union_card, integral_num, ", "discount_deduction_price, integral_deduction_price, ", - "pay_price, pay_real_price, ", - "pay_serial_no, create_timed, ", + "pay_price, order_price, ", + "pay_real_price, pay_serial_no, ", + "pay_status, recharge_status, ", + "recharge_name, create_timed, ", "pay_time, cancel_time, ", - "finish_time, out_refund_no, ", - "order_price, refund_time, ", + "finish_time, remarks, ", + "out_refund_no, refund_time, ", "tp_refund_order_no, refund_id, ", - "refund_fee, company_id, ", - "pay_status, merch_id, ", - "recharge_status, ext_1, ", - "ext_2, ext_3, recharge_name, ", - "remarks, agent_key, ", - "object_id, abnormal_msg, ", - "whether_rebate)", - "values (#{rechargePrice,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, ", - "#{operatorName,jdbcType=VARCHAR}, #{operatorType,jdbcType=INTEGER}, ", - "#{orderNo,jdbcType=VARCHAR}, #{rechargeType,jdbcType=INTEGER}, ", + "refund_fee, agent_key, ", + "object_id, recharge_type, ", + "abnormal_msg, ext_1, ", + "ext_2, ext_3, goods_id, ", + "recharge_content, company_id, ", + "merch_id, whether_rebate)", + "values (#{type,jdbcType=INTEGER}, #{operatorName,jdbcType=VARCHAR}, ", + "#{operatorType,jdbcType=INTEGER}, #{rechargePrice,jdbcType=DECIMAL}, ", + "#{orderNo,jdbcType=VARCHAR}, #{childOrderNo,jdbcType=VARCHAR}, ", "#{memDiscountId,jdbcType=BIGINT}, #{memDiscountName,jdbcType=VARCHAR}, ", "#{userId,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, ", - "#{userPhone,jdbcType=VARCHAR}, #{goodsId,jdbcType=BIGINT}, ", - "#{rechargeContent,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", + "#{userPhone,jdbcType=VARCHAR}, #{payType,jdbcType=INTEGER}, ", "#{laborUnionCard,jdbcType=VARCHAR}, #{integralNum,jdbcType=DECIMAL}, ", "#{discountDeductionPrice,jdbcType=DECIMAL}, #{integralDeductionPrice,jdbcType=DECIMAL}, ", - "#{payPrice,jdbcType=DECIMAL}, #{payRealPrice,jdbcType=DECIMAL}, ", - "#{paySerialNo,jdbcType=VARCHAR}, #{createTimed,jdbcType=TIMESTAMP}, ", + "#{payPrice,jdbcType=DECIMAL}, #{orderPrice,jdbcType=DECIMAL}, ", + "#{payRealPrice,jdbcType=DECIMAL}, #{paySerialNo,jdbcType=VARCHAR}, ", + "#{payStatus,jdbcType=INTEGER}, #{rechargeStatus,jdbcType=INTEGER}, ", + "#{rechargeName,jdbcType=VARCHAR}, #{createTimed,jdbcType=TIMESTAMP}, ", "#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ", - "#{finishTime,jdbcType=TIMESTAMP}, #{outRefundNo,jdbcType=VARCHAR}, ", - "#{orderPrice,jdbcType=DECIMAL}, #{refundTime,jdbcType=TIMESTAMP}, ", + "#{finishTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, ", + "#{outRefundNo,jdbcType=VARCHAR}, #{refundTime,jdbcType=TIMESTAMP}, ", "#{tpRefundOrderNo,jdbcType=VARCHAR}, #{refundId,jdbcType=VARCHAR}, ", - "#{refundFee,jdbcType=DECIMAL}, #{companyId,jdbcType=BIGINT}, ", - "#{payStatus,jdbcType=INTEGER}, #{merchId,jdbcType=VARCHAR}, ", - "#{rechargeStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{rechargeName,jdbcType=VARCHAR}, ", - "#{remarks,jdbcType=VARCHAR}, #{agentKey,jdbcType=VARCHAR}, ", - "#{objectId,jdbcType=BIGINT}, #{abnormalMsg,jdbcType=VARCHAR}, ", - "#{whetherRebate,jdbcType=BIT})" + "#{refundFee,jdbcType=DECIMAL}, #{agentKey,jdbcType=VARCHAR}, ", + "#{objectId,jdbcType=INTEGER}, #{rechargeType,jdbcType=INTEGER}, ", + "#{abnormalMsg,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{goodsId,jdbcType=BIGINT}, ", + "#{rechargeContent,jdbcType=VARCHAR}, #{companyId,jdbcType=BIGINT}, ", + "#{merchId,jdbcType=VARCHAR}, #{whetherRebate,jdbcType=BIT})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(OutRechargeOrder record); @@ -94,111 +94,113 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @SelectProvider(type=OutRechargeOrderSqlProvider.class, method="selectByExample") @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="recharge_price", property="rechargePrice", jdbcType=JdbcType.DECIMAL), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), @Result(column="operator_type", property="operatorType", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_price", property="rechargePrice", jdbcType=JdbcType.DECIMAL), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="mem_discount_id", property="memDiscountId", jdbcType=JdbcType.BIGINT), @Result(column="mem_discount_name", property="memDiscountName", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), - @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), - @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.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="order_price", property="orderPrice", 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="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_name", property="rechargeName", jdbcType=JdbcType.VARCHAR), @Result(column="create_timed", property="createTimed", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="out_refund_no", property="outRefundNo", jdbcType=JdbcType.VARCHAR), - @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="tp_refund_order_no", property="tpRefundOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="refund_id", property="refundId", jdbcType=JdbcType.VARCHAR), @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL), - @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), - @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), - @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), + @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), + @Result(column="object_id", property="objectId", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), + @Result(column="abnormal_msg", property="abnormalMsg", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_name", property="rechargeName", jdbcType=JdbcType.VARCHAR), - @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), - @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), - @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), - @Result(column="abnormal_msg", property="abnormalMsg", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), + @Result(column="recharge_content", property="rechargeContent", jdbcType=JdbcType.VARCHAR), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), @Result(column="whether_rebate", property="whetherRebate", jdbcType=JdbcType.BIT) }) List selectByExample(OutRechargeOrderExample example); @Select({ "select", - "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_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, merch_id, ", - "recharge_status, ext_1, ext_2, ext_3, recharge_name, remarks, agent_key, object_id, ", - "abnormal_msg, whether_rebate", + "id, `type`, operator_name, operator_type, recharge_price, order_no, child_order_no, ", + "mem_discount_id, mem_discount_name, user_id, user_name, user_phone, pay_type, ", + "labor_union_card, integral_num, discount_deduction_price, integral_deduction_price, ", + "pay_price, order_price, pay_real_price, pay_serial_no, pay_status, recharge_status, ", + "recharge_name, create_timed, pay_time, cancel_time, finish_time, remarks, out_refund_no, ", + "refund_time, tp_refund_order_no, refund_id, refund_fee, agent_key, object_id, ", + "recharge_type, abnormal_msg, ext_1, ext_2, ext_3, goods_id, recharge_content, ", + "company_id, merch_id, whether_rebate", "from out_recharge_order", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), - @Result(column="recharge_price", property="rechargePrice", jdbcType=JdbcType.DECIMAL), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="operator_name", property="operatorName", jdbcType=JdbcType.VARCHAR), @Result(column="operator_type", property="operatorType", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_price", property="rechargePrice", jdbcType=JdbcType.DECIMAL), @Result(column="order_no", property="orderNo", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), + @Result(column="child_order_no", property="childOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="mem_discount_id", property="memDiscountId", jdbcType=JdbcType.BIGINT), @Result(column="mem_discount_name", property="memDiscountName", jdbcType=JdbcType.VARCHAR), @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT), @Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR), @Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR), - @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), - @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.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="order_price", property="orderPrice", 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="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_name", property="rechargeName", jdbcType=JdbcType.VARCHAR), @Result(column="create_timed", property="createTimed", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="cancel_time", property="cancelTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="finish_time", property="finishTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), @Result(column="out_refund_no", property="outRefundNo", jdbcType=JdbcType.VARCHAR), - @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="refund_time", property="refundTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="tp_refund_order_no", property="tpRefundOrderNo", jdbcType=JdbcType.VARCHAR), @Result(column="refund_id", property="refundId", jdbcType=JdbcType.VARCHAR), @Result(column="refund_fee", property="refundFee", jdbcType=JdbcType.DECIMAL), - @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), - @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.INTEGER), - @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_status", property="rechargeStatus", jdbcType=JdbcType.INTEGER), + @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), + @Result(column="object_id", property="objectId", jdbcType=JdbcType.INTEGER), + @Result(column="recharge_type", property="rechargeType", jdbcType=JdbcType.INTEGER), + @Result(column="abnormal_msg", property="abnormalMsg", jdbcType=JdbcType.VARCHAR), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR), - @Result(column="recharge_name", property="rechargeName", jdbcType=JdbcType.VARCHAR), - @Result(column="remarks", property="remarks", jdbcType=JdbcType.VARCHAR), - @Result(column="agent_key", property="agentKey", jdbcType=JdbcType.VARCHAR), - @Result(column="object_id", property="objectId", jdbcType=JdbcType.BIGINT), - @Result(column="abnormal_msg", property="abnormalMsg", jdbcType=JdbcType.VARCHAR), + @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT), + @Result(column="recharge_content", property="rechargeContent", jdbcType=JdbcType.VARCHAR), + @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="merch_id", property="merchId", jdbcType=JdbcType.VARCHAR), @Result(column="whether_rebate", property="whetherRebate", jdbcType=JdbcType.BIT) }) OutRechargeOrder selectByPrimaryKey(Long id); @@ -214,49 +216,50 @@ public interface OutRechargeOrderMapper extends OutRechargeOrderMapperExt { @Update({ "update out_recharge_order", - "set recharge_price = #{rechargePrice,jdbcType=DECIMAL},", - "`type` = #{type,jdbcType=INTEGER},", + "set `type` = #{type,jdbcType=INTEGER},", "operator_name = #{operatorName,jdbcType=VARCHAR},", "operator_type = #{operatorType,jdbcType=INTEGER},", + "recharge_price = #{rechargePrice,jdbcType=DECIMAL},", "order_no = #{orderNo,jdbcType=VARCHAR},", - "recharge_type = #{rechargeType,jdbcType=INTEGER},", + "child_order_no = #{childOrderNo,jdbcType=VARCHAR},", "mem_discount_id = #{memDiscountId,jdbcType=BIGINT},", "mem_discount_name = #{memDiscountName,jdbcType=VARCHAR},", "user_id = #{userId,jdbcType=BIGINT},", "user_name = #{userName,jdbcType=VARCHAR},", "user_phone = #{userPhone,jdbcType=VARCHAR},", - "goods_id = #{goodsId,jdbcType=BIGINT},", - "recharge_content = #{rechargeContent,jdbcType=VARCHAR},", "pay_type = #{payType,jdbcType=INTEGER},", "labor_union_card = #{laborUnionCard,jdbcType=VARCHAR},", "integral_num = #{integralNum,jdbcType=DECIMAL},", "discount_deduction_price = #{discountDeductionPrice,jdbcType=DECIMAL},", "integral_deduction_price = #{integralDeductionPrice,jdbcType=DECIMAL},", "pay_price = #{payPrice,jdbcType=DECIMAL},", + "order_price = #{orderPrice,jdbcType=DECIMAL},", "pay_real_price = #{payRealPrice,jdbcType=DECIMAL},", "pay_serial_no = #{paySerialNo,jdbcType=VARCHAR},", + "pay_status = #{payStatus,jdbcType=INTEGER},", + "recharge_status = #{rechargeStatus,jdbcType=INTEGER},", + "recharge_name = #{rechargeName,jdbcType=VARCHAR},", "create_timed = #{createTimed,jdbcType=TIMESTAMP},", "pay_time = #{payTime,jdbcType=TIMESTAMP},", "cancel_time = #{cancelTime,jdbcType=TIMESTAMP},", "finish_time = #{finishTime,jdbcType=TIMESTAMP},", + "remarks = #{remarks,jdbcType=VARCHAR},", "out_refund_no = #{outRefundNo,jdbcType=VARCHAR},", - "order_price = #{orderPrice,jdbcType=DECIMAL},", "refund_time = #{refundTime,jdbcType=TIMESTAMP},", "tp_refund_order_no = #{tpRefundOrderNo,jdbcType=VARCHAR},", "refund_id = #{refundId,jdbcType=VARCHAR},", "refund_fee = #{refundFee,jdbcType=DECIMAL},", - "company_id = #{companyId,jdbcType=BIGINT},", - "pay_status = #{payStatus,jdbcType=INTEGER},", - "merch_id = #{merchId,jdbcType=VARCHAR},", - "recharge_status = #{rechargeStatus,jdbcType=INTEGER},", + "agent_key = #{agentKey,jdbcType=VARCHAR},", + "object_id = #{objectId,jdbcType=INTEGER},", + "recharge_type = #{rechargeType,jdbcType=INTEGER},", + "abnormal_msg = #{abnormalMsg,jdbcType=VARCHAR},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_3 = #{ext3,jdbcType=VARCHAR},", - "recharge_name = #{rechargeName,jdbcType=VARCHAR},", - "remarks = #{remarks,jdbcType=VARCHAR},", - "agent_key = #{agentKey,jdbcType=VARCHAR},", - "object_id = #{objectId,jdbcType=BIGINT},", - "abnormal_msg = #{abnormalMsg,jdbcType=VARCHAR},", + "goods_id = #{goodsId,jdbcType=BIGINT},", + "recharge_content = #{rechargeContent,jdbcType=VARCHAR},", + "company_id = #{companyId,jdbcType=BIGINT},", + "merch_id = #{merchId,jdbcType=VARCHAR},", "whether_rebate = #{whetherRebate,jdbcType=BIT}", "where id = #{id,jdbcType=BIGINT}" }) 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 9322bcd7..70feda23 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderSqlProvider.java @@ -28,10 +28,6 @@ public class OutRechargeOrderSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("out_recharge_order"); - if (record.getRechargePrice() != null) { - sql.VALUES("recharge_price", "#{rechargePrice,jdbcType=DECIMAL}"); - } - if (record.getType() != null) { sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); } @@ -44,12 +40,16 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("operator_type", "#{operatorType,jdbcType=INTEGER}"); } + if (record.getRechargePrice() != null) { + sql.VALUES("recharge_price", "#{rechargePrice,jdbcType=DECIMAL}"); + } + if (record.getOrderNo() != null) { sql.VALUES("order_no", "#{orderNo,jdbcType=VARCHAR}"); } - if (record.getRechargeType() != null) { - sql.VALUES("recharge_type", "#{rechargeType,jdbcType=INTEGER}"); + if (record.getChildOrderNo() != null) { + sql.VALUES("child_order_no", "#{childOrderNo,jdbcType=VARCHAR}"); } if (record.getMemDiscountId() != null) { @@ -72,14 +72,6 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("user_phone", "#{userPhone,jdbcType=VARCHAR}"); } - if (record.getGoodsId() != null) { - sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}"); - } - - if (record.getRechargeContent() != null) { - sql.VALUES("recharge_content", "#{rechargeContent,jdbcType=VARCHAR}"); - } - if (record.getPayType() != null) { sql.VALUES("pay_type", "#{payType,jdbcType=INTEGER}"); } @@ -104,6 +96,10 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("pay_price", "#{payPrice,jdbcType=DECIMAL}"); } + if (record.getOrderPrice() != null) { + sql.VALUES("order_price", "#{orderPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.VALUES("pay_real_price", "#{payRealPrice,jdbcType=DECIMAL}"); } @@ -112,6 +108,18 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("pay_serial_no", "#{paySerialNo,jdbcType=VARCHAR}"); } + if (record.getPayStatus() != null) { + sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.VALUES("recharge_status", "#{rechargeStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeName() != null) { + sql.VALUES("recharge_name", "#{rechargeName,jdbcType=VARCHAR}"); + } + if (record.getCreateTimed() != null) { sql.VALUES("create_timed", "#{createTimed,jdbcType=TIMESTAMP}"); } @@ -128,12 +136,12 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("finish_time", "#{finishTime,jdbcType=TIMESTAMP}"); } - if (record.getOutRefundNo() != null) { - sql.VALUES("out_refund_no", "#{outRefundNo,jdbcType=VARCHAR}"); + if (record.getRemarks() != null) { + sql.VALUES("remarks", "#{remarks,jdbcType=VARCHAR}"); } - if (record.getOrderPrice() != null) { - sql.VALUES("order_price", "#{orderPrice,jdbcType=DECIMAL}"); + if (record.getOutRefundNo() != null) { + sql.VALUES("out_refund_no", "#{outRefundNo,jdbcType=VARCHAR}"); } if (record.getRefundTime() != null) { @@ -152,20 +160,20 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("refund_fee", "#{refundFee,jdbcType=DECIMAL}"); } - if (record.getCompanyId() != null) { - sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); + if (record.getAgentKey() != null) { + sql.VALUES("agent_key", "#{agentKey,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.VALUES("pay_status", "#{payStatus,jdbcType=INTEGER}"); + if (record.getObjectId() != null) { + sql.VALUES("object_id", "#{objectId,jdbcType=INTEGER}"); } - if (record.getMerchId() != null) { - sql.VALUES("merch_id", "#{merchId,jdbcType=VARCHAR}"); + if (record.getRechargeType() != null) { + sql.VALUES("recharge_type", "#{rechargeType,jdbcType=INTEGER}"); } - if (record.getRechargeStatus() != null) { - sql.VALUES("recharge_status", "#{rechargeStatus,jdbcType=INTEGER}"); + if (record.getAbnormalMsg() != null) { + sql.VALUES("abnormal_msg", "#{abnormalMsg,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { @@ -180,24 +188,20 @@ public class OutRechargeOrderSqlProvider { sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); } - if (record.getRechargeName() != null) { - sql.VALUES("recharge_name", "#{rechargeName,jdbcType=VARCHAR}"); - } - - if (record.getRemarks() != null) { - sql.VALUES("remarks", "#{remarks,jdbcType=VARCHAR}"); + if (record.getGoodsId() != null) { + sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}"); } - if (record.getAgentKey() != null) { - sql.VALUES("agent_key", "#{agentKey,jdbcType=VARCHAR}"); + if (record.getRechargeContent() != null) { + sql.VALUES("recharge_content", "#{rechargeContent,jdbcType=VARCHAR}"); } - if (record.getObjectId() != null) { - sql.VALUES("object_id", "#{objectId,jdbcType=BIGINT}"); + if (record.getCompanyId() != null) { + sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); } - if (record.getAbnormalMsg() != null) { - sql.VALUES("abnormal_msg", "#{abnormalMsg,jdbcType=VARCHAR}"); + if (record.getMerchId() != null) { + sql.VALUES("merch_id", "#{merchId,jdbcType=VARCHAR}"); } if (record.getWhetherRebate() != null) { @@ -214,49 +218,50 @@ public class OutRechargeOrderSqlProvider { } else { sql.SELECT("id"); } - sql.SELECT("recharge_price"); sql.SELECT("`type`"); sql.SELECT("operator_name"); sql.SELECT("operator_type"); + sql.SELECT("recharge_price"); sql.SELECT("order_no"); - sql.SELECT("recharge_type"); + sql.SELECT("child_order_no"); sql.SELECT("mem_discount_id"); sql.SELECT("mem_discount_name"); sql.SELECT("user_id"); sql.SELECT("user_name"); sql.SELECT("user_phone"); - sql.SELECT("goods_id"); - sql.SELECT("recharge_content"); sql.SELECT("pay_type"); sql.SELECT("labor_union_card"); sql.SELECT("integral_num"); sql.SELECT("discount_deduction_price"); sql.SELECT("integral_deduction_price"); sql.SELECT("pay_price"); + sql.SELECT("order_price"); sql.SELECT("pay_real_price"); sql.SELECT("pay_serial_no"); + sql.SELECT("pay_status"); + sql.SELECT("recharge_status"); + sql.SELECT("recharge_name"); sql.SELECT("create_timed"); sql.SELECT("pay_time"); sql.SELECT("cancel_time"); sql.SELECT("finish_time"); + sql.SELECT("remarks"); sql.SELECT("out_refund_no"); - sql.SELECT("order_price"); sql.SELECT("refund_time"); sql.SELECT("tp_refund_order_no"); sql.SELECT("refund_id"); sql.SELECT("refund_fee"); - sql.SELECT("company_id"); - sql.SELECT("pay_status"); - sql.SELECT("merch_id"); - sql.SELECT("recharge_status"); - sql.SELECT("ext_1"); - sql.SELECT("ext_2"); - sql.SELECT("ext_3"); - sql.SELECT("recharge_name"); - sql.SELECT("remarks"); sql.SELECT("agent_key"); sql.SELECT("object_id"); + sql.SELECT("recharge_type"); sql.SELECT("abnormal_msg"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.SELECT("goods_id"); + sql.SELECT("recharge_content"); + sql.SELECT("company_id"); + sql.SELECT("merch_id"); sql.SELECT("whether_rebate"); sql.FROM("out_recharge_order"); applyWhere(sql, example, false); @@ -279,10 +284,6 @@ public class OutRechargeOrderSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } - if (record.getRechargePrice() != null) { - sql.SET("recharge_price = #{record.rechargePrice,jdbcType=DECIMAL}"); - } - if (record.getType() != null) { sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); } @@ -295,12 +296,16 @@ public class OutRechargeOrderSqlProvider { sql.SET("operator_type = #{record.operatorType,jdbcType=INTEGER}"); } + if (record.getRechargePrice() != null) { + sql.SET("recharge_price = #{record.rechargePrice,jdbcType=DECIMAL}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); } - if (record.getRechargeType() != null) { - sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); } if (record.getMemDiscountId() != null) { @@ -323,14 +328,6 @@ public class OutRechargeOrderSqlProvider { sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); } - if (record.getGoodsId() != null) { - sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); - } - - if (record.getRechargeContent() != null) { - sql.SET("recharge_content = #{record.rechargeContent,jdbcType=VARCHAR}"); - } - if (record.getPayType() != null) { sql.SET("pay_type = #{record.payType,jdbcType=INTEGER}"); } @@ -355,6 +352,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_price = #{record.payPrice,jdbcType=DECIMAL}"); } + if (record.getOrderPrice() != null) { + sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); } @@ -363,6 +364,18 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); } + if (record.getPayStatus() != null) { + sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeName() != null) { + sql.SET("recharge_name = #{record.rechargeName,jdbcType=VARCHAR}"); + } + if (record.getCreateTimed() != null) { sql.SET("create_timed = #{record.createTimed,jdbcType=TIMESTAMP}"); } @@ -379,12 +392,12 @@ public class OutRechargeOrderSqlProvider { sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); } - if (record.getOutRefundNo() != null) { - sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); + if (record.getRemarks() != null) { + sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); } - if (record.getOrderPrice() != null) { - sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); + if (record.getOutRefundNo() != null) { + sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); } if (record.getRefundTime() != null) { @@ -403,20 +416,20 @@ public class OutRechargeOrderSqlProvider { sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); } - if (record.getCompanyId() != null) { - sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); + if (record.getAgentKey() != null) { + sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); + if (record.getObjectId() != null) { + sql.SET("object_id = #{record.objectId,jdbcType=INTEGER}"); } - if (record.getMerchId() != null) { - sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); + if (record.getRechargeType() != null) { + sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); } - if (record.getRechargeStatus() != null) { - sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + if (record.getAbnormalMsg() != null) { + sql.SET("abnormal_msg = #{record.abnormalMsg,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { @@ -431,24 +444,20 @@ public class OutRechargeOrderSqlProvider { sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); } - if (record.getRechargeName() != null) { - sql.SET("recharge_name = #{record.rechargeName,jdbcType=VARCHAR}"); - } - - if (record.getRemarks() != null) { - sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); + if (record.getGoodsId() != null) { + sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); } - if (record.getAgentKey() != null) { - sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); + if (record.getRechargeContent() != null) { + sql.SET("recharge_content = #{record.rechargeContent,jdbcType=VARCHAR}"); } - if (record.getObjectId() != null) { - sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); + if (record.getCompanyId() != null) { + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); } - if (record.getAbnormalMsg() != null) { - sql.SET("abnormal_msg = #{record.abnormalMsg,jdbcType=VARCHAR}"); + if (record.getMerchId() != null) { + sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); } if (record.getWhetherRebate() != null) { @@ -464,49 +473,50 @@ public class OutRechargeOrderSqlProvider { sql.UPDATE("out_recharge_order"); sql.SET("id = #{record.id,jdbcType=BIGINT}"); - sql.SET("recharge_price = #{record.rechargePrice,jdbcType=DECIMAL}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("operator_name = #{record.operatorName,jdbcType=VARCHAR}"); sql.SET("operator_type = #{record.operatorType,jdbcType=INTEGER}"); + sql.SET("recharge_price = #{record.rechargePrice,jdbcType=DECIMAL}"); sql.SET("order_no = #{record.orderNo,jdbcType=VARCHAR}"); - sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); + sql.SET("child_order_no = #{record.childOrderNo,jdbcType=VARCHAR}"); sql.SET("mem_discount_id = #{record.memDiscountId,jdbcType=BIGINT}"); sql.SET("mem_discount_name = #{record.memDiscountName,jdbcType=VARCHAR}"); sql.SET("user_id = #{record.userId,jdbcType=BIGINT}"); sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}"); sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}"); - sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); - 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=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("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); sql.SET("pay_real_price = #{record.payRealPrice,jdbcType=DECIMAL}"); sql.SET("pay_serial_no = #{record.paySerialNo,jdbcType=VARCHAR}"); + sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); + sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + sql.SET("recharge_name = #{record.rechargeName,jdbcType=VARCHAR}"); sql.SET("create_timed = #{record.createTimed,jdbcType=TIMESTAMP}"); sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); sql.SET("cancel_time = #{record.cancelTime,jdbcType=TIMESTAMP}"); sql.SET("finish_time = #{record.finishTime,jdbcType=TIMESTAMP}"); + sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); sql.SET("out_refund_no = #{record.outRefundNo,jdbcType=VARCHAR}"); - sql.SET("order_price = #{record.orderPrice,jdbcType=DECIMAL}"); sql.SET("refund_time = #{record.refundTime,jdbcType=TIMESTAMP}"); sql.SET("tp_refund_order_no = #{record.tpRefundOrderNo,jdbcType=VARCHAR}"); sql.SET("refund_id = #{record.refundId,jdbcType=VARCHAR}"); sql.SET("refund_fee = #{record.refundFee,jdbcType=DECIMAL}"); - sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); - sql.SET("pay_status = #{record.payStatus,jdbcType=INTEGER}"); - sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); - sql.SET("recharge_status = #{record.rechargeStatus,jdbcType=INTEGER}"); + sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); + sql.SET("object_id = #{record.objectId,jdbcType=INTEGER}"); + sql.SET("recharge_type = #{record.rechargeType,jdbcType=INTEGER}"); + sql.SET("abnormal_msg = #{record.abnormalMsg,jdbcType=VARCHAR}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); - sql.SET("recharge_name = #{record.rechargeName,jdbcType=VARCHAR}"); - sql.SET("remarks = #{record.remarks,jdbcType=VARCHAR}"); - sql.SET("agent_key = #{record.agentKey,jdbcType=VARCHAR}"); - sql.SET("object_id = #{record.objectId,jdbcType=BIGINT}"); - sql.SET("abnormal_msg = #{record.abnormalMsg,jdbcType=VARCHAR}"); + sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}"); + sql.SET("recharge_content = #{record.rechargeContent,jdbcType=VARCHAR}"); + sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); + sql.SET("merch_id = #{record.merchId,jdbcType=VARCHAR}"); sql.SET("whether_rebate = #{record.whetherRebate,jdbcType=BIT}"); OutRechargeOrderExample example = (OutRechargeOrderExample) parameter.get("example"); @@ -518,10 +528,6 @@ public class OutRechargeOrderSqlProvider { SQL sql = new SQL(); sql.UPDATE("out_recharge_order"); - if (record.getRechargePrice() != null) { - sql.SET("recharge_price = #{rechargePrice,jdbcType=DECIMAL}"); - } - if (record.getType() != null) { sql.SET("`type` = #{type,jdbcType=INTEGER}"); } @@ -534,12 +540,16 @@ public class OutRechargeOrderSqlProvider { sql.SET("operator_type = #{operatorType,jdbcType=INTEGER}"); } + if (record.getRechargePrice() != null) { + sql.SET("recharge_price = #{rechargePrice,jdbcType=DECIMAL}"); + } + if (record.getOrderNo() != null) { sql.SET("order_no = #{orderNo,jdbcType=VARCHAR}"); } - if (record.getRechargeType() != null) { - sql.SET("recharge_type = #{rechargeType,jdbcType=INTEGER}"); + if (record.getChildOrderNo() != null) { + sql.SET("child_order_no = #{childOrderNo,jdbcType=VARCHAR}"); } if (record.getMemDiscountId() != null) { @@ -562,14 +572,6 @@ public class OutRechargeOrderSqlProvider { sql.SET("user_phone = #{userPhone,jdbcType=VARCHAR}"); } - if (record.getGoodsId() != null) { - sql.SET("goods_id = #{goodsId,jdbcType=BIGINT}"); - } - - if (record.getRechargeContent() != null) { - sql.SET("recharge_content = #{rechargeContent,jdbcType=VARCHAR}"); - } - if (record.getPayType() != null) { sql.SET("pay_type = #{payType,jdbcType=INTEGER}"); } @@ -594,6 +596,10 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_price = #{payPrice,jdbcType=DECIMAL}"); } + if (record.getOrderPrice() != null) { + sql.SET("order_price = #{orderPrice,jdbcType=DECIMAL}"); + } + if (record.getPayRealPrice() != null) { sql.SET("pay_real_price = #{payRealPrice,jdbcType=DECIMAL}"); } @@ -602,6 +608,18 @@ public class OutRechargeOrderSqlProvider { sql.SET("pay_serial_no = #{paySerialNo,jdbcType=VARCHAR}"); } + if (record.getPayStatus() != null) { + sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeStatus() != null) { + sql.SET("recharge_status = #{rechargeStatus,jdbcType=INTEGER}"); + } + + if (record.getRechargeName() != null) { + sql.SET("recharge_name = #{rechargeName,jdbcType=VARCHAR}"); + } + if (record.getCreateTimed() != null) { sql.SET("create_timed = #{createTimed,jdbcType=TIMESTAMP}"); } @@ -618,12 +636,12 @@ public class OutRechargeOrderSqlProvider { sql.SET("finish_time = #{finishTime,jdbcType=TIMESTAMP}"); } - if (record.getOutRefundNo() != null) { - sql.SET("out_refund_no = #{outRefundNo,jdbcType=VARCHAR}"); + if (record.getRemarks() != null) { + sql.SET("remarks = #{remarks,jdbcType=VARCHAR}"); } - if (record.getOrderPrice() != null) { - sql.SET("order_price = #{orderPrice,jdbcType=DECIMAL}"); + if (record.getOutRefundNo() != null) { + sql.SET("out_refund_no = #{outRefundNo,jdbcType=VARCHAR}"); } if (record.getRefundTime() != null) { @@ -642,20 +660,20 @@ public class OutRechargeOrderSqlProvider { sql.SET("refund_fee = #{refundFee,jdbcType=DECIMAL}"); } - if (record.getCompanyId() != null) { - sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); + if (record.getAgentKey() != null) { + sql.SET("agent_key = #{agentKey,jdbcType=VARCHAR}"); } - if (record.getPayStatus() != null) { - sql.SET("pay_status = #{payStatus,jdbcType=INTEGER}"); + if (record.getObjectId() != null) { + sql.SET("object_id = #{objectId,jdbcType=INTEGER}"); } - if (record.getMerchId() != null) { - sql.SET("merch_id = #{merchId,jdbcType=VARCHAR}"); + if (record.getRechargeType() != null) { + sql.SET("recharge_type = #{rechargeType,jdbcType=INTEGER}"); } - if (record.getRechargeStatus() != null) { - sql.SET("recharge_status = #{rechargeStatus,jdbcType=INTEGER}"); + if (record.getAbnormalMsg() != null) { + sql.SET("abnormal_msg = #{abnormalMsg,jdbcType=VARCHAR}"); } if (record.getExt1() != null) { @@ -670,24 +688,20 @@ public class OutRechargeOrderSqlProvider { sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); } - if (record.getRechargeName() != null) { - sql.SET("recharge_name = #{rechargeName,jdbcType=VARCHAR}"); - } - - if (record.getRemarks() != null) { - sql.SET("remarks = #{remarks,jdbcType=VARCHAR}"); + if (record.getGoodsId() != null) { + sql.SET("goods_id = #{goodsId,jdbcType=BIGINT}"); } - if (record.getAgentKey() != null) { - sql.SET("agent_key = #{agentKey,jdbcType=VARCHAR}"); + if (record.getRechargeContent() != null) { + sql.SET("recharge_content = #{rechargeContent,jdbcType=VARCHAR}"); } - if (record.getObjectId() != null) { - sql.SET("object_id = #{objectId,jdbcType=BIGINT}"); + if (record.getCompanyId() != null) { + sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); } - if (record.getAbnormalMsg() != null) { - sql.SET("abnormal_msg = #{abnormalMsg,jdbcType=VARCHAR}"); + if (record.getMerchId() != null) { + sql.SET("merch_id = #{merchId,jdbcType=VARCHAR}"); } if (record.getWhetherRebate() != 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 6bc226e1..0222c816 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java @@ -19,11 +19,6 @@ public class OutRechargeOrder implements Serializable { */ private Long id; - /** - * 充值金额 - */ - private BigDecimal rechargePrice; - /** * 类型:1 话费充值 */ @@ -39,15 +34,20 @@ public class OutRechargeOrder implements Serializable { */ private Integer operatorType; + /** + * 充值金额 + */ + private BigDecimal rechargePrice; + /** * 充值订单号 */ private String orderNo; /** - * 1:快充 2:慢充 + * 子订单号 订单号 */ - private Integer rechargeType; + private String childOrderNo; /** * 用户的优惠券high_discount_user_rel表的id @@ -74,16 +74,6 @@ public class OutRechargeOrder implements Serializable { */ private String userPhone; - /** - * 商品ID - */ - private Long goodsId; - - /** - * 充值内容(电话号码, 卡号) - */ - private String rechargeContent; - /** * 1:支付宝 2:微信 3:汇联通工会卡 4:银联 5:银联分期 */ @@ -114,6 +104,11 @@ public class OutRechargeOrder implements Serializable { */ private BigDecimal payPrice; + /** + * 订单充值金额 + */ + private BigDecimal orderPrice; + /** * 实际金额 */ @@ -124,6 +119,21 @@ public class OutRechargeOrder implements Serializable { */ private String paySerialNo; + /** + * 订单支付状态 : 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款 + */ + private Integer payStatus; + + /** + * 充值状态:201:充值中 202:充值成功 203:充值失败 204:未充值 + */ + private Integer rechargeStatus; + + /** + * 中石油需要的持卡人姓名 + */ + private String rechargeName; + /** * 生成时间 */ @@ -145,14 +155,14 @@ public class OutRechargeOrder implements Serializable { private Date finishTime; /** - * 退款订单号 + * 备注 */ - private String outRefundNo; + private String remarks; /** - * 订单金额 + * 退款订单号 */ - private BigDecimal orderPrice; + private String outRefundNo; /** * 退款时间 @@ -175,24 +185,21 @@ public class OutRechargeOrder implements Serializable { private BigDecimal refundFee; /** - * 公司id + * 代理商编号 */ - private Long companyId; + private String agentKey; - /** - * 订单支付状态 : 101.待支付 102.已支付 100.已完成 104.已取消 105.已退款 - */ - private Integer payStatus; + private Integer objectId; /** - * 商户号 + * 1:快充 2:慢充 */ - private String merchId; + private Integer rechargeType; /** - * 充值状态:201:充值中 202:充值成功 203:充值失败 204:未充值 + * 异常信息 */ - private Integer rechargeStatus; + private String abnormalMsg; private String ext1; @@ -200,19 +207,26 @@ public class OutRechargeOrder implements Serializable { private String ext3; - private String rechargeName; - - private String remarks; - - private String agentKey; + /** + * 产品id + */ + private Long goodsId; - private Long objectId; + /** + * 充值内容(电话号码, 卡号) + */ + private String rechargeContent; - private String abnormalMsg; + /** + * 公司id + */ + private Long companyId; /** - * 是否返利 + * 商户号 */ + private String merchId; + private Boolean whetherRebate; private static final long serialVersionUID = 1L; @@ -225,14 +239,6 @@ public class OutRechargeOrder implements Serializable { this.id = id; } - public BigDecimal getRechargePrice() { - return rechargePrice; - } - - public void setRechargePrice(BigDecimal rechargePrice) { - this.rechargePrice = rechargePrice; - } - public Integer getType() { return type; } @@ -257,6 +263,14 @@ public class OutRechargeOrder implements Serializable { this.operatorType = operatorType; } + public BigDecimal getRechargePrice() { + return rechargePrice; + } + + public void setRechargePrice(BigDecimal rechargePrice) { + this.rechargePrice = rechargePrice; + } + public String getOrderNo() { return orderNo; } @@ -265,12 +279,12 @@ public class OutRechargeOrder implements Serializable { this.orderNo = orderNo; } - public Integer getRechargeType() { - return rechargeType; + public String getChildOrderNo() { + return childOrderNo; } - public void setRechargeType(Integer rechargeType) { - this.rechargeType = rechargeType; + public void setChildOrderNo(String childOrderNo) { + this.childOrderNo = childOrderNo; } public Long getMemDiscountId() { @@ -313,22 +327,6 @@ public class OutRechargeOrder implements Serializable { this.userPhone = userPhone; } - public Long getGoodsId() { - return goodsId; - } - - public void setGoodsId(Long goodsId) { - this.goodsId = goodsId; - } - - public String getRechargeContent() { - return rechargeContent; - } - - public void setRechargeContent(String rechargeContent) { - this.rechargeContent = rechargeContent; - } - public Integer getPayType() { return payType; } @@ -377,6 +375,14 @@ public class OutRechargeOrder implements Serializable { this.payPrice = payPrice; } + public BigDecimal getOrderPrice() { + return orderPrice; + } + + public void setOrderPrice(BigDecimal orderPrice) { + this.orderPrice = orderPrice; + } + public BigDecimal getPayRealPrice() { return payRealPrice; } @@ -393,6 +399,30 @@ public class OutRechargeOrder implements Serializable { this.paySerialNo = paySerialNo; } + public Integer getPayStatus() { + return payStatus; + } + + public void setPayStatus(Integer payStatus) { + this.payStatus = payStatus; + } + + public Integer getRechargeStatus() { + return rechargeStatus; + } + + public void setRechargeStatus(Integer rechargeStatus) { + this.rechargeStatus = rechargeStatus; + } + + public String getRechargeName() { + return rechargeName; + } + + public void setRechargeName(String rechargeName) { + this.rechargeName = rechargeName; + } + public Date getCreateTimed() { return createTimed; } @@ -425,20 +455,20 @@ public class OutRechargeOrder implements Serializable { this.finishTime = finishTime; } - public String getOutRefundNo() { - return outRefundNo; + public String getRemarks() { + return remarks; } - public void setOutRefundNo(String outRefundNo) { - this.outRefundNo = outRefundNo; + public void setRemarks(String remarks) { + this.remarks = remarks; } - public BigDecimal getOrderPrice() { - return orderPrice; + public String getOutRefundNo() { + return outRefundNo; } - public void setOrderPrice(BigDecimal orderPrice) { - this.orderPrice = orderPrice; + public void setOutRefundNo(String outRefundNo) { + this.outRefundNo = outRefundNo; } public Date getRefundTime() { @@ -473,36 +503,36 @@ public class OutRechargeOrder implements Serializable { this.refundFee = refundFee; } - public Long getCompanyId() { - return companyId; + public String getAgentKey() { + return agentKey; } - public void setCompanyId(Long companyId) { - this.companyId = companyId; + public void setAgentKey(String agentKey) { + this.agentKey = agentKey; } - public Integer getPayStatus() { - return payStatus; + public Integer getObjectId() { + return objectId; } - public void setPayStatus(Integer payStatus) { - this.payStatus = payStatus; + public void setObjectId(Integer objectId) { + this.objectId = objectId; } - public String getMerchId() { - return merchId; + public Integer getRechargeType() { + return rechargeType; } - public void setMerchId(String merchId) { - this.merchId = merchId; + public void setRechargeType(Integer rechargeType) { + this.rechargeType = rechargeType; } - public Integer getRechargeStatus() { - return rechargeStatus; + public String getAbnormalMsg() { + return abnormalMsg; } - public void setRechargeStatus(Integer rechargeStatus) { - this.rechargeStatus = rechargeStatus; + public void setAbnormalMsg(String abnormalMsg) { + this.abnormalMsg = abnormalMsg; } public String getExt1() { @@ -529,44 +559,36 @@ public class OutRechargeOrder implements Serializable { this.ext3 = ext3; } - public String getRechargeName() { - return rechargeName; - } - - public void setRechargeName(String rechargeName) { - this.rechargeName = rechargeName; - } - - public String getRemarks() { - return remarks; + public Long getGoodsId() { + return goodsId; } - public void setRemarks(String remarks) { - this.remarks = remarks; + public void setGoodsId(Long goodsId) { + this.goodsId = goodsId; } - public String getAgentKey() { - return agentKey; + public String getRechargeContent() { + return rechargeContent; } - public void setAgentKey(String agentKey) { - this.agentKey = agentKey; + public void setRechargeContent(String rechargeContent) { + this.rechargeContent = rechargeContent; } - public Long getObjectId() { - return objectId; + public Long getCompanyId() { + return companyId; } - public void setObjectId(Long objectId) { - this.objectId = objectId; + public void setCompanyId(Long companyId) { + this.companyId = companyId; } - public String getAbnormalMsg() { - return abnormalMsg; + public String getMerchId() { + return merchId; } - public void setAbnormalMsg(String abnormalMsg) { - this.abnormalMsg = abnormalMsg; + public void setMerchId(String merchId) { + this.merchId = merchId; } public Boolean getWhetherRebate() { @@ -590,49 +612,50 @@ public class OutRechargeOrder implements Serializable { } OutRechargeOrder other = (OutRechargeOrder) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getRechargePrice() == null ? other.getRechargePrice() == null : this.getRechargePrice().equals(other.getRechargePrice())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getOperatorName() == null ? other.getOperatorName() == null : this.getOperatorName().equals(other.getOperatorName())) && (this.getOperatorType() == null ? other.getOperatorType() == null : this.getOperatorType().equals(other.getOperatorType())) + && (this.getRechargePrice() == null ? other.getRechargePrice() == null : this.getRechargePrice().equals(other.getRechargePrice())) && (this.getOrderNo() == null ? other.getOrderNo() == null : this.getOrderNo().equals(other.getOrderNo())) - && (this.getRechargeType() == null ? other.getRechargeType() == null : this.getRechargeType().equals(other.getRechargeType())) + && (this.getChildOrderNo() == null ? other.getChildOrderNo() == null : this.getChildOrderNo().equals(other.getChildOrderNo())) && (this.getMemDiscountId() == null ? other.getMemDiscountId() == null : this.getMemDiscountId().equals(other.getMemDiscountId())) && (this.getMemDiscountName() == null ? other.getMemDiscountName() == null : this.getMemDiscountName().equals(other.getMemDiscountName())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getUserName() == null ? other.getUserName() == null : this.getUserName().equals(other.getUserName())) && (this.getUserPhone() == null ? other.getUserPhone() == null : this.getUserPhone().equals(other.getUserPhone())) - && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) - && (this.getRechargeContent() == null ? other.getRechargeContent() == null : this.getRechargeContent().equals(other.getRechargeContent())) && (this.getPayType() == null ? other.getPayType() == null : this.getPayType().equals(other.getPayType())) && (this.getLaborUnionCard() == null ? other.getLaborUnionCard() == null : this.getLaborUnionCard().equals(other.getLaborUnionCard())) && (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.getOrderPrice() == null ? other.getOrderPrice() == null : this.getOrderPrice().equals(other.getOrderPrice())) && (this.getPayRealPrice() == null ? other.getPayRealPrice() == null : this.getPayRealPrice().equals(other.getPayRealPrice())) && (this.getPaySerialNo() == null ? other.getPaySerialNo() == null : this.getPaySerialNo().equals(other.getPaySerialNo())) + && (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus())) + && (this.getRechargeStatus() == null ? other.getRechargeStatus() == null : this.getRechargeStatus().equals(other.getRechargeStatus())) + && (this.getRechargeName() == null ? other.getRechargeName() == null : this.getRechargeName().equals(other.getRechargeName())) && (this.getCreateTimed() == null ? other.getCreateTimed() == null : this.getCreateTimed().equals(other.getCreateTimed())) && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) && (this.getCancelTime() == null ? other.getCancelTime() == null : this.getCancelTime().equals(other.getCancelTime())) && (this.getFinishTime() == null ? other.getFinishTime() == null : this.getFinishTime().equals(other.getFinishTime())) + && (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks())) && (this.getOutRefundNo() == null ? other.getOutRefundNo() == null : this.getOutRefundNo().equals(other.getOutRefundNo())) - && (this.getOrderPrice() == null ? other.getOrderPrice() == null : this.getOrderPrice().equals(other.getOrderPrice())) && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) && (this.getTpRefundOrderNo() == null ? other.getTpRefundOrderNo() == null : this.getTpRefundOrderNo().equals(other.getTpRefundOrderNo())) && (this.getRefundId() == null ? other.getRefundId() == null : this.getRefundId().equals(other.getRefundId())) && (this.getRefundFee() == null ? other.getRefundFee() == null : this.getRefundFee().equals(other.getRefundFee())) - && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) - && (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus())) - && (this.getMerchId() == null ? other.getMerchId() == null : this.getMerchId().equals(other.getMerchId())) - && (this.getRechargeStatus() == null ? other.getRechargeStatus() == null : this.getRechargeStatus().equals(other.getRechargeStatus())) - && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) - && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) - && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())) - && (this.getRechargeName() == null ? other.getRechargeName() == null : this.getRechargeName().equals(other.getRechargeName())) - && (this.getRemarks() == null ? other.getRemarks() == null : this.getRemarks().equals(other.getRemarks())) && (this.getAgentKey() == null ? other.getAgentKey() == null : this.getAgentKey().equals(other.getAgentKey())) && (this.getObjectId() == null ? other.getObjectId() == null : this.getObjectId().equals(other.getObjectId())) + && (this.getRechargeType() == null ? other.getRechargeType() == null : this.getRechargeType().equals(other.getRechargeType())) && (this.getAbnormalMsg() == null ? other.getAbnormalMsg() == null : this.getAbnormalMsg().equals(other.getAbnormalMsg())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())) + && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) + && (this.getRechargeContent() == null ? other.getRechargeContent() == null : this.getRechargeContent().equals(other.getRechargeContent())) + && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) + && (this.getMerchId() == null ? other.getMerchId() == null : this.getMerchId().equals(other.getMerchId())) && (this.getWhetherRebate() == null ? other.getWhetherRebate() == null : this.getWhetherRebate().equals(other.getWhetherRebate())); } @@ -641,49 +664,50 @@ public class OutRechargeOrder implements Serializable { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getRechargePrice() == null) ? 0 : getRechargePrice().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getOperatorName() == null) ? 0 : getOperatorName().hashCode()); result = prime * result + ((getOperatorType() == null) ? 0 : getOperatorType().hashCode()); + result = prime * result + ((getRechargePrice() == null) ? 0 : getRechargePrice().hashCode()); result = prime * result + ((getOrderNo() == null) ? 0 : getOrderNo().hashCode()); - result = prime * result + ((getRechargeType() == null) ? 0 : getRechargeType().hashCode()); + result = prime * result + ((getChildOrderNo() == null) ? 0 : getChildOrderNo().hashCode()); result = prime * result + ((getMemDiscountId() == null) ? 0 : getMemDiscountId().hashCode()); result = prime * result + ((getMemDiscountName() == null) ? 0 : getMemDiscountName().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getUserName() == null) ? 0 : getUserName().hashCode()); result = prime * result + ((getUserPhone() == null) ? 0 : getUserPhone().hashCode()); - result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); - result = prime * result + ((getRechargeContent() == null) ? 0 : getRechargeContent().hashCode()); result = prime * result + ((getPayType() == null) ? 0 : getPayType().hashCode()); result = prime * result + ((getLaborUnionCard() == null) ? 0 : getLaborUnionCard().hashCode()); 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 + ((getOrderPrice() == null) ? 0 : getOrderPrice().hashCode()); result = prime * result + ((getPayRealPrice() == null) ? 0 : getPayRealPrice().hashCode()); result = prime * result + ((getPaySerialNo() == null) ? 0 : getPaySerialNo().hashCode()); + result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode()); + result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().hashCode()); + result = prime * result + ((getRechargeName() == null) ? 0 : getRechargeName().hashCode()); result = prime * result + ((getCreateTimed() == null) ? 0 : getCreateTimed().hashCode()); result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); result = prime * result + ((getCancelTime() == null) ? 0 : getCancelTime().hashCode()); result = prime * result + ((getFinishTime() == null) ? 0 : getFinishTime().hashCode()); + result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode()); result = prime * result + ((getOutRefundNo() == null) ? 0 : getOutRefundNo().hashCode()); - result = prime * result + ((getOrderPrice() == null) ? 0 : getOrderPrice().hashCode()); result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); result = prime * result + ((getTpRefundOrderNo() == null) ? 0 : getTpRefundOrderNo().hashCode()); result = prime * result + ((getRefundId() == null) ? 0 : getRefundId().hashCode()); result = prime * result + ((getRefundFee() == null) ? 0 : getRefundFee().hashCode()); - result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); - result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode()); - result = prime * result + ((getMerchId() == null) ? 0 : getMerchId().hashCode()); - result = prime * result + ((getRechargeStatus() == null) ? 0 : getRechargeStatus().hashCode()); - result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); - result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); - result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); - result = prime * result + ((getRechargeName() == null) ? 0 : getRechargeName().hashCode()); - result = prime * result + ((getRemarks() == null) ? 0 : getRemarks().hashCode()); result = prime * result + ((getAgentKey() == null) ? 0 : getAgentKey().hashCode()); result = prime * result + ((getObjectId() == null) ? 0 : getObjectId().hashCode()); + result = prime * result + ((getRechargeType() == null) ? 0 : getRechargeType().hashCode()); result = prime * result + ((getAbnormalMsg() == null) ? 0 : getAbnormalMsg().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); + result = prime * result + ((getRechargeContent() == null) ? 0 : getRechargeContent().hashCode()); + result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); + result = prime * result + ((getMerchId() == null) ? 0 : getMerchId().hashCode()); result = prime * result + ((getWhetherRebate() == null) ? 0 : getWhetherRebate().hashCode()); return result; } @@ -695,49 +719,50 @@ public class OutRechargeOrder implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", rechargePrice=").append(rechargePrice); sb.append(", type=").append(type); sb.append(", operatorName=").append(operatorName); sb.append(", operatorType=").append(operatorType); + sb.append(", rechargePrice=").append(rechargePrice); sb.append(", orderNo=").append(orderNo); - sb.append(", rechargeType=").append(rechargeType); + sb.append(", childOrderNo=").append(childOrderNo); sb.append(", memDiscountId=").append(memDiscountId); sb.append(", memDiscountName=").append(memDiscountName); sb.append(", userId=").append(userId); sb.append(", userName=").append(userName); sb.append(", userPhone=").append(userPhone); - sb.append(", goodsId=").append(goodsId); - sb.append(", rechargeContent=").append(rechargeContent); sb.append(", payType=").append(payType); sb.append(", laborUnionCard=").append(laborUnionCard); sb.append(", integralNum=").append(integralNum); sb.append(", discountDeductionPrice=").append(discountDeductionPrice); sb.append(", integralDeductionPrice=").append(integralDeductionPrice); sb.append(", payPrice=").append(payPrice); + sb.append(", orderPrice=").append(orderPrice); sb.append(", payRealPrice=").append(payRealPrice); sb.append(", paySerialNo=").append(paySerialNo); + sb.append(", payStatus=").append(payStatus); + sb.append(", rechargeStatus=").append(rechargeStatus); + sb.append(", rechargeName=").append(rechargeName); sb.append(", createTimed=").append(createTimed); sb.append(", payTime=").append(payTime); sb.append(", cancelTime=").append(cancelTime); sb.append(", finishTime=").append(finishTime); + sb.append(", remarks=").append(remarks); sb.append(", outRefundNo=").append(outRefundNo); - sb.append(", orderPrice=").append(orderPrice); sb.append(", refundTime=").append(refundTime); sb.append(", tpRefundOrderNo=").append(tpRefundOrderNo); sb.append(", refundId=").append(refundId); sb.append(", refundFee=").append(refundFee); - sb.append(", companyId=").append(companyId); - sb.append(", payStatus=").append(payStatus); - sb.append(", merchId=").append(merchId); - sb.append(", rechargeStatus=").append(rechargeStatus); - sb.append(", ext1=").append(ext1); - sb.append(", ext2=").append(ext2); - sb.append(", ext3=").append(ext3); - sb.append(", rechargeName=").append(rechargeName); - sb.append(", remarks=").append(remarks); sb.append(", agentKey=").append(agentKey); sb.append(", objectId=").append(objectId); + sb.append(", rechargeType=").append(rechargeType); sb.append(", abnormalMsg=").append(abnormalMsg); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", goodsId=").append(goodsId); + sb.append(", rechargeContent=").append(rechargeContent); + sb.append(", companyId=").append(companyId); + sb.append(", merchId=").append(merchId); sb.append(", whetherRebate=").append(whetherRebate); sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); 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 e7cba03f..80e790c8 100644 --- a/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java +++ b/hai-service/src/main/java/com/hai/entity/OutRechargeOrderExample.java @@ -186,66 +186,6 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andRechargePriceIsNull() { - addCriterion("recharge_price is null"); - return (Criteria) this; - } - - public Criteria andRechargePriceIsNotNull() { - addCriterion("recharge_price is not null"); - return (Criteria) this; - } - - public Criteria andRechargePriceEqualTo(BigDecimal value) { - addCriterion("recharge_price =", value, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceNotEqualTo(BigDecimal value) { - addCriterion("recharge_price <>", value, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceGreaterThan(BigDecimal value) { - addCriterion("recharge_price >", value, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("recharge_price >=", value, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceLessThan(BigDecimal value) { - addCriterion("recharge_price <", value, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("recharge_price <=", value, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceIn(List values) { - addCriterion("recharge_price in", values, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceNotIn(List values) { - addCriterion("recharge_price not in", values, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("recharge_price between", value1, value2, "rechargePrice"); - return (Criteria) this; - } - - public Criteria andRechargePriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("recharge_price not between", value1, value2, "rechargePrice"); - return (Criteria) this; - } - public Criteria andTypeIsNull() { addCriterion("`type` is null"); return (Criteria) this; @@ -436,6 +376,66 @@ public class OutRechargeOrderExample { return (Criteria) this; } + public Criteria andRechargePriceIsNull() { + addCriterion("recharge_price is null"); + return (Criteria) this; + } + + public Criteria andRechargePriceIsNotNull() { + addCriterion("recharge_price is not null"); + return (Criteria) this; + } + + public Criteria andRechargePriceEqualTo(BigDecimal value) { + addCriterion("recharge_price =", value, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceNotEqualTo(BigDecimal value) { + addCriterion("recharge_price <>", value, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceGreaterThan(BigDecimal value) { + addCriterion("recharge_price >", value, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("recharge_price >=", value, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceLessThan(BigDecimal value) { + addCriterion("recharge_price <", value, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("recharge_price <=", value, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceIn(List values) { + addCriterion("recharge_price in", values, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceNotIn(List values) { + addCriterion("recharge_price not in", values, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("recharge_price between", value1, value2, "rechargePrice"); + return (Criteria) this; + } + + public Criteria andRechargePriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("recharge_price not between", value1, value2, "rechargePrice"); + return (Criteria) this; + } + public Criteria andOrderNoIsNull() { addCriterion("order_no is null"); return (Criteria) this; @@ -506,63 +506,73 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andRechargeTypeIsNull() { - addCriterion("recharge_type is null"); + public Criteria andChildOrderNoIsNull() { + addCriterion("child_order_no is null"); return (Criteria) this; } - public Criteria andRechargeTypeIsNotNull() { - addCriterion("recharge_type is not null"); + public Criteria andChildOrderNoIsNotNull() { + addCriterion("child_order_no is not null"); return (Criteria) this; } - public Criteria andRechargeTypeEqualTo(Integer value) { - addCriterion("recharge_type =", value, "rechargeType"); + public Criteria andChildOrderNoEqualTo(String value) { + addCriterion("child_order_no =", value, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeNotEqualTo(Integer value) { - addCriterion("recharge_type <>", value, "rechargeType"); + public Criteria andChildOrderNoNotEqualTo(String value) { + addCriterion("child_order_no <>", value, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeGreaterThan(Integer value) { - addCriterion("recharge_type >", value, "rechargeType"); + public Criteria andChildOrderNoGreaterThan(String value) { + addCriterion("child_order_no >", value, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("recharge_type >=", value, "rechargeType"); + public Criteria andChildOrderNoGreaterThanOrEqualTo(String value) { + addCriterion("child_order_no >=", value, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeLessThan(Integer value) { - addCriterion("recharge_type <", value, "rechargeType"); + public Criteria andChildOrderNoLessThan(String value) { + addCriterion("child_order_no <", value, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeLessThanOrEqualTo(Integer value) { - addCriterion("recharge_type <=", value, "rechargeType"); + public Criteria andChildOrderNoLessThanOrEqualTo(String value) { + addCriterion("child_order_no <=", value, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeIn(List values) { - addCriterion("recharge_type in", values, "rechargeType"); + public Criteria andChildOrderNoLike(String value) { + addCriterion("child_order_no like", value, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeNotIn(List values) { - addCriterion("recharge_type not in", values, "rechargeType"); + public Criteria andChildOrderNoNotLike(String value) { + addCriterion("child_order_no not like", value, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeBetween(Integer value1, Integer value2) { - addCriterion("recharge_type between", value1, value2, "rechargeType"); + public Criteria andChildOrderNoIn(List values) { + addCriterion("child_order_no in", values, "childOrderNo"); return (Criteria) this; } - public Criteria andRechargeTypeNotBetween(Integer value1, Integer value2) { - addCriterion("recharge_type not between", value1, value2, "rechargeType"); + public Criteria andChildOrderNoNotIn(List values) { + addCriterion("child_order_no not in", values, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoBetween(String value1, String value2) { + addCriterion("child_order_no between", value1, value2, "childOrderNo"); + return (Criteria) this; + } + + public Criteria andChildOrderNoNotBetween(String value1, String value2) { + addCriterion("child_order_no not between", value1, value2, "childOrderNo"); return (Criteria) this; } @@ -896,263 +906,133 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andGoodsIdIsNull() { - addCriterion("goods_id is null"); + public Criteria andPayTypeIsNull() { + addCriterion("pay_type is null"); return (Criteria) this; } - public Criteria andGoodsIdIsNotNull() { - addCriterion("goods_id is not null"); + public Criteria andPayTypeIsNotNull() { + addCriterion("pay_type is not null"); return (Criteria) this; } - public Criteria andGoodsIdEqualTo(Long value) { - addCriterion("goods_id =", value, "goodsId"); + public Criteria andPayTypeEqualTo(Integer value) { + addCriterion("pay_type =", value, "payType"); return (Criteria) this; } - public Criteria andGoodsIdNotEqualTo(Long value) { - addCriterion("goods_id <>", value, "goodsId"); + public Criteria andPayTypeNotEqualTo(Integer value) { + addCriterion("pay_type <>", value, "payType"); return (Criteria) this; } - public Criteria andGoodsIdGreaterThan(Long value) { - addCriterion("goods_id >", value, "goodsId"); + public Criteria andPayTypeGreaterThan(Integer value) { + addCriterion("pay_type >", value, "payType"); return (Criteria) this; } - public Criteria andGoodsIdGreaterThanOrEqualTo(Long value) { - addCriterion("goods_id >=", value, "goodsId"); + public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_type >=", value, "payType"); return (Criteria) this; } - public Criteria andGoodsIdLessThan(Long value) { - addCriterion("goods_id <", value, "goodsId"); + public Criteria andPayTypeLessThan(Integer value) { + addCriterion("pay_type <", value, "payType"); return (Criteria) this; } - public Criteria andGoodsIdLessThanOrEqualTo(Long value) { - addCriterion("goods_id <=", value, "goodsId"); + public Criteria andPayTypeLessThanOrEqualTo(Integer value) { + addCriterion("pay_type <=", value, "payType"); return (Criteria) this; } - public Criteria andGoodsIdIn(List values) { - addCriterion("goods_id in", values, "goodsId"); + public Criteria andPayTypeIn(List values) { + addCriterion("pay_type in", values, "payType"); return (Criteria) this; } - public Criteria andGoodsIdNotIn(List values) { - addCriterion("goods_id not in", values, "goodsId"); + public Criteria andPayTypeNotIn(List values) { + addCriterion("pay_type not in", values, "payType"); return (Criteria) this; } - public Criteria andGoodsIdBetween(Long value1, Long value2) { - addCriterion("goods_id between", value1, value2, "goodsId"); + public Criteria andPayTypeBetween(Integer value1, Integer value2) { + addCriterion("pay_type between", value1, value2, "payType"); return (Criteria) this; } - public Criteria andGoodsIdNotBetween(Long value1, Long value2) { - addCriterion("goods_id not between", value1, value2, "goodsId"); + public Criteria andPayTypeNotBetween(Integer value1, Integer value2) { + addCriterion("pay_type not between", value1, value2, "payType"); return (Criteria) this; } - public Criteria andRechargeContentIsNull() { - addCriterion("recharge_content is null"); + public Criteria andLaborUnionCardIsNull() { + addCriterion("labor_union_card is null"); return (Criteria) this; } - public Criteria andRechargeContentIsNotNull() { - addCriterion("recharge_content is not null"); + public Criteria andLaborUnionCardIsNotNull() { + addCriterion("labor_union_card is not null"); return (Criteria) this; } - public Criteria andRechargeContentEqualTo(String value) { - addCriterion("recharge_content =", value, "rechargeContent"); + public Criteria andLaborUnionCardEqualTo(String value) { + addCriterion("labor_union_card =", value, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentNotEqualTo(String value) { - addCriterion("recharge_content <>", value, "rechargeContent"); + public Criteria andLaborUnionCardNotEqualTo(String value) { + addCriterion("labor_union_card <>", value, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentGreaterThan(String value) { - addCriterion("recharge_content >", value, "rechargeContent"); + public Criteria andLaborUnionCardGreaterThan(String value) { + addCriterion("labor_union_card >", value, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentGreaterThanOrEqualTo(String value) { - addCriterion("recharge_content >=", value, "rechargeContent"); + public Criteria andLaborUnionCardGreaterThanOrEqualTo(String value) { + addCriterion("labor_union_card >=", value, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentLessThan(String value) { - addCriterion("recharge_content <", value, "rechargeContent"); + public Criteria andLaborUnionCardLessThan(String value) { + addCriterion("labor_union_card <", value, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentLessThanOrEqualTo(String value) { - addCriterion("recharge_content <=", value, "rechargeContent"); + public Criteria andLaborUnionCardLessThanOrEqualTo(String value) { + addCriterion("labor_union_card <=", value, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentLike(String value) { - addCriterion("recharge_content like", value, "rechargeContent"); + public Criteria andLaborUnionCardLike(String value) { + addCriterion("labor_union_card like", value, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentNotLike(String value) { - addCriterion("recharge_content not like", value, "rechargeContent"); + public Criteria andLaborUnionCardNotLike(String value) { + addCriterion("labor_union_card not like", value, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentIn(List values) { - addCriterion("recharge_content in", values, "rechargeContent"); + public Criteria andLaborUnionCardIn(List values) { + addCriterion("labor_union_card in", values, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentNotIn(List values) { - addCriterion("recharge_content not in", values, "rechargeContent"); + public Criteria andLaborUnionCardNotIn(List values) { + addCriterion("labor_union_card not in", values, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentBetween(String value1, String value2) { - addCriterion("recharge_content between", value1, value2, "rechargeContent"); + public Criteria andLaborUnionCardBetween(String value1, String value2) { + addCriterion("labor_union_card between", value1, value2, "laborUnionCard"); return (Criteria) this; } - public Criteria andRechargeContentNotBetween(String value1, String value2) { - addCriterion("recharge_content not between", value1, value2, "rechargeContent"); - return (Criteria) this; - } - - public Criteria andPayTypeIsNull() { - addCriterion("pay_type is null"); - return (Criteria) this; - } - - public Criteria andPayTypeIsNotNull() { - addCriterion("pay_type is not null"); - return (Criteria) this; - } - - public Criteria andPayTypeEqualTo(Integer value) { - addCriterion("pay_type =", value, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeNotEqualTo(Integer value) { - addCriterion("pay_type <>", value, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeGreaterThan(Integer value) { - addCriterion("pay_type >", value, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("pay_type >=", value, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeLessThan(Integer value) { - addCriterion("pay_type <", value, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeLessThanOrEqualTo(Integer value) { - addCriterion("pay_type <=", value, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeIn(List values) { - addCriterion("pay_type in", values, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeNotIn(List values) { - addCriterion("pay_type not in", values, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeBetween(Integer value1, Integer value2) { - addCriterion("pay_type between", value1, value2, "payType"); - return (Criteria) this; - } - - public Criteria andPayTypeNotBetween(Integer value1, Integer value2) { - addCriterion("pay_type not between", value1, value2, "payType"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardIsNull() { - addCriterion("labor_union_card is null"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardIsNotNull() { - addCriterion("labor_union_card is not null"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardEqualTo(String value) { - addCriterion("labor_union_card =", value, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardNotEqualTo(String value) { - addCriterion("labor_union_card <>", value, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardGreaterThan(String value) { - addCriterion("labor_union_card >", value, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardGreaterThanOrEqualTo(String value) { - addCriterion("labor_union_card >=", value, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardLessThan(String value) { - addCriterion("labor_union_card <", value, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardLessThanOrEqualTo(String value) { - addCriterion("labor_union_card <=", value, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardLike(String value) { - addCriterion("labor_union_card like", value, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardNotLike(String value) { - addCriterion("labor_union_card not like", value, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardIn(List values) { - addCriterion("labor_union_card in", values, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardNotIn(List values) { - addCriterion("labor_union_card not in", values, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardBetween(String value1, String value2) { - addCriterion("labor_union_card between", value1, value2, "laborUnionCard"); - return (Criteria) this; - } - - public Criteria andLaborUnionCardNotBetween(String value1, String value2) { - addCriterion("labor_union_card not between", value1, value2, "laborUnionCard"); + public Criteria andLaborUnionCardNotBetween(String value1, String value2) { + addCriterion("labor_union_card not between", value1, value2, "laborUnionCard"); return (Criteria) this; } @@ -1396,6 +1276,66 @@ public class OutRechargeOrderExample { return (Criteria) this; } + public Criteria andOrderPriceIsNull() { + addCriterion("order_price is null"); + return (Criteria) this; + } + + public Criteria andOrderPriceIsNotNull() { + addCriterion("order_price is not null"); + return (Criteria) this; + } + + public Criteria andOrderPriceEqualTo(BigDecimal value) { + addCriterion("order_price =", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotEqualTo(BigDecimal value) { + addCriterion("order_price <>", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceGreaterThan(BigDecimal value) { + addCriterion("order_price >", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("order_price >=", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceLessThan(BigDecimal value) { + addCriterion("order_price <", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("order_price <=", value, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceIn(List values) { + addCriterion("order_price in", values, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotIn(List values) { + addCriterion("order_price not in", values, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("order_price between", value1, value2, "orderPrice"); + return (Criteria) this; + } + + public Criteria andOrderPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("order_price not between", value1, value2, "orderPrice"); + return (Criteria) this; + } + public Criteria andPayRealPriceIsNull() { addCriterion("pay_real_price is null"); return (Criteria) this; @@ -1526,88 +1466,278 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andCreateTimedIsNull() { - addCriterion("create_timed is null"); + public Criteria andPayStatusIsNull() { + addCriterion("pay_status is null"); return (Criteria) this; } - public Criteria andCreateTimedIsNotNull() { - addCriterion("create_timed is not null"); + public Criteria andPayStatusIsNotNull() { + addCriterion("pay_status is not null"); return (Criteria) this; } - public Criteria andCreateTimedEqualTo(Date value) { - addCriterion("create_timed =", value, "createTimed"); + public Criteria andPayStatusEqualTo(Integer value) { + addCriterion("pay_status =", value, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedNotEqualTo(Date value) { - addCriterion("create_timed <>", value, "createTimed"); + public Criteria andPayStatusNotEqualTo(Integer value) { + addCriterion("pay_status <>", value, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedGreaterThan(Date value) { - addCriterion("create_timed >", value, "createTimed"); + public Criteria andPayStatusGreaterThan(Integer value) { + addCriterion("pay_status >", value, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedGreaterThanOrEqualTo(Date value) { - addCriterion("create_timed >=", value, "createTimed"); + public Criteria andPayStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("pay_status >=", value, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedLessThan(Date value) { - addCriterion("create_timed <", value, "createTimed"); + public Criteria andPayStatusLessThan(Integer value) { + addCriterion("pay_status <", value, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedLessThanOrEqualTo(Date value) { - addCriterion("create_timed <=", value, "createTimed"); + public Criteria andPayStatusLessThanOrEqualTo(Integer value) { + addCriterion("pay_status <=", value, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedIn(List values) { - addCriterion("create_timed in", values, "createTimed"); + public Criteria andPayStatusIn(List values) { + addCriterion("pay_status in", values, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedNotIn(List values) { - addCriterion("create_timed not in", values, "createTimed"); + public Criteria andPayStatusNotIn(List values) { + addCriterion("pay_status not in", values, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedBetween(Date value1, Date value2) { - addCriterion("create_timed between", value1, value2, "createTimed"); + public Criteria andPayStatusBetween(Integer value1, Integer value2) { + addCriterion("pay_status between", value1, value2, "payStatus"); return (Criteria) this; } - public Criteria andCreateTimedNotBetween(Date value1, Date value2) { - addCriterion("create_timed not between", value1, value2, "createTimed"); + public Criteria andPayStatusNotBetween(Integer value1, Integer value2) { + addCriterion("pay_status not between", value1, value2, "payStatus"); return (Criteria) this; } - public Criteria andPayTimeIsNull() { - addCriterion("pay_time is null"); + public Criteria andRechargeStatusIsNull() { + addCriterion("recharge_status is null"); return (Criteria) this; } - public Criteria andPayTimeIsNotNull() { - addCriterion("pay_time is not null"); + public Criteria andRechargeStatusIsNotNull() { + addCriterion("recharge_status is not null"); return (Criteria) this; } - public Criteria andPayTimeEqualTo(Date value) { - addCriterion("pay_time =", value, "payTime"); + public Criteria andRechargeStatusEqualTo(Integer value) { + addCriterion("recharge_status =", value, "rechargeStatus"); return (Criteria) this; } - public Criteria andPayTimeNotEqualTo(Date value) { - addCriterion("pay_time <>", value, "payTime"); + public Criteria andRechargeStatusNotEqualTo(Integer value) { + addCriterion("recharge_status <>", value, "rechargeStatus"); return (Criteria) this; } - public Criteria andPayTimeGreaterThan(Date value) { - addCriterion("pay_time >", value, "payTime"); + public Criteria andRechargeStatusGreaterThan(Integer value) { + addCriterion("recharge_status >", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusGreaterThanOrEqualTo(Integer value) { + addCriterion("recharge_status >=", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusLessThan(Integer value) { + addCriterion("recharge_status <", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusLessThanOrEqualTo(Integer value) { + addCriterion("recharge_status <=", value, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusIn(List values) { + addCriterion("recharge_status in", values, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusNotIn(List values) { + addCriterion("recharge_status not in", values, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusBetween(Integer value1, Integer value2) { + addCriterion("recharge_status between", value1, value2, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeStatusNotBetween(Integer value1, Integer value2) { + addCriterion("recharge_status not between", value1, value2, "rechargeStatus"); + return (Criteria) this; + } + + public Criteria andRechargeNameIsNull() { + addCriterion("recharge_name is null"); + return (Criteria) this; + } + + public Criteria andRechargeNameIsNotNull() { + addCriterion("recharge_name is not null"); + return (Criteria) this; + } + + public Criteria andRechargeNameEqualTo(String value) { + addCriterion("recharge_name =", value, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameNotEqualTo(String value) { + addCriterion("recharge_name <>", value, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameGreaterThan(String value) { + addCriterion("recharge_name >", value, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameGreaterThanOrEqualTo(String value) { + addCriterion("recharge_name >=", value, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameLessThan(String value) { + addCriterion("recharge_name <", value, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameLessThanOrEqualTo(String value) { + addCriterion("recharge_name <=", value, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameLike(String value) { + addCriterion("recharge_name like", value, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameNotLike(String value) { + addCriterion("recharge_name not like", value, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameIn(List values) { + addCriterion("recharge_name in", values, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameNotIn(List values) { + addCriterion("recharge_name not in", values, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameBetween(String value1, String value2) { + addCriterion("recharge_name between", value1, value2, "rechargeName"); + return (Criteria) this; + } + + public Criteria andRechargeNameNotBetween(String value1, String value2) { + addCriterion("recharge_name not between", value1, value2, "rechargeName"); + return (Criteria) this; + } + + public Criteria andCreateTimedIsNull() { + addCriterion("create_timed is null"); + return (Criteria) this; + } + + public Criteria andCreateTimedIsNotNull() { + addCriterion("create_timed is not null"); + return (Criteria) this; + } + + public Criteria andCreateTimedEqualTo(Date value) { + addCriterion("create_timed =", value, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedNotEqualTo(Date value) { + addCriterion("create_timed <>", value, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedGreaterThan(Date value) { + addCriterion("create_timed >", value, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedGreaterThanOrEqualTo(Date value) { + addCriterion("create_timed >=", value, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedLessThan(Date value) { + addCriterion("create_timed <", value, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedLessThanOrEqualTo(Date value) { + addCriterion("create_timed <=", value, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedIn(List values) { + addCriterion("create_timed in", values, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedNotIn(List values) { + addCriterion("create_timed not in", values, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedBetween(Date value1, Date value2) { + addCriterion("create_timed between", value1, value2, "createTimed"); + return (Criteria) this; + } + + public Criteria andCreateTimedNotBetween(Date value1, Date value2) { + addCriterion("create_timed not between", value1, value2, "createTimed"); + return (Criteria) this; + } + + public Criteria andPayTimeIsNull() { + addCriterion("pay_time is null"); + return (Criteria) this; + } + + public Criteria andPayTimeIsNotNull() { + addCriterion("pay_time is not null"); + return (Criteria) this; + } + + public Criteria andPayTimeEqualTo(Date value) { + addCriterion("pay_time =", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeNotEqualTo(Date value) { + addCriterion("pay_time <>", value, "payTime"); + return (Criteria) this; + } + + public Criteria andPayTimeGreaterThan(Date value) { + addCriterion("pay_time >", value, "payTime"); return (Criteria) this; } @@ -1766,133 +1896,143 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andOutRefundNoIsNull() { - addCriterion("out_refund_no is null"); + public Criteria andRemarksIsNull() { + addCriterion("remarks is null"); return (Criteria) this; } - public Criteria andOutRefundNoIsNotNull() { - addCriterion("out_refund_no is not null"); + public Criteria andRemarksIsNotNull() { + addCriterion("remarks is not null"); return (Criteria) this; } - public Criteria andOutRefundNoEqualTo(String value) { - addCriterion("out_refund_no =", value, "outRefundNo"); + public Criteria andRemarksEqualTo(String value) { + addCriterion("remarks =", value, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoNotEqualTo(String value) { - addCriterion("out_refund_no <>", value, "outRefundNo"); + public Criteria andRemarksNotEqualTo(String value) { + addCriterion("remarks <>", value, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoGreaterThan(String value) { - addCriterion("out_refund_no >", value, "outRefundNo"); + public Criteria andRemarksGreaterThan(String value) { + addCriterion("remarks >", value, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoGreaterThanOrEqualTo(String value) { - addCriterion("out_refund_no >=", value, "outRefundNo"); + public Criteria andRemarksGreaterThanOrEqualTo(String value) { + addCriterion("remarks >=", value, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoLessThan(String value) { - addCriterion("out_refund_no <", value, "outRefundNo"); + public Criteria andRemarksLessThan(String value) { + addCriterion("remarks <", value, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoLessThanOrEqualTo(String value) { - addCriterion("out_refund_no <=", value, "outRefundNo"); + public Criteria andRemarksLessThanOrEqualTo(String value) { + addCriterion("remarks <=", value, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoLike(String value) { - addCriterion("out_refund_no like", value, "outRefundNo"); + public Criteria andRemarksLike(String value) { + addCriterion("remarks like", value, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoNotLike(String value) { - addCriterion("out_refund_no not like", value, "outRefundNo"); + public Criteria andRemarksNotLike(String value) { + addCriterion("remarks not like", value, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoIn(List values) { - addCriterion("out_refund_no in", values, "outRefundNo"); + public Criteria andRemarksIn(List values) { + addCriterion("remarks in", values, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoNotIn(List values) { - addCriterion("out_refund_no not in", values, "outRefundNo"); + public Criteria andRemarksNotIn(List values) { + addCriterion("remarks not in", values, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoBetween(String value1, String value2) { - addCriterion("out_refund_no between", value1, value2, "outRefundNo"); + public Criteria andRemarksBetween(String value1, String value2) { + addCriterion("remarks between", value1, value2, "remarks"); return (Criteria) this; } - public Criteria andOutRefundNoNotBetween(String value1, String value2) { - addCriterion("out_refund_no not between", value1, value2, "outRefundNo"); + public Criteria andRemarksNotBetween(String value1, String value2) { + addCriterion("remarks not between", value1, value2, "remarks"); return (Criteria) this; } - public Criteria andOrderPriceIsNull() { - addCriterion("order_price is null"); + public Criteria andOutRefundNoIsNull() { + addCriterion("out_refund_no is null"); return (Criteria) this; } - public Criteria andOrderPriceIsNotNull() { - addCriterion("order_price is not null"); + public Criteria andOutRefundNoIsNotNull() { + addCriterion("out_refund_no is not null"); return (Criteria) this; } - public Criteria andOrderPriceEqualTo(BigDecimal value) { - addCriterion("order_price =", value, "orderPrice"); + public Criteria andOutRefundNoEqualTo(String value) { + addCriterion("out_refund_no =", value, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceNotEqualTo(BigDecimal value) { - addCriterion("order_price <>", value, "orderPrice"); + public Criteria andOutRefundNoNotEqualTo(String value) { + addCriterion("out_refund_no <>", value, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceGreaterThan(BigDecimal value) { - addCriterion("order_price >", value, "orderPrice"); + public Criteria andOutRefundNoGreaterThan(String value) { + addCriterion("out_refund_no >", value, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("order_price >=", value, "orderPrice"); + public Criteria andOutRefundNoGreaterThanOrEqualTo(String value) { + addCriterion("out_refund_no >=", value, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceLessThan(BigDecimal value) { - addCriterion("order_price <", value, "orderPrice"); + public Criteria andOutRefundNoLessThan(String value) { + addCriterion("out_refund_no <", value, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("order_price <=", value, "orderPrice"); + public Criteria andOutRefundNoLessThanOrEqualTo(String value) { + addCriterion("out_refund_no <=", value, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceIn(List values) { - addCriterion("order_price in", values, "orderPrice"); + public Criteria andOutRefundNoLike(String value) { + addCriterion("out_refund_no like", value, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceNotIn(List values) { - addCriterion("order_price not in", values, "orderPrice"); + public Criteria andOutRefundNoNotLike(String value) { + addCriterion("out_refund_no not like", value, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("order_price between", value1, value2, "orderPrice"); + public Criteria andOutRefundNoIn(List values) { + addCriterion("out_refund_no in", values, "outRefundNo"); return (Criteria) this; } - public Criteria andOrderPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("order_price not between", value1, value2, "orderPrice"); + public Criteria andOutRefundNoNotIn(List values) { + addCriterion("out_refund_no not in", values, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoBetween(String value1, String value2) { + addCriterion("out_refund_no between", value1, value2, "outRefundNo"); + return (Criteria) this; + } + + public Criteria andOutRefundNoNotBetween(String value1, String value2) { + addCriterion("out_refund_no not between", value1, value2, "outRefundNo"); return (Criteria) this; } @@ -2156,253 +2296,263 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andCompanyIdIsNull() { - addCriterion("company_id is null"); + public Criteria andAgentKeyIsNull() { + addCriterion("agent_key is null"); return (Criteria) this; } - public Criteria andCompanyIdIsNotNull() { - addCriterion("company_id is not null"); + public Criteria andAgentKeyIsNotNull() { + addCriterion("agent_key is not null"); return (Criteria) this; } - public Criteria andCompanyIdEqualTo(Long value) { - addCriterion("company_id =", value, "companyId"); + public Criteria andAgentKeyEqualTo(String value) { + addCriterion("agent_key =", value, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdNotEqualTo(Long value) { - addCriterion("company_id <>", value, "companyId"); + public Criteria andAgentKeyNotEqualTo(String value) { + addCriterion("agent_key <>", value, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdGreaterThan(Long value) { - addCriterion("company_id >", value, "companyId"); + public Criteria andAgentKeyGreaterThan(String value) { + addCriterion("agent_key >", value, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) { - addCriterion("company_id >=", value, "companyId"); + public Criteria andAgentKeyGreaterThanOrEqualTo(String value) { + addCriterion("agent_key >=", value, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdLessThan(Long value) { - addCriterion("company_id <", value, "companyId"); + public Criteria andAgentKeyLessThan(String value) { + addCriterion("agent_key <", value, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdLessThanOrEqualTo(Long value) { - addCriterion("company_id <=", value, "companyId"); + public Criteria andAgentKeyLessThanOrEqualTo(String value) { + addCriterion("agent_key <=", value, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdIn(List values) { - addCriterion("company_id in", values, "companyId"); + public Criteria andAgentKeyLike(String value) { + addCriterion("agent_key like", value, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdNotIn(List values) { - addCriterion("company_id not in", values, "companyId"); + public Criteria andAgentKeyNotLike(String value) { + addCriterion("agent_key not like", value, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdBetween(Long value1, Long value2) { - addCriterion("company_id between", value1, value2, "companyId"); + public Criteria andAgentKeyIn(List values) { + addCriterion("agent_key in", values, "agentKey"); return (Criteria) this; } - public Criteria andCompanyIdNotBetween(Long value1, Long value2) { - addCriterion("company_id not between", value1, value2, "companyId"); + public Criteria andAgentKeyNotIn(List values) { + addCriterion("agent_key not in", values, "agentKey"); return (Criteria) this; } - public Criteria andPayStatusIsNull() { - addCriterion("pay_status is null"); + public Criteria andAgentKeyBetween(String value1, String value2) { + addCriterion("agent_key between", value1, value2, "agentKey"); return (Criteria) this; } - public Criteria andPayStatusIsNotNull() { - addCriterion("pay_status is not null"); + public Criteria andAgentKeyNotBetween(String value1, String value2) { + addCriterion("agent_key not between", value1, value2, "agentKey"); return (Criteria) this; } - public Criteria andPayStatusEqualTo(Integer value) { - addCriterion("pay_status =", value, "payStatus"); + public Criteria andObjectIdIsNull() { + addCriterion("object_id is null"); return (Criteria) this; } - public Criteria andPayStatusNotEqualTo(Integer value) { - addCriterion("pay_status <>", value, "payStatus"); + public Criteria andObjectIdIsNotNull() { + addCriterion("object_id is not null"); return (Criteria) this; } - public Criteria andPayStatusGreaterThan(Integer value) { - addCriterion("pay_status >", value, "payStatus"); + public Criteria andObjectIdEqualTo(Integer value) { + addCriterion("object_id =", value, "objectId"); return (Criteria) this; } - public Criteria andPayStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("pay_status >=", value, "payStatus"); + public Criteria andObjectIdNotEqualTo(Integer value) { + addCriterion("object_id <>", value, "objectId"); return (Criteria) this; } - public Criteria andPayStatusLessThan(Integer value) { - addCriterion("pay_status <", value, "payStatus"); + public Criteria andObjectIdGreaterThan(Integer value) { + addCriterion("object_id >", value, "objectId"); return (Criteria) this; } - public Criteria andPayStatusLessThanOrEqualTo(Integer value) { - addCriterion("pay_status <=", value, "payStatus"); + public Criteria andObjectIdGreaterThanOrEqualTo(Integer value) { + addCriterion("object_id >=", value, "objectId"); return (Criteria) this; } - public Criteria andPayStatusIn(List values) { - addCriterion("pay_status in", values, "payStatus"); + public Criteria andObjectIdLessThan(Integer value) { + addCriterion("object_id <", value, "objectId"); return (Criteria) this; } - public Criteria andPayStatusNotIn(List values) { - addCriterion("pay_status not in", values, "payStatus"); + public Criteria andObjectIdLessThanOrEqualTo(Integer value) { + addCriterion("object_id <=", value, "objectId"); return (Criteria) this; } - public Criteria andPayStatusBetween(Integer value1, Integer value2) { - addCriterion("pay_status between", value1, value2, "payStatus"); + public Criteria andObjectIdIn(List values) { + addCriterion("object_id in", values, "objectId"); return (Criteria) this; } - public Criteria andPayStatusNotBetween(Integer value1, Integer value2) { - addCriterion("pay_status not between", value1, value2, "payStatus"); + public Criteria andObjectIdNotIn(List values) { + addCriterion("object_id not in", values, "objectId"); return (Criteria) this; } - public Criteria andMerchIdIsNull() { - addCriterion("merch_id is null"); + public Criteria andObjectIdBetween(Integer value1, Integer value2) { + addCriterion("object_id between", value1, value2, "objectId"); return (Criteria) this; } - public Criteria andMerchIdIsNotNull() { - addCriterion("merch_id is not null"); + public Criteria andObjectIdNotBetween(Integer value1, Integer value2) { + addCriterion("object_id not between", value1, value2, "objectId"); return (Criteria) this; } - public Criteria andMerchIdEqualTo(String value) { - addCriterion("merch_id =", value, "merchId"); + public Criteria andRechargeTypeIsNull() { + addCriterion("recharge_type is null"); return (Criteria) this; } - public Criteria andMerchIdNotEqualTo(String value) { - addCriterion("merch_id <>", value, "merchId"); + public Criteria andRechargeTypeIsNotNull() { + addCriterion("recharge_type is not null"); return (Criteria) this; } - public Criteria andMerchIdGreaterThan(String value) { - addCriterion("merch_id >", value, "merchId"); + public Criteria andRechargeTypeEqualTo(Integer value) { + addCriterion("recharge_type =", value, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdGreaterThanOrEqualTo(String value) { - addCriterion("merch_id >=", value, "merchId"); + public Criteria andRechargeTypeNotEqualTo(Integer value) { + addCriterion("recharge_type <>", value, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdLessThan(String value) { - addCriterion("merch_id <", value, "merchId"); + public Criteria andRechargeTypeGreaterThan(Integer value) { + addCriterion("recharge_type >", value, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdLessThanOrEqualTo(String value) { - addCriterion("merch_id <=", value, "merchId"); + public Criteria andRechargeTypeGreaterThanOrEqualTo(Integer value) { + addCriterion("recharge_type >=", value, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdLike(String value) { - addCriterion("merch_id like", value, "merchId"); + public Criteria andRechargeTypeLessThan(Integer value) { + addCriterion("recharge_type <", value, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdNotLike(String value) { - addCriterion("merch_id not like", value, "merchId"); + public Criteria andRechargeTypeLessThanOrEqualTo(Integer value) { + addCriterion("recharge_type <=", value, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdIn(List values) { - addCriterion("merch_id in", values, "merchId"); + public Criteria andRechargeTypeIn(List values) { + addCriterion("recharge_type in", values, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdNotIn(List values) { - addCriterion("merch_id not in", values, "merchId"); + public Criteria andRechargeTypeNotIn(List values) { + addCriterion("recharge_type not in", values, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdBetween(String value1, String value2) { - addCriterion("merch_id between", value1, value2, "merchId"); + public Criteria andRechargeTypeBetween(Integer value1, Integer value2) { + addCriterion("recharge_type between", value1, value2, "rechargeType"); return (Criteria) this; } - public Criteria andMerchIdNotBetween(String value1, String value2) { - addCriterion("merch_id not between", value1, value2, "merchId"); + public Criteria andRechargeTypeNotBetween(Integer value1, Integer value2) { + addCriterion("recharge_type not between", value1, value2, "rechargeType"); return (Criteria) this; } - public Criteria andRechargeStatusIsNull() { - addCriterion("recharge_status is null"); + public Criteria andAbnormalMsgIsNull() { + addCriterion("abnormal_msg is null"); return (Criteria) this; } - public Criteria andRechargeStatusIsNotNull() { - addCriterion("recharge_status is not null"); + public Criteria andAbnormalMsgIsNotNull() { + addCriterion("abnormal_msg is not null"); return (Criteria) this; } - public Criteria andRechargeStatusEqualTo(Integer value) { - addCriterion("recharge_status =", value, "rechargeStatus"); + public Criteria andAbnormalMsgEqualTo(String value) { + addCriterion("abnormal_msg =", value, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusNotEqualTo(Integer value) { - addCriterion("recharge_status <>", value, "rechargeStatus"); + public Criteria andAbnormalMsgNotEqualTo(String value) { + addCriterion("abnormal_msg <>", value, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusGreaterThan(Integer value) { - addCriterion("recharge_status >", value, "rechargeStatus"); + public Criteria andAbnormalMsgGreaterThan(String value) { + addCriterion("abnormal_msg >", value, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusGreaterThanOrEqualTo(Integer value) { - addCriterion("recharge_status >=", value, "rechargeStatus"); + public Criteria andAbnormalMsgGreaterThanOrEqualTo(String value) { + addCriterion("abnormal_msg >=", value, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusLessThan(Integer value) { - addCriterion("recharge_status <", value, "rechargeStatus"); + public Criteria andAbnormalMsgLessThan(String value) { + addCriterion("abnormal_msg <", value, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusLessThanOrEqualTo(Integer value) { - addCriterion("recharge_status <=", value, "rechargeStatus"); + public Criteria andAbnormalMsgLessThanOrEqualTo(String value) { + addCriterion("abnormal_msg <=", value, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusIn(List values) { - addCriterion("recharge_status in", values, "rechargeStatus"); + public Criteria andAbnormalMsgLike(String value) { + addCriterion("abnormal_msg like", value, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusNotIn(List values) { - addCriterion("recharge_status not in", values, "rechargeStatus"); + public Criteria andAbnormalMsgNotLike(String value) { + addCriterion("abnormal_msg not like", value, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusBetween(Integer value1, Integer value2) { - addCriterion("recharge_status between", value1, value2, "rechargeStatus"); + public Criteria andAbnormalMsgIn(List values) { + addCriterion("abnormal_msg in", values, "abnormalMsg"); return (Criteria) this; } - public Criteria andRechargeStatusNotBetween(Integer value1, Integer value2) { - addCriterion("recharge_status not between", value1, value2, "rechargeStatus"); + public Criteria andAbnormalMsgNotIn(List values) { + addCriterion("abnormal_msg not in", values, "abnormalMsg"); + return (Criteria) this; + } + + public Criteria andAbnormalMsgBetween(String value1, String value2) { + addCriterion("abnormal_msg between", value1, value2, "abnormalMsg"); + return (Criteria) this; + } + + public Criteria andAbnormalMsgNotBetween(String value1, String value2) { + addCriterion("abnormal_msg not between", value1, value2, "abnormalMsg"); return (Criteria) this; } @@ -2616,343 +2766,263 @@ public class OutRechargeOrderExample { return (Criteria) this; } - public Criteria andRechargeNameIsNull() { - addCriterion("recharge_name is null"); + public Criteria andGoodsIdIsNull() { + addCriterion("goods_id is null"); return (Criteria) this; } - public Criteria andRechargeNameIsNotNull() { - addCriterion("recharge_name is not null"); + public Criteria andGoodsIdIsNotNull() { + addCriterion("goods_id is not null"); return (Criteria) this; } - public Criteria andRechargeNameEqualTo(String value) { - addCriterion("recharge_name =", value, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameNotEqualTo(String value) { - addCriterion("recharge_name <>", value, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameGreaterThan(String value) { - addCriterion("recharge_name >", value, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameGreaterThanOrEqualTo(String value) { - addCriterion("recharge_name >=", value, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameLessThan(String value) { - addCriterion("recharge_name <", value, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameLessThanOrEqualTo(String value) { - addCriterion("recharge_name <=", value, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameLike(String value) { - addCriterion("recharge_name like", value, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameNotLike(String value) { - addCriterion("recharge_name not like", value, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameIn(List values) { - addCriterion("recharge_name in", values, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameNotIn(List values) { - addCriterion("recharge_name not in", values, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameBetween(String value1, String value2) { - addCriterion("recharge_name between", value1, value2, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRechargeNameNotBetween(String value1, String value2) { - addCriterion("recharge_name not between", value1, value2, "rechargeName"); - return (Criteria) this; - } - - public Criteria andRemarksIsNull() { - addCriterion("remarks is null"); - return (Criteria) this; - } - - public Criteria andRemarksIsNotNull() { - addCriterion("remarks is not null"); - return (Criteria) this; - } - - public Criteria andRemarksEqualTo(String value) { - addCriterion("remarks =", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksNotEqualTo(String value) { - addCriterion("remarks <>", value, "remarks"); - return (Criteria) this; - } - - public Criteria andRemarksGreaterThan(String value) { - addCriterion("remarks >", value, "remarks"); + public Criteria andGoodsIdEqualTo(Long value) { + addCriterion("goods_id =", value, "goodsId"); return (Criteria) this; } - public Criteria andRemarksGreaterThanOrEqualTo(String value) { - addCriterion("remarks >=", value, "remarks"); + public Criteria andGoodsIdNotEqualTo(Long value) { + addCriterion("goods_id <>", value, "goodsId"); return (Criteria) this; } - public Criteria andRemarksLessThan(String value) { - addCriterion("remarks <", value, "remarks"); + public Criteria andGoodsIdGreaterThan(Long value) { + addCriterion("goods_id >", value, "goodsId"); return (Criteria) this; } - public Criteria andRemarksLessThanOrEqualTo(String value) { - addCriterion("remarks <=", value, "remarks"); + public Criteria andGoodsIdGreaterThanOrEqualTo(Long value) { + addCriterion("goods_id >=", value, "goodsId"); return (Criteria) this; } - public Criteria andRemarksLike(String value) { - addCriterion("remarks like", value, "remarks"); + public Criteria andGoodsIdLessThan(Long value) { + addCriterion("goods_id <", value, "goodsId"); return (Criteria) this; } - public Criteria andRemarksNotLike(String value) { - addCriterion("remarks not like", value, "remarks"); + public Criteria andGoodsIdLessThanOrEqualTo(Long value) { + addCriterion("goods_id <=", value, "goodsId"); return (Criteria) this; } - public Criteria andRemarksIn(List values) { - addCriterion("remarks in", values, "remarks"); + public Criteria andGoodsIdIn(List values) { + addCriterion("goods_id in", values, "goodsId"); return (Criteria) this; } - public Criteria andRemarksNotIn(List values) { - addCriterion("remarks not in", values, "remarks"); + public Criteria andGoodsIdNotIn(List values) { + addCriterion("goods_id not in", values, "goodsId"); return (Criteria) this; } - public Criteria andRemarksBetween(String value1, String value2) { - addCriterion("remarks between", value1, value2, "remarks"); + public Criteria andGoodsIdBetween(Long value1, Long value2) { + addCriterion("goods_id between", value1, value2, "goodsId"); return (Criteria) this; } - public Criteria andRemarksNotBetween(String value1, String value2) { - addCriterion("remarks not between", value1, value2, "remarks"); + public Criteria andGoodsIdNotBetween(Long value1, Long value2) { + addCriterion("goods_id not between", value1, value2, "goodsId"); return (Criteria) this; } - public Criteria andAgentKeyIsNull() { - addCriterion("agent_key is null"); + public Criteria andRechargeContentIsNull() { + addCriterion("recharge_content is null"); return (Criteria) this; } - public Criteria andAgentKeyIsNotNull() { - addCriterion("agent_key is not null"); + public Criteria andRechargeContentIsNotNull() { + addCriterion("recharge_content is not null"); return (Criteria) this; } - public Criteria andAgentKeyEqualTo(String value) { - addCriterion("agent_key =", value, "agentKey"); + public Criteria andRechargeContentEqualTo(String value) { + addCriterion("recharge_content =", value, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyNotEqualTo(String value) { - addCriterion("agent_key <>", value, "agentKey"); + public Criteria andRechargeContentNotEqualTo(String value) { + addCriterion("recharge_content <>", value, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyGreaterThan(String value) { - addCriterion("agent_key >", value, "agentKey"); + public Criteria andRechargeContentGreaterThan(String value) { + addCriterion("recharge_content >", value, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyGreaterThanOrEqualTo(String value) { - addCriterion("agent_key >=", value, "agentKey"); + public Criteria andRechargeContentGreaterThanOrEqualTo(String value) { + addCriterion("recharge_content >=", value, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyLessThan(String value) { - addCriterion("agent_key <", value, "agentKey"); + public Criteria andRechargeContentLessThan(String value) { + addCriterion("recharge_content <", value, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyLessThanOrEqualTo(String value) { - addCriterion("agent_key <=", value, "agentKey"); + public Criteria andRechargeContentLessThanOrEqualTo(String value) { + addCriterion("recharge_content <=", value, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyLike(String value) { - addCriterion("agent_key like", value, "agentKey"); + public Criteria andRechargeContentLike(String value) { + addCriterion("recharge_content like", value, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyNotLike(String value) { - addCriterion("agent_key not like", value, "agentKey"); + public Criteria andRechargeContentNotLike(String value) { + addCriterion("recharge_content not like", value, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyIn(List values) { - addCriterion("agent_key in", values, "agentKey"); + public Criteria andRechargeContentIn(List values) { + addCriterion("recharge_content in", values, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyNotIn(List values) { - addCriterion("agent_key not in", values, "agentKey"); + public Criteria andRechargeContentNotIn(List values) { + addCriterion("recharge_content not in", values, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyBetween(String value1, String value2) { - addCriterion("agent_key between", value1, value2, "agentKey"); + public Criteria andRechargeContentBetween(String value1, String value2) { + addCriterion("recharge_content between", value1, value2, "rechargeContent"); return (Criteria) this; } - public Criteria andAgentKeyNotBetween(String value1, String value2) { - addCriterion("agent_key not between", value1, value2, "agentKey"); + public Criteria andRechargeContentNotBetween(String value1, String value2) { + addCriterion("recharge_content not between", value1, value2, "rechargeContent"); return (Criteria) this; } - public Criteria andObjectIdIsNull() { - addCriterion("object_id is null"); + public Criteria andCompanyIdIsNull() { + addCriterion("company_id is null"); return (Criteria) this; } - public Criteria andObjectIdIsNotNull() { - addCriterion("object_id is not null"); + public Criteria andCompanyIdIsNotNull() { + addCriterion("company_id is not null"); return (Criteria) this; } - public Criteria andObjectIdEqualTo(Long value) { - addCriterion("object_id =", value, "objectId"); + public Criteria andCompanyIdEqualTo(Long value) { + addCriterion("company_id =", value, "companyId"); return (Criteria) this; } - public Criteria andObjectIdNotEqualTo(Long value) { - addCriterion("object_id <>", value, "objectId"); + public Criteria andCompanyIdNotEqualTo(Long value) { + addCriterion("company_id <>", value, "companyId"); return (Criteria) this; } - public Criteria andObjectIdGreaterThan(Long value) { - addCriterion("object_id >", value, "objectId"); + public Criteria andCompanyIdGreaterThan(Long value) { + addCriterion("company_id >", value, "companyId"); return (Criteria) this; } - public Criteria andObjectIdGreaterThanOrEqualTo(Long value) { - addCriterion("object_id >=", value, "objectId"); + public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) { + addCriterion("company_id >=", value, "companyId"); return (Criteria) this; } - public Criteria andObjectIdLessThan(Long value) { - addCriterion("object_id <", value, "objectId"); + public Criteria andCompanyIdLessThan(Long value) { + addCriterion("company_id <", value, "companyId"); return (Criteria) this; } - public Criteria andObjectIdLessThanOrEqualTo(Long value) { - addCriterion("object_id <=", value, "objectId"); + public Criteria andCompanyIdLessThanOrEqualTo(Long value) { + addCriterion("company_id <=", value, "companyId"); return (Criteria) this; } - public Criteria andObjectIdIn(List values) { - addCriterion("object_id in", values, "objectId"); + public Criteria andCompanyIdIn(List values) { + addCriterion("company_id in", values, "companyId"); return (Criteria) this; } - public Criteria andObjectIdNotIn(List values) { - addCriterion("object_id not in", values, "objectId"); + public Criteria andCompanyIdNotIn(List values) { + addCriterion("company_id not in", values, "companyId"); return (Criteria) this; } - public Criteria andObjectIdBetween(Long value1, Long value2) { - addCriterion("object_id between", value1, value2, "objectId"); + public Criteria andCompanyIdBetween(Long value1, Long value2) { + addCriterion("company_id between", value1, value2, "companyId"); return (Criteria) this; } - public Criteria andObjectIdNotBetween(Long value1, Long value2) { - addCriterion("object_id not between", value1, value2, "objectId"); + public Criteria andCompanyIdNotBetween(Long value1, Long value2) { + addCriterion("company_id not between", value1, value2, "companyId"); return (Criteria) this; } - public Criteria andAbnormalMsgIsNull() { - addCriterion("abnormal_msg is null"); + public Criteria andMerchIdIsNull() { + addCriterion("merch_id is null"); return (Criteria) this; } - public Criteria andAbnormalMsgIsNotNull() { - addCriterion("abnormal_msg is not null"); + public Criteria andMerchIdIsNotNull() { + addCriterion("merch_id is not null"); return (Criteria) this; } - public Criteria andAbnormalMsgEqualTo(String value) { - addCriterion("abnormal_msg =", value, "abnormalMsg"); + public Criteria andMerchIdEqualTo(String value) { + addCriterion("merch_id =", value, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgNotEqualTo(String value) { - addCriterion("abnormal_msg <>", value, "abnormalMsg"); + public Criteria andMerchIdNotEqualTo(String value) { + addCriterion("merch_id <>", value, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgGreaterThan(String value) { - addCriterion("abnormal_msg >", value, "abnormalMsg"); + public Criteria andMerchIdGreaterThan(String value) { + addCriterion("merch_id >", value, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgGreaterThanOrEqualTo(String value) { - addCriterion("abnormal_msg >=", value, "abnormalMsg"); + public Criteria andMerchIdGreaterThanOrEqualTo(String value) { + addCriterion("merch_id >=", value, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgLessThan(String value) { - addCriterion("abnormal_msg <", value, "abnormalMsg"); + public Criteria andMerchIdLessThan(String value) { + addCriterion("merch_id <", value, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgLessThanOrEqualTo(String value) { - addCriterion("abnormal_msg <=", value, "abnormalMsg"); + public Criteria andMerchIdLessThanOrEqualTo(String value) { + addCriterion("merch_id <=", value, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgLike(String value) { - addCriterion("abnormal_msg like", value, "abnormalMsg"); + public Criteria andMerchIdLike(String value) { + addCriterion("merch_id like", value, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgNotLike(String value) { - addCriterion("abnormal_msg not like", value, "abnormalMsg"); + public Criteria andMerchIdNotLike(String value) { + addCriterion("merch_id not like", value, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgIn(List values) { - addCriterion("abnormal_msg in", values, "abnormalMsg"); + public Criteria andMerchIdIn(List values) { + addCriterion("merch_id in", values, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgNotIn(List values) { - addCriterion("abnormal_msg not in", values, "abnormalMsg"); + public Criteria andMerchIdNotIn(List values) { + addCriterion("merch_id not in", values, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgBetween(String value1, String value2) { - addCriterion("abnormal_msg between", value1, value2, "abnormalMsg"); + public Criteria andMerchIdBetween(String value1, String value2) { + addCriterion("merch_id between", value1, value2, "merchId"); return (Criteria) this; } - public Criteria andAbnormalMsgNotBetween(String value1, String value2) { - addCriterion("abnormal_msg not between", value1, value2, "abnormalMsg"); + public Criteria andMerchIdNotBetween(String value1, String value2) { + addCriterion("merch_id not between", value1, value2, "merchId"); return (Criteria) this; }