Merge branch 'dev' of http://gitea.dctpay.com/hurui/puhui-go into dev

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

@@ -45,26 +45,28 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
         "account_merchant_no, account_merchant_key, ",
         "refund_pay_channel, reufnd_pay_type, ",
         "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)",
+        "refund_pay_channel_order_no, trade_refund_price, ",
+        "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}, #{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})"
+        "#{refundPayChannelOrderNo,jdbcType=VARCHAR}, #{tradeRefundPrice,jdbcType=DECIMAL}, ",
+        "#{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);
@@ -89,6 +91,7 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
         @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="trade_refund_price", property="tradeRefundPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="refund_integral", property="refundIntegral", jdbcType=JdbcType.BIGINT),
         @Result(column="refund_remark", property="refundRemark", jdbcType=JdbcType.VARCHAR),
@@ -110,10 +113,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, 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",
+        "refund_serial_no, trade_refund_no, refund_pay_channel_order_no, trade_refund_price, ",
+        "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}"
     })
@@ -132,6 +135,7 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
         @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="trade_refund_price", property="tradeRefundPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="refund_price", property="refundPrice", jdbcType=JdbcType.DECIMAL),
         @Result(column="refund_integral", property="refundIntegral", jdbcType=JdbcType.BIGINT),
         @Result(column="refund_remark", property="refundRemark", jdbcType=JdbcType.VARCHAR),
