crm退费新增deleted、freeze字段

data-base/base-sync-crm-refund/src/main/java/com/bailuntec/domain/pojo/RefundItem.java

@@ -47,5 +47,8 @@ public class RefundItem {
     private Integer bailunSkuQuantityRefund;
     @JSONField(name = "saas_company_id")
     private Integer companyId;
-
+    @JSONField(name = "IsDeleted")
+    private Integer isDeleted;
+    @JSONField(name = "IsFreeze")
+    private Integer isFreeze;
 }

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

@@ -215,6 +215,24 @@ public class DcBaseCrmRefund {
     private BigDecimal productSaleAmount;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_crm_refund.is_deleted
+     *
+     * @mbg.generated
+     */
+    private Boolean isDeleted;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_crm_refund.is_freeze
+     *
+     * @mbg.generated
+     */
+    private Boolean isFreeze;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_crm_refund
      *
@@ -249,6 +267,8 @@ public class DcBaseCrmRefund {
         sb.append(", orderTotalAmount=").append(orderTotalAmount);
         sb.append(", usdOrderTotalAmount=").append(usdOrderTotalAmount);
         sb.append(", productSaleAmount=").append(productSaleAmount);
+        sb.append(", isDeleted=").append(isDeleted);
+        sb.append(", isFreeze=").append(isFreeze);
         sb.append("]");
         return sb.toString();
     }
@@ -293,7 +313,9 @@ public class DcBaseCrmRefund {
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
             && (this.getOrderTotalAmount() == null ? other.getOrderTotalAmount() == null : this.getOrderTotalAmount().equals(other.getOrderTotalAmount()))
             && (this.getUsdOrderTotalAmount() == null ? other.getUsdOrderTotalAmount() == null : this.getUsdOrderTotalAmount().equals(other.getUsdOrderTotalAmount()))
-            && (this.getProductSaleAmount() == null ? other.getProductSaleAmount() == null : this.getProductSaleAmount().equals(other.getProductSaleAmount()));
+            && (this.getProductSaleAmount() == null ? other.getProductSaleAmount() == null : this.getProductSaleAmount().equals(other.getProductSaleAmount()))
+            && (this.getIsDeleted() == null ? other.getIsDeleted() == null : this.getIsDeleted().equals(other.getIsDeleted()))
+            && (this.getIsFreeze() == null ? other.getIsFreeze() == null : this.getIsFreeze().equals(other.getIsFreeze()));
     }
 
     /**
@@ -329,6 +351,8 @@ public class DcBaseCrmRefund {
         result = prime * result + ((getOrderTotalAmount() == null) ? 0 : getOrderTotalAmount().hashCode());
         result = prime * result + ((getUsdOrderTotalAmount() == null) ? 0 : getUsdOrderTotalAmount().hashCode());
         result = prime * result + ((getProductSaleAmount() == null) ? 0 : getProductSaleAmount().hashCode());
+        result = prime * result + ((getIsDeleted() == null) ? 0 : getIsDeleted().hashCode());
+        result = prime * result + ((getIsFreeze() == null) ? 0 : getIsFreeze().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -1820,6 +1820,126 @@ public class DcBaseCrmRefundExample {
             addCriterion("product_sale_amount not between", value1, value2, "productSaleAmount");
             return (Criteria) this;
         }
+
+        public Criteria andIsDeletedIsNull() {
+            addCriterion("is_deleted is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedIsNotNull() {
+            addCriterion("is_deleted is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedEqualTo(Boolean value) {
+            addCriterion("is_deleted =", value, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedNotEqualTo(Boolean value) {
+            addCriterion("is_deleted <>", value, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedGreaterThan(Boolean value) {
+            addCriterion("is_deleted >", value, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_deleted >=", value, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedLessThan(Boolean value) {
+            addCriterion("is_deleted <", value, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_deleted <=", value, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedIn(List<Boolean> values) {
+            addCriterion("is_deleted in", values, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedNotIn(List<Boolean> values) {
+            addCriterion("is_deleted not in", values, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_deleted between", value1, value2, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsDeletedNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_deleted not between", value1, value2, "isDeleted");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeIsNull() {
+            addCriterion("is_freeze is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeIsNotNull() {
+            addCriterion("is_freeze is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeEqualTo(Boolean value) {
+            addCriterion("is_freeze =", value, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeNotEqualTo(Boolean value) {
+            addCriterion("is_freeze <>", value, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeGreaterThan(Boolean value) {
+            addCriterion("is_freeze >", value, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_freeze >=", value, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeLessThan(Boolean value) {
+            addCriterion("is_freeze <", value, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_freeze <=", value, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeIn(List<Boolean> values) {
+            addCriterion("is_freeze in", values, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeNotIn(List<Boolean> values) {
+            addCriterion("is_freeze not in", values, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_freeze between", value1, value2, "isFreeze");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsFreezeNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_freeze not between", value1, value2, "isFreeze");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -29,6 +29,8 @@
     <result column="order_total_amount" jdbcType="DECIMAL" property="orderTotalAmount" />
     <result column="usd_order_total_amount" jdbcType="DECIMAL" property="usdOrderTotalAmount" />
     <result column="product_sale_amount" jdbcType="DECIMAL" property="productSaleAmount" />
+    <result column="is_deleted" jdbcType="BIT" property="isDeleted" />
+    <result column="is_freeze" jdbcType="BIT" property="isFreeze" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -104,7 +106,8 @@
     id, platform_type, bailun_account, bailun_account_id, website, origin_order_id, bailun_sku, 
     platform_sku, amount_refund, order_currency, refund_time, bailun_sku_quantity_refund, 
     bailun_sku_unit_price, gmt_create, gmt_modified, linked, amount_refund_rmb, crm_id, 
-    amount_refund_usd, company_id, order_total_amount, usd_order_total_amount, product_sale_amount
+    amount_refund_usd, company_id, order_total_amount, usd_order_total_amount, product_sale_amount, 
+    is_deleted, is_freeze
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultMap="BaseResultMap">
     <!--
@@ -172,7 +175,8 @@
       bailun_sku_unit_price, gmt_create, gmt_modified, 
       linked, amount_refund_rmb, crm_id, 
       amount_refund_usd, company_id, order_total_amount, 
-      usd_order_total_amount, product_sale_amount)
+      usd_order_total_amount, product_sale_amount, 
+      is_deleted, is_freeze)
     values (#{id,jdbcType=INTEGER}, #{platformType,jdbcType=VARCHAR}, #{bailunAccount,jdbcType=VARCHAR}, 
       #{bailunAccountId,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR}, 
       #{bailunSku,jdbcType=VARCHAR}, #{platformSku,jdbcType=VARCHAR}, #{amountRefund,jdbcType=DECIMAL}, 
@@ -180,7 +184,8 @@
       #{bailunSkuUnitPrice,jdbcType=DECIMAL}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
       #{linked,jdbcType=BIT}, #{amountRefundRmb,jdbcType=DECIMAL}, #{crmId,jdbcType=INTEGER}, 
       #{amountRefundUsd,jdbcType=DECIMAL}, #{companyId,jdbcType=INTEGER}, #{orderTotalAmount,jdbcType=DECIMAL}, 
-      #{usdOrderTotalAmount,jdbcType=DECIMAL}, #{productSaleAmount,jdbcType=DECIMAL})
+      #{usdOrderTotalAmount,jdbcType=DECIMAL}, #{productSaleAmount,jdbcType=DECIMAL}, 
+      #{isDeleted,jdbcType=BIT}, #{isFreeze,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
     <!--
@@ -258,6 +263,12 @@
       <if test="productSaleAmount != null">
         product_sale_amount,
       </if>
+      <if test="isDeleted != null">
+        is_deleted,
+      </if>
+      <if test="isFreeze != null">
+        is_freeze,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -329,6 +340,12 @@
       <if test="productSaleAmount != null">
         #{productSaleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="isDeleted != null">
+        #{isDeleted,jdbcType=BIT},
+      </if>
+      <if test="isFreeze != null">
+        #{isFreeze,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultType="java.lang.Long">
@@ -417,6 +434,12 @@
       <if test="record.productSaleAmount != null">
         product_sale_amount = #{record.productSaleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="record.isDeleted != null">
+        is_deleted = #{record.isDeleted,jdbcType=BIT},
+      </if>
+      <if test="record.isFreeze != null">
+        is_freeze = #{record.isFreeze,jdbcType=BIT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -450,7 +473,9 @@
       company_id = #{record.companyId,jdbcType=INTEGER},
       order_total_amount = #{record.orderTotalAmount,jdbcType=DECIMAL},
       usd_order_total_amount = #{record.usdOrderTotalAmount,jdbcType=DECIMAL},
-      product_sale_amount = #{record.productSaleAmount,jdbcType=DECIMAL}
+      product_sale_amount = #{record.productSaleAmount,jdbcType=DECIMAL},
+      is_deleted = #{record.isDeleted,jdbcType=BIT},
+      is_freeze = #{record.isFreeze,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -528,6 +553,12 @@
       <if test="productSaleAmount != null">
         product_sale_amount = #{productSaleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="isDeleted != null">
+        is_deleted = #{isDeleted,jdbcType=BIT},
+      </if>
+      <if test="isFreeze != null">
+        is_freeze = #{isFreeze,jdbcType=BIT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -558,7 +589,9 @@
       company_id = #{companyId,jdbcType=INTEGER},
       order_total_amount = #{orderTotalAmount,jdbcType=DECIMAL},
       usd_order_total_amount = #{usdOrderTotalAmount,jdbcType=DECIMAL},
-      product_sale_amount = #{productSaleAmount,jdbcType=DECIMAL}
+      product_sale_amount = #{productSaleAmount,jdbcType=DECIMAL},
+      is_deleted = #{isDeleted,jdbcType=BIT},
+      is_freeze = #{isFreeze,jdbcType=BIT}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
@@ -638,6 +671,12 @@
       <if test="productSaleAmount != null">
         product_sale_amount,
       </if>
+      <if test="isDeleted != null">
+        is_deleted,
+      </if>
+      <if test="isFreeze != null">
+        is_freeze,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -710,6 +749,12 @@
       <if test="productSaleAmount != null">
         #{productSaleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="isDeleted != null">
+        #{isDeleted,jdbcType=BIT},
+      </if>
+      <if test="isFreeze != null">
+        #{isFreeze,jdbcType=BIT},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -782,6 +827,12 @@
       <if test="productSaleAmount != null">
         product_sale_amount = #{productSaleAmount,jdbcType=DECIMAL},
       </if>
+      <if test="isDeleted != null">
+        is_deleted = #{isDeleted,jdbcType=BIT},
+      </if>
+      <if test="isFreeze != null">
+        is_freeze = #{isFreeze,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseCrmRefund">
@@ -794,8 +845,8 @@
     (id, platform_type, bailun_account, bailun_account_id, website, origin_order_id, 
       bailun_sku, platform_sku, amount_refund, order_currency, refund_time, bailun_sku_quantity_refund, 
       bailun_sku_unit_price, gmt_create, gmt_modified, linked, amount_refund_rmb, crm_id, 
-      amount_refund_usd, company_id, order_total_amount, usd_order_total_amount, product_sale_amount
-      )
+      amount_refund_usd, company_id, order_total_amount, usd_order_total_amount, product_sale_amount, 
+      is_deleted, is_freeze)
     values
     (#{id,jdbcType=INTEGER}, #{platformType,jdbcType=VARCHAR}, #{bailunAccount,jdbcType=VARCHAR}, 
       #{bailunAccountId,jdbcType=INTEGER}, #{website,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR}, 
@@ -804,7 +855,8 @@
       #{bailunSkuUnitPrice,jdbcType=DECIMAL}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, 
       #{linked,jdbcType=BIT}, #{amountRefundRmb,jdbcType=DECIMAL}, #{crmId,jdbcType=INTEGER}, 
       #{amountRefundUsd,jdbcType=DECIMAL}, #{companyId,jdbcType=INTEGER}, #{orderTotalAmount,jdbcType=DECIMAL}, 
-      #{usdOrderTotalAmount,jdbcType=DECIMAL}, #{productSaleAmount,jdbcType=DECIMAL})
+      #{usdOrderTotalAmount,jdbcType=DECIMAL}, #{productSaleAmount,jdbcType=DECIMAL}, 
+      #{isDeleted,jdbcType=BIT}, #{isFreeze,jdbcType=BIT})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     platform_type = #{platformType,jdbcType=VARCHAR}, 
@@ -828,7 +880,9 @@
     company_id = #{companyId,jdbcType=INTEGER}, 
     order_total_amount = #{orderTotalAmount,jdbcType=DECIMAL}, 
     usd_order_total_amount = #{usdOrderTotalAmount,jdbcType=DECIMAL}, 
-    product_sale_amount = #{productSaleAmount,jdbcType=DECIMAL}
+    product_sale_amount = #{productSaleAmount,jdbcType=DECIMAL}, 
+    is_deleted = #{isDeleted,jdbcType=BIT}, 
+    is_freeze = #{isFreeze,jdbcType=BIT}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultMap="BaseResultMap">
     <!--