数据中心--退款数据记录

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -730,6 +730,7 @@ public class OrderSyncJob extends PointJob {
         List<OrderCheck> checkList = omsResult.getOrderChecks();
         dcBaseOmsOrder.setWarningType("");
         dcBaseOmsOrder.setWarningTypeName("");
+        dcBaseOmsOrder.setRefundJson(JSON.toJSONString(omsResult.getRefundInfo()));
         if(checkList != null && checkList.size() > 0) {
             String warningType = checkList.stream().map(o -> o.getWarningType()).collect(Collectors.joining(","));
             String warningTypeName = checkList.stream().map(o -> o.getWarningTypeName()).collect(Collectors.joining(","));

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

@@ -953,6 +953,15 @@ public class DcBaseOmsOrder {
     private String warningTypeName;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.refund_json
+     *
+     * @mbg.generated
+     */
+    private String refundJson;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_order
      *
@@ -1069,6 +1078,7 @@ public class DcBaseOmsOrder {
         sb.append(", hasTransferOrder=").append(hasTransferOrder);
         sb.append(", warningType=").append(warningType);
         sb.append(", warningTypeName=").append(warningTypeName);
+        sb.append(", refundJson=").append(refundJson);
         sb.append("]");
         return sb.toString();
     }
@@ -1195,7 +1205,8 @@ public class DcBaseOmsOrder {
             && (this.getHasFbaFee() == null ? other.getHasFbaFee() == null : this.getHasFbaFee().equals(other.getHasFbaFee()))
             && (this.getHasTransferOrder() == null ? other.getHasTransferOrder() == null : this.getHasTransferOrder().equals(other.getHasTransferOrder()))
             && (this.getWarningType() == null ? other.getWarningType() == null : this.getWarningType().equals(other.getWarningType()))
-            && (this.getWarningTypeName() == null ? other.getWarningTypeName() == null : this.getWarningTypeName().equals(other.getWarningTypeName()));
+            && (this.getWarningTypeName() == null ? other.getWarningTypeName() == null : this.getWarningTypeName().equals(other.getWarningTypeName()))
+            && (this.getRefundJson() == null ? other.getRefundJson() == null : this.getRefundJson().equals(other.getRefundJson()));
     }
 
     /**
@@ -1313,6 +1324,7 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getHasTransferOrder() == null) ? 0 : getHasTransferOrder().hashCode());
         result = prime * result + ((getWarningType() == null) ? 0 : getWarningType().hashCode());
         result = prime * result + ((getWarningTypeName() == null) ? 0 : getWarningTypeName().hashCode());
+        result = prime * result + ((getRefundJson() == null) ? 0 : getRefundJson().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -7140,6 +7140,76 @@ public class DcBaseOmsOrderExample {
             addCriterion("warning_type_name not between", value1, value2, "warningTypeName");
             return (Criteria) this;
         }
+
+        public Criteria andRefundJsonIsNull() {
+            addCriterion("refund_json is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonIsNotNull() {
+            addCriterion("refund_json is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonEqualTo(String value) {
+            addCriterion("refund_json =", value, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonNotEqualTo(String value) {
+            addCriterion("refund_json <>", value, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonGreaterThan(String value) {
+            addCriterion("refund_json >", value, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonGreaterThanOrEqualTo(String value) {
+            addCriterion("refund_json >=", value, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonLessThan(String value) {
+            addCriterion("refund_json <", value, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonLessThanOrEqualTo(String value) {
+            addCriterion("refund_json <=", value, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonLike(String value) {
+            addCriterion("refund_json like", value, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonNotLike(String value) {
+            addCriterion("refund_json not like", value, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonIn(List<String> values) {
+            addCriterion("refund_json in", values, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonNotIn(List<String> values) {
+            addCriterion("refund_json not in", values, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonBetween(String value1, String value2) {
+            addCriterion("refund_json between", value1, value2, "refundJson");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefundJsonNotBetween(String value1, String value2) {
+            addCriterion("refund_json not between", value1, value2, "refundJson");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -111,6 +111,7 @@
     <result column="has_transfer_order" jdbcType="BIT" property="hasTransferOrder" />
     <result column="warning_type" jdbcType="VARCHAR" property="warningType" />
     <result column="warning_type_name" jdbcType="VARCHAR" property="warningTypeName" />
+    <result column="refund_json" jdbcType="VARCHAR" property="refundJson" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -202,7 +203,7 @@
     logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics, 
     has_scalp, has_buyer_remark, has_platsku_remark, has_innersale, company_id, profit_oms, 
     refund_obj, refund_type, refund_reference_id, has_fba_s, amount_general_cargo, aftermerged_bailun_order_no, 
-    has_fba_fee, has_transfer_order, warning_type, warning_type_name
+    has_fba_fee, has_transfer_order, warning_type, warning_type_name, refund_json
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
     <!--
@@ -301,7 +302,7 @@
       refund_obj, refund_type, refund_reference_id, 
       has_fba_s, amount_general_cargo, aftermerged_bailun_order_no, 
       has_fba_fee, has_transfer_order, warning_type, 
-      warning_type_name)
+      warning_type_name, refund_json)
     values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, 
       #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, 
       #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, 
@@ -340,7 +341,7 @@
       #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR}, 
       #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, 
       #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, 
-      #{warningTypeName,jdbcType=VARCHAR})
+      #{warningTypeName,jdbcType=VARCHAR}, #{refundJson,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
     <!--
@@ -664,6 +665,9 @@
       <if test="warningTypeName != null">
         warning_type_name,
       </if>
+      <if test="refundJson != null">
+        refund_json,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -981,6 +985,9 @@
       <if test="warningTypeName != null">
         #{warningTypeName,jdbcType=VARCHAR},
       </if>
+      <if test="refundJson != null">
+        #{refundJson,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
@@ -1315,6 +1322,9 @@
       <if test="record.warningTypeName != null">
         warning_type_name = #{record.warningTypeName,jdbcType=VARCHAR},
       </if>
+      <if test="record.refundJson != null">
+        refund_json = #{record.refundJson,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1430,7 +1440,8 @@
       has_fba_fee = #{record.hasFbaFee,jdbcType=BIT},
       has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT},
       warning_type = #{record.warningType,jdbcType=VARCHAR},
-      warning_type_name = #{record.warningTypeName,jdbcType=VARCHAR}
+      warning_type_name = #{record.warningTypeName,jdbcType=VARCHAR},
+      refund_json = #{record.refundJson,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1754,6 +1765,9 @@
       <if test="warningTypeName != null">
         warning_type_name = #{warningTypeName,jdbcType=VARCHAR},
       </if>
+      <if test="refundJson != null">
+        refund_json = #{refundJson,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1866,7 +1880,8 @@
       has_fba_fee = #{hasFbaFee,jdbcType=BIT},
       has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
       warning_type = #{warningType,jdbcType=VARCHAR},
-      warning_type_name = #{warningTypeName,jdbcType=VARCHAR}
+      warning_type_name = #{warningTypeName,jdbcType=VARCHAR},
+      refund_json = #{refundJson,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
@@ -2192,6 +2207,9 @@
       <if test="warningTypeName != null">
         warning_type_name,
       </if>
+      <if test="refundJson != null">
+        refund_json,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -2510,6 +2528,9 @@
       <if test="warningTypeName != null">
         #{warningTypeName,jdbcType=VARCHAR},
       </if>
+      <if test="refundJson != null">
+        #{refundJson,jdbcType=VARCHAR},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -2828,6 +2849,9 @@
       <if test="warningTypeName != null">
         warning_type_name = #{warningTypeName,jdbcType=VARCHAR},
       </if>
+      <if test="refundJson != null">
+        refund_json = #{refundJson,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
@@ -2857,7 +2881,7 @@
       bailun_picking_status, bailun_require_logistics, has_scalp, has_buyer_remark, has_platsku_remark, 
       has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id, 
       has_fba_s, amount_general_cargo, aftermerged_bailun_order_no, has_fba_fee, has_transfer_order, 
-      warning_type, warning_type_name)
+      warning_type, warning_type_name, refund_json)
     values
     (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, 
       #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, 
@@ -2897,7 +2921,7 @@
       #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR}, 
       #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, 
       #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, 
-      #{warningTypeName,jdbcType=VARCHAR})
+      #{warningTypeName,jdbcType=VARCHAR}, #{refundJson,jdbcType=VARCHAR})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     origin_order_id = #{originOrderId,jdbcType=VARCHAR}, 
@@ -3003,7 +3027,8 @@
     has_fba_fee = #{hasFbaFee,jdbcType=BIT}, 
     has_transfer_order = #{hasTransferOrder,jdbcType=BIT}, 
     warning_type = #{warningType,jdbcType=VARCHAR}, 
-    warning_type_name = #{warningTypeName,jdbcType=VARCHAR}
+    warning_type_name = #{warningTypeName,jdbcType=VARCHAR}, 
+    refund_json = #{refundJson,jdbcType=VARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
     <!--