1

service/src/main/java/com/hfkj/dao/BsOrderRefundMapper.java

@@ -44,27 +44,27 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
         "user_phone, refund_order_no, ",
         "account_merchant_no, account_merchant_key, ",
         "refund_pay_channel, reufnd_pay_type, ",
-        "refund_serial_no, refund_pay_channel_order_no, ",
-        "refund_price, refund_integral, ",
-        "refund_remark, refund_status, ",
-        "refund_fail_reason, create_time, ",
-        "update_time, finish_time, ",
-        "op_user_type, op_user_id, ",
-        "op_user_name, ext_1, ",
-        "ext_2, ext_3)",
+        "refund_serial_no, trade_refund_no, ",
+        "refund_pay_channel_order_no, refund_price, ",
+        "refund_integral, refund_remark, ",
+        "refund_status, refund_fail_reason, ",
+        "create_time, update_time, ",
+        "finish_time, op_user_type, ",
+        "op_user_id, op_user_name, ",
+        "ext_1, ext_2, ext_3)",
         "values (#{merId,jdbcType=BIGINT}, #{orderNo,jdbcType=VARCHAR}, ",
         "#{orderChildNo,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ",
         "#{userPhone,jdbcType=VARCHAR}, #{refundOrderNo,jdbcType=VARCHAR}, ",
         "#{accountMerchantNo,jdbcType=VARCHAR}, #{accountMerchantKey,jdbcType=VARCHAR}, ",
         "#{refundPayChannel,jdbcType=INTEGER}, #{reufndPayType,jdbcType=INTEGER}, ",