@@ -173,6 +177,7 @@ public interface BsOrderRefundMapper extends BsOrderRefundMapperExt {
           "refund_serial_no = #{refundSerialNo,jdbcType=VARCHAR},",
           "trade_refund_no = #{tradeRefundNo,jdbcType=VARCHAR},",
           "refund_pay_channel_order_no = #{refundPayChannelOrderNo,jdbcType=VARCHAR},",
+          "trade_refund_price = #{tradeRefundPrice,jdbcType=DECIMAL},",
           "refund_price = #{refundPrice,jdbcType=DECIMAL},",
           "refund_integral = #{refundIntegral,jdbcType=BIGINT},",
           "refund_remark = #{refundRemark,jdbcType=VARCHAR},",

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

@@ -80,6 +80,10 @@ public class BsOrderRefundSqlProvider {
             sql.VALUES("refund_pay_channel_order_no", "#{refundPayChannelOrderNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getTradeRefundPrice() != null) {
+            sql.VALUES("trade_refund_price", "#{tradeRefundPrice,jdbcType=DECIMAL}");
+        }
+        
         if (record.getRefundPrice() != null) {
             sql.VALUES("refund_price", "#{refundPrice,jdbcType=DECIMAL}");
         }
@@ -159,6 +163,7 @@ public class BsOrderRefundSqlProvider {
         sql.SELECT("refund_serial_no");
         sql.SELECT("trade_refund_no");
         sql.SELECT("refund_pay_channel_order_no");
+        sql.SELECT("trade_refund_price");
         sql.SELECT("refund_price");
         sql.SELECT("refund_integral");
         sql.SELECT("refund_remark");
@@ -246,6 +251,10 @@ public class BsOrderRefundSqlProvider {
             sql.SET("refund_pay_channel_order_no = #{record.refundPayChannelOrderNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getTradeRefundPrice() != null) {
+            sql.SET("trade_refund_price = #{record.tradeRefundPrice,jdbcType=DECIMAL}");
+        }
+        
         if (record.getRefundPrice() != null) {
             sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}");
         }
@@ -324,6 +333,7 @@ public class BsOrderRefundSqlProvider {
         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("trade_refund_price = #{record.tradeRefundPrice,jdbcType=DECIMAL}");
         sql.SET("refund_price = #{record.refundPrice,jdbcType=DECIMAL}");
         sql.SET("refund_integral = #{record.refundIntegral,jdbcType=BIGINT}");
         sql.SET("refund_remark = #{record.refundRemark,jdbcType=VARCHAR}");
@@ -400,6 +410,10 @@ public class BsOrderRefundSqlProvider {
             sql.SET("refund_pay_channel_order_no = #{refundPayChannelOrderNo,jdbcType=VARCHAR}");
         }
         
+        if (record.getTradeRefundPrice() != null) {
+            sql.SET("trade_refund_price = #{tradeRefundPrice,jdbcType=DECIMAL}");
+        }
+        
         if (record.getRefundPrice() != null) {
             sql.SET("refund_price = #{refundPrice,jdbcType=DECIMAL}");
         }

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

@@ -84,6 +84,11 @@ public class BsOrderRefund implements Serializable {
      */
     private String refundPayChannelOrderNo;
 
+    /**
+     * 业务退款金额
+     */
+    private BigDecimal tradeRefundPrice;
+
     /**
      * 退款金额
      */
@@ -262,6 +267,14 @@ public class BsOrderRefund implements Serializable {
         this.refundPayChannelOrderNo = refundPayChannelOrderNo;
     }
 
+    public BigDecimal getTradeRefundPrice() {
+        return tradeRefundPrice;
+    }
+
+    public void setTradeRefundPrice(BigDecimal tradeRefundPrice) {
+        this.tradeRefundPrice = tradeRefundPrice;
+    }
+
     public BigDecimal getRefundPrice() {
         return refundPrice;
     }
@@ -400,6 +413,7 @@ public class BsOrderRefund implements Serializable {
             && (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.getTradeRefundPrice() == null ? other.getTradeRefundPrice() == null : this.getTradeRefundPrice().equals(other.getTradeRefundPrice()))
             && (this.getRefundPrice() == null ? other.getRefundPrice() == null : this.getRefundPrice().equals(other.getRefundPrice()))
             && (this.getRefundIntegral() == null ? other.getRefundIntegral() == null : this.getRefundIntegral().equals(other.getRefundIntegral()))
             && (this.getRefundRemark() == null ? other.getRefundRemark() == null : this.getRefundRemark().equals(other.getRefundRemark()))
@@ -434,6 +448,7 @@ public class BsOrderRefund implements Serializable {
         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 + ((getTradeRefundPrice() == null) ? 0 : getTradeRefundPrice().hashCode());
         result = prime * result + ((getRefundPrice() == null) ? 0 : getRefundPrice().hashCode());
         result = prime * result + ((getRefundIntegral() == null) ? 0 : getRefundIntegral().hashCode());
         result = prime * result + ((getRefundRemark() == null) ? 0 : getRefundRemark().hashCode());
@@ -471,6 +486,7 @@ public class BsOrderRefund implements Serializable {
         sb.append(", refundSerialNo=").append(refundSerialNo);
         sb.append(", tradeRefundNo=").append(tradeRefundNo);
         sb.append(", refundPayChannelOrderNo=").append(refundPayChannelOrderNo);
+        sb.append(", tradeRefundPrice=").append(tradeRefundPrice);
         sb.append(", refundPrice=").append(refundPrice);
         sb.append(", refundIntegral=").append(refundIntegral);
         sb.append(", refundRemark=").append(refundRemark);

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

@@ -1056,6 +1056,66 @@ public class BsOrderRefundExample {
             return (Criteria) this;
         }
 
+        public Criteria andTradeRefundPriceIsNull() {
+            addCriterion("trade_refund_price is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceIsNotNull() {
+            addCriterion("trade_refund_price is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceEqualTo(BigDecimal value) {
+            addCriterion("trade_refund_price =", value, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceNotEqualTo(BigDecimal value) {
+            addCriterion("trade_refund_price <>", value, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceGreaterThan(BigDecimal value) {
+            addCriterion("trade_refund_price >", value, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("trade_refund_price >=", value, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceLessThan(BigDecimal value) {
+            addCriterion("trade_refund_price <", value, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("trade_refund_price <=", value, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceIn(List<BigDecimal> values) {
+            addCriterion("trade_refund_price in", values, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceNotIn(List<BigDecimal> values) {
+            addCriterion("trade_refund_price not in", values, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("trade_refund_price between", value1, value2, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
+        public Criteria andTradeRefundPriceNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("trade_refund_price not between", value1, value2, "tradeRefundPrice");
+            return (Criteria) this;
+        }
+
         public Criteria andRefundPriceIsNull() {
             addCriterion("refund_price is null");
             return (Criteria) this;