PAYPAL新增type类型

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseFinancePaypal.java

@@ -257,6 +257,16 @@ public class DcBaseFinancePaypal {
     private String sourceJson;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_finance_paypal.type
+     *
+     * @mbg.generated
+     */
+    @JSONField(name = "Type")
+    private String type;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_finance_paypal
      *
@@ -295,6 +305,7 @@ public class DcBaseFinancePaypal {
         sb.append(", currency=").append(currency);
         sb.append(", currencyId=").append(currencyId);
         sb.append(", otherToCnyExchangeRate=").append(otherToCnyExchangeRate);
+        sb.append(", type=").append(type);
         sb.append("]");
         return sb.toString();
     }
@@ -343,7 +354,8 @@ public class DcBaseFinancePaypal {
             && (this.getPayerId() == null ? other.getPayerId() == null : this.getPayerId().equals(other.getPayerId()))
             && (this.getCurrency() == null ? other.getCurrency() == null : this.getCurrency().equals(other.getCurrency()))
             && (this.getCurrencyId() == null ? other.getCurrencyId() == null : this.getCurrencyId().equals(other.getCurrencyId()))
-            && (this.getOtherToCnyExchangeRate() == null ? other.getOtherToCnyExchangeRate() == null : this.getOtherToCnyExchangeRate().equals(other.getOtherToCnyExchangeRate()));
+            && (this.getOtherToCnyExchangeRate() == null ? other.getOtherToCnyExchangeRate() == null : this.getOtherToCnyExchangeRate().equals(other.getOtherToCnyExchangeRate()))
+            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()));
     }
 
     /**
@@ -383,6 +395,7 @@ public class DcBaseFinancePaypal {
         result = prime * result + ((getCurrency() == null) ? 0 : getCurrency().hashCode());
         result = prime * result + ((getCurrencyId() == null) ? 0 : getCurrencyId().hashCode());
         result = prime * result + ((getOtherToCnyExchangeRate() == null) ? 0 : getOtherToCnyExchangeRate().hashCode());
+        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/example/DcBaseFinancePaypalExample.java

@@ -2140,6 +2140,76 @@ public class DcBaseFinancePaypalExample {
             addCriterion("other_to_cny_exchange_rate not between", value1, value2, "otherToCnyExchangeRate");
             return (Criteria) this;
         }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("type like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("type not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
     }
 
     /**

data-common/src/main/java/com/bailuntec/mapper/DcBaseFinancePaypalMapper.xml

@@ -33,6 +33,7 @@
     <result column="currency" jdbcType="VARCHAR" property="currency" />
     <result column="currency_id" jdbcType="INTEGER" property="currencyId" />
     <result column="other_to_cny_exchange_rate" jdbcType="DECIMAL" property="otherToCnyExchangeRate" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -109,7 +110,7 @@
     payment_date, gross_amount, fee_amount, settle_amount, tax_amount, exchange_rate, 
     payment_status, pending_reason, reason_code, create_time, saas_company_id, gmt_create_time, 
     gmt_modify_time, business, receiver, receiver_id, payer, payer_id, currency, currency_id, 
-    other_to_cny_exchange_rate
+    other_to_cny_exchange_rate, type
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseFinancePaypalExample" resultMap="BaseResultMap">
     <!--
@@ -178,8 +179,8 @@
       create_time, saas_company_id, gmt_create_time, 
       gmt_modify_time, business, receiver, 
       receiver_id, payer, payer_id, 
-      currency, currency_id, other_to_cny_exchange_rate
-      )
+      currency, currency_id, other_to_cny_exchange_rate, 
+      type)
     values (#{id,jdbcType=INTEGER}, #{transactionId,jdbcType=VARCHAR}, #{parentTransactionId,jdbcType=VARCHAR}, 
       #{receiptId,jdbcType=VARCHAR}, #{transactionType,jdbcType=VARCHAR}, #{paymentType,jdbcType=VARCHAR}, 
       #{paymentDate,jdbcType=TIMESTAMP}, #{grossAmount,jdbcType=DECIMAL}, #{feeAmount,jdbcType=DECIMAL}, 
@@ -188,8 +189,8 @@
       #{createTime,jdbcType=TIMESTAMP}, #{saasCompanyId,jdbcType=INTEGER}, #{gmtCreateTime,jdbcType=TIMESTAMP}, 
       #{gmtModifyTime,jdbcType=TIMESTAMP}, #{business,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, 
       #{receiverId,jdbcType=VARCHAR}, #{payer,jdbcType=VARCHAR}, #{payerId,jdbcType=VARCHAR}, 
-      #{currency,jdbcType=VARCHAR}, #{currencyId,jdbcType=INTEGER}, #{otherToCnyExchangeRate,jdbcType=DECIMAL}
-      )
+      #{currency,jdbcType=VARCHAR}, #{currencyId,jdbcType=INTEGER}, #{otherToCnyExchangeRate,jdbcType=DECIMAL}, 
+      #{type,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseFinancePaypal">
     <!--
@@ -279,6 +280,9 @@
       <if test="otherToCnyExchangeRate != null">
         other_to_cny_exchange_rate,
       </if>
+      <if test="type != null">
+        type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -362,6 +366,9 @@
       <if test="otherToCnyExchangeRate != null">
         #{otherToCnyExchangeRate,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseFinancePaypalExample" resultType="java.lang.Long">
@@ -462,6 +469,9 @@
       <if test="record.otherToCnyExchangeRate != null">
         other_to_cny_exchange_rate = #{record.otherToCnyExchangeRate,jdbcType=DECIMAL},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -499,7 +509,8 @@
       payer_id = #{record.payerId,jdbcType=VARCHAR},
       currency = #{record.currency,jdbcType=VARCHAR},
       currency_id = #{record.currencyId,jdbcType=INTEGER},
-      other_to_cny_exchange_rate = #{record.otherToCnyExchangeRate,jdbcType=DECIMAL}
+      other_to_cny_exchange_rate = #{record.otherToCnyExchangeRate,jdbcType=DECIMAL},
+      type = #{record.type,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -589,6 +600,9 @@
       <if test="otherToCnyExchangeRate != null">
         other_to_cny_exchange_rate = #{otherToCnyExchangeRate,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -623,7 +637,8 @@
       payer_id = #{payerId,jdbcType=VARCHAR},
       currency = #{currency,jdbcType=VARCHAR},
       currency_id = #{currencyId,jdbcType=INTEGER},
-      other_to_cny_exchange_rate = #{otherToCnyExchangeRate,jdbcType=DECIMAL}
+      other_to_cny_exchange_rate = #{otherToCnyExchangeRate,jdbcType=DECIMAL},
+      type = #{type,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseFinancePaypal">
@@ -715,6 +730,9 @@
       <if test="otherToCnyExchangeRate != null">
         other_to_cny_exchange_rate,
       </if>
+      <if test="type != null">
+        type,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -799,6 +817,9 @@
       <if test="otherToCnyExchangeRate != null">
         #{otherToCnyExchangeRate,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=VARCHAR},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -883,6 +904,9 @@
       <if test="otherToCnyExchangeRate != null">
         other_to_cny_exchange_rate = #{otherToCnyExchangeRate,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseFinancePaypal">
@@ -896,7 +920,7 @@
       payment_date, gross_amount, fee_amount, settle_amount, tax_amount, exchange_rate, 
       payment_status, pending_reason, reason_code, create_time, saas_company_id, gmt_create_time, 
       gmt_modify_time, business, receiver, receiver_id, payer, payer_id, currency, currency_id, 
-      other_to_cny_exchange_rate)
+      other_to_cny_exchange_rate, type)
     values
     (#{id,jdbcType=INTEGER}, #{transactionId,jdbcType=VARCHAR}, #{parentTransactionId,jdbcType=VARCHAR}, 
       #{receiptId,jdbcType=VARCHAR}, #{transactionType,jdbcType=VARCHAR}, #{paymentType,jdbcType=VARCHAR}, 
@@ -906,8 +930,8 @@
       #{createTime,jdbcType=TIMESTAMP}, #{saasCompanyId,jdbcType=INTEGER}, #{gmtCreateTime,jdbcType=TIMESTAMP}, 
       #{gmtModifyTime,jdbcType=TIMESTAMP}, #{business,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, 
       #{receiverId,jdbcType=VARCHAR}, #{payer,jdbcType=VARCHAR}, #{payerId,jdbcType=VARCHAR}, 
-      #{currency,jdbcType=VARCHAR}, #{currencyId,jdbcType=INTEGER}, #{otherToCnyExchangeRate,jdbcType=DECIMAL}
-      )
+      #{currency,jdbcType=VARCHAR}, #{currencyId,jdbcType=INTEGER}, #{otherToCnyExchangeRate,jdbcType=DECIMAL}, 
+      #{type,jdbcType=VARCHAR})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     transaction_id = #{transactionId,jdbcType=VARCHAR}, 
@@ -935,7 +959,8 @@
     payer_id = #{payerId,jdbcType=VARCHAR}, 
     currency = #{currency,jdbcType=VARCHAR}, 
     currency_id = #{currencyId,jdbcType=INTEGER}, 
-    other_to_cny_exchange_rate = #{otherToCnyExchangeRate,jdbcType=DECIMAL}
+    other_to_cny_exchange_rate = #{otherToCnyExchangeRate,jdbcType=DECIMAL}, 
+    type = #{type,jdbcType=VARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseFinancePaypalExample" resultMap="BaseResultMap">
     <!--