-        "#{refundSerialNo,jdbcType=VARCHAR}, #{refundPayChannelOrderNo,jdbcType=VARCHAR}, ",
-        "#{refundPrice,jdbcType=DECIMAL}, #{refundIntegral,jdbcType=BIGINT}, ",
-        "#{refundRemark,jdbcType=VARCHAR}, #{refundStatus,jdbcType=INTEGER}, ",
-        "#{refundFailReason,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
-        "#{updateTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ",
-        "#{opUserType,jdbcType=INTEGER}, #{opUserId,jdbcType=BIGINT}, ",
-        "#{opUserName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, ",
-        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{refundSerialNo,jdbcType=VARCHAR}, #{tradeRefundNo,jdbcType=VARCHAR}, ",
+        "#{refundPayChannelOrderNo,jdbcType=VARCHAR}, #{refundPrice,jdbcType=DECIMAL}, ",
+        "#{refundIntegral,jdbcType=BIGINT}, #{refundRemark,jdbcType=VARCHAR}, ",
+        "#{refundStatus,jdbcType=INTEGER}, #{refundFailReason,jdbcType=VARCHAR}, ",
+        "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
+        "#{finishTime,jdbcType=TIMESTAMP}, #{opUserType,jdbcType=INTEGER}, ",
+        "#{opUserId,jdbcType=BIGINT}, #{opUserName,jdbcType=VARCHAR}, ",
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(BsOrderRefund record);
@@ -87,6 +87,7 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
         @Result(column="refund_pay_channel", property="refundPayChannel", jdbcType=JdbcType.INTEGER),
         @Result(column="reufnd_pay_type", property="reufndPayType", jdbcType=JdbcType.INTEGER),
         @Result(column="refund_serial_no", property="refundSerialNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="trade_refund_no", property="tradeRefundNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="refund_pay_channel_order_no", property="refundPayChannelOrderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="refund_integral", property="refundIntegral", jdbcType=JdbcType.BIGINT),
@@ -109,9 +110,10 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
         "select",
         "id, mer_id, order_no, order_child_no, user_id, user_phone, refund_order_no, ",
         "account_merchant_no, account_merchant_key, refund_pay_channel, reufnd_pay_type, ",
-        "refund_serial_no, refund_pay_channel_order_no, refund_price, refund_integral, ",
-        "refund_remark, refund_status, refund_fail_reason, create_time, update_time, ",
-        "finish_time, op_user_type, op_user_id, op_user_name, ext_1, ext_2, ext_3",
+        "refund_serial_no, trade_refund_no, refund_pay_channel_order_no, refund_price, ",
+        "refund_integral, refund_remark, refund_status, refund_fail_reason, create_time, ",
+        "update_time, finish_time, op_user_type, op_user_id, op_user_name, ext_1, ext_2, ",
+        "ext_3",
         "from bs_order_refund",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -128,6 +130,7 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
         @Result(column="refund_pay_channel", property="refundPayChannel", jdbcType=JdbcType.INTEGER),
         @Result(column="reufnd_pay_type", property="reufndPayType", jdbcType=JdbcType.INTEGER),
         @Result(column="refund_serial_no", property="refundSerialNo", jdbcType=JdbcType.VARCHAR),
+        @Result(column="trade_refund_no", property="tradeRefundNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="refund_pay_channel_order_no", property="refundPayChannelOrderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="refund_integral", property="refundIntegral", jdbcType=JdbcType.BIGINT),
@@ -168,6 +171,7 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
           "refund_pay_channel = #{refundPayChannel,jdbcType=INTEGER},",
           "reufnd_pay_type = #{reufndPayType,jdbcType=INTEGER},",
           "refund_serial_no = #{refundSerialNo,jdbcType=VARCHAR},",
+          "trade_refund_no = #{tradeRefundNo,jdbcType=VARCHAR},",
           "refund_pay_channel_order_no = #{refundPayChannelOrderNo,jdbcType=VARCHAR},",
           "refund_price = #{refundPrice,jdbcType=DECIMAL},",
           "refund_integral = #{refundIntegral,jdbcType=BIGINT},",

service/src/main/java/com/hfkj/dao/BsOrderRefundSqlProvider.java

@@ -72,6 +72,10 @@ public class BsOrderRefundSqlProvider {
             sql.VALUES("refund_serial_no", "#{refundSerialNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getTradeRefundNo() != null) {
+            sql.VALUES("trade_refund_no", "#{tradeRefundNo,jdbcType=VARCHAR}");
+        }
+        
         if (record.getRefundPayChannelOrderNo() != null) {
             sql.VALUES("refund_pay_channel_order_no", "#{refundPayChannelOrderNo,jdbcType=VARCHAR}");
         }
@@ -153,6 +157,7 @@ public class BsOrderRefundSqlProvider {
         sql.SELECT("refund_pay_channel");
         sql.SELECT("reufnd_pay_type");
         sql.SELECT("refund_serial_no");
+        sql.SELECT("trade_refund_no");
         sql.SELECT("refund_pay_channel_order_no");
         sql.SELECT("refund_price");
         sql.SELECT("refund_integral");
@@ -233,6 +238,10 @@ public class BsOrderRefundSqlProvider {
             sql.SET("refund_serial_no = #{record.refundSerialNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getTradeRefundNo() != null) {
+            sql.SET("trade_refund_no = #{record.tradeRefundNo,jdbcType=VARCHAR}");
+        }
+        
         if (record.getRefundPayChannelOrderNo() != null) {
             sql.SET("refund_pay_channel_order_no = #{record.refundPayChannelOrderNo,jdbcType=VARCHAR}");
         }
@@ -313,6 +322,7 @@ public class BsOrderRefundSqlProvider {
         sql.SET("refund_pay_channel = #{record.refundPayChannel,jdbcType=INTEGER}");
         sql.SET("reufnd_pay_type = #{record.reufndPayType,jdbcType=INTEGER}");
         sql.SET("refund_serial_no = #{record.refundSerialNo,jdbcType=VARCHAR}");
+        sql.SET("trade_refund_no = #{record.tradeRefundNo,jdbcType=VARCHAR}");
         sql.SET("refund_pay_channel_order_no = #{record.refundPayChannelOrderNo,jdbcType=VARCHAR}");
         sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}");
         sql.SET("refund_integral = #{record.refundIntegral,jdbcType=BIGINT}");
@@ -382,6 +392,10 @@ public class BsOrderRefundSqlProvider {
             sql.SET("refund_serial_no = #{refundSerialNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getTradeRefundNo() != null) {
+            sql.SET("trade_refund_no = #{tradeRefundNo,jdbcType=VARCHAR}");
+        }
+        
         if (record.getRefundPayChannelOrderNo() != null) {
             sql.SET("refund_pay_channel_order_no = #{refundPayChannelOrderNo,jdbcType=VARCHAR}");
         }

service/src/main/java/com/hfkj/entity/BsOrderRefund.java

@@ -74,6 +74,11 @@ public class BsOrderRefund implements Serializable {
      */
     private String refundSerialNo;
 
+    /**
+     * 业务退款流水号
+     */
+    private String tradeRefundNo;
+
     /**
      * 支付渠道退款流水号
      */
@@ -241,6 +246,14 @@ public class BsOrderRefund implements Serializable {
         this.refundSerialNo = refundSerialNo;
     }
 
+    public String getTradeRefundNo() {
+        return tradeRefundNo;
+    }
+
+    public void setTradeRefundNo(String tradeRefundNo) {
+        this.tradeRefundNo = tradeRefundNo;
+    }
+
     public String getRefundPayChannelOrderNo() {
         return refundPayChannelOrderNo;
     }
@@ -385,6 +398,7 @@ public class BsOrderRefund implements Serializable {
             && (this.getRefundPayChannel() == null ? other.getRefundPayChannel() == null : this.getRefundPayChannel().equals(other.getRefundPayChannel()))
             && (this.getReufndPayType() == null ? other.getReufndPayType() == null : this.getReufndPayType().equals(other.getReufndPayType()))
             && (this.getRefundSerialNo() == null ? other.getRefundSerialNo() == null : this.getRefundSerialNo().equals(other.getRefundSerialNo()))
+            && (this.getTradeRefundNo() == null ? other.getTradeRefundNo() == null : this.getTradeRefundNo().equals(other.getTradeRefundNo()))
             && (this.getRefundPayChannelOrderNo() == null ? other.getRefundPayChannelOrderNo() == null : this.getRefundPayChannelOrderNo().equals(other.getRefundPayChannelOrderNo()))
             && (this.getRefundPrice() == null ? other.getRefundPrice() == null : this.getRefundPrice().equals(other.getRefundPrice()))
             && (this.getRefundIntegral() == null ? other.getRefundIntegral() == null : this.getRefundIntegral().equals(other.getRefundIntegral()))
@@ -418,6 +432,7 @@ public class BsOrderRefund implements Serializable {
         result = prime * result + ((getRefundPayChannel() == null) ? 0 : getRefundPayChannel().hashCode());
         result = prime * result + ((getReufndPayType() == null) ? 0 : getReufndPayType().hashCode());
         result = prime * result + ((getRefundSerialNo() == null) ? 0 : getRefundSerialNo().hashCode());
+        result = prime * result + ((getTradeRefundNo() == null) ? 0 : getTradeRefundNo().hashCode());
         result = prime * result + ((getRefundPayChannelOrderNo() == null) ? 0 : getRefundPayChannelOrderNo().hashCode());
         result = prime * result + ((getRefundPrice() == null) ? 0 : getRefundPrice().hashCode());
         result = prime * result + ((getRefundIntegral() == null) ? 0 : getRefundIntegral().hashCode());
@@ -454,6 +469,7 @@ public class BsOrderRefund implements Serializable {
         sb.append(", refundPayChannel=").append(refundPayChannel);
         sb.append(", reufndPayType=").append(reufndPayType);
         sb.append(", refundSerialNo=").append(refundSerialNo);
+        sb.append(", tradeRefundNo=").append(tradeRefundNo);
         sb.append(", refundPayChannelOrderNo=").append(refundPayChannelOrderNo);
         sb.append(", refundPrice=").append(refundPrice);
         sb.append(", refundIntegral=").append(refundIntegral);

service/src/main/java/com/hfkj/entity/BsOrderRefundExample.java

@@ -916,6 +916,76 @@ public class BsOrderRefundExample {
             return (Criteria) this;
         }
 
+        public Criteria andTradeRefundNoIsNull() {
+            addCriterion("trade_refund_no is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoIsNotNull() {
+            addCriterion("trade_refund_no is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoEqualTo(String value) {
+            addCriterion("trade_refund_no =", value, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoNotEqualTo(String value) {
+            addCriterion("trade_refund_no <>", value, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoGreaterThan(String value) {
+            addCriterion("trade_refund_no >", value, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoGreaterThanOrEqualTo(String value) {
+            addCriterion("trade_refund_no >=", value, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoLessThan(String value) {
+            addCriterion("trade_refund_no <", value, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoLessThanOrEqualTo(String value) {
+            addCriterion("trade_refund_no <=", value, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoLike(String value) {
+            addCriterion("trade_refund_no like", value, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoNotLike(String value) {
+            addCriterion("trade_refund_no not like", value, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoIn(List<String> values) {
+            addCriterion("trade_refund_no in", values, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoNotIn(List<String> values) {
+            addCriterion("trade_refund_no not in", values, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoBetween(String value1, String value2) {
+            addCriterion("trade_refund_no between", value1, value2, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundNoNotBetween(String value1, String value2) {
+            addCriterion("trade_refund_no not between", value1, value2, "tradeRefundNo");
+            return (Criteria) this;
+        }
+
         public Criteria andRefundPayChannelOrderNoIsNull() {
             addCriterion("refund_pay_channel_order_no is null");
             return (Criteria) this;