数据中心--订单数据源警告

data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/OmsResult.java

@@ -153,6 +153,8 @@ public class OmsResult {
     @JSONField(name = "logisticsItems")
     private List<LogisticsItem> logisticsItems;
 
+    @JSONField(name = "orderChecks")
+    private List<OrderCheck> orderChecks;
 
     /**
      *

data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/OrderCheck.java

+package com.bailuntec.domain.pojo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class OrderCheck {
+
+    private String warningType;
+    private String warningTypeName;
+    private String warningMsg;
+    private boolean isReproduce;
+    private Date creationTime;
+    private Date updateTime;
+}

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

@@ -31,6 +31,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 public class OrderSyncJob extends PointJob {
@@ -119,6 +120,8 @@ public class OrderSyncJob extends PointJob {
                 hasInnerSale(omsResult, dcBaseOmsOrder);
                 //判断是否刷单订单
                 listOrderExceptions(omsResult, dcBaseOmsOrder);
+                //判断数据源报警
+                hasWarning(omsResult, dcBaseOmsOrder);
                 //获取汇率
                 getExchangeRate(omsResult, dcBaseOmsOrder);
                 //这个MAP, key放仓库. value放线物流路
@@ -723,6 +726,16 @@ public class OrderSyncJob extends PointJob {
         }
     }
 
+    private void hasWarning(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder) {
+        List<OrderCheck> checkList = omsResult.getOrderChecks();
+        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(","));
+            dcBaseOmsOrder.setWarningType(warningType);
+            dcBaseOmsOrder.setWarningTypeName(warningTypeName);
+        }
+    }
+
     private BigDecimal getTotalCostLogistics(List<LogisticsItem> logisticsItems, HashMap<String, Logistics> logisticsHashMap) {
         BigDecimal totalCostLogistics = BigDecimal.ZERO;
         if (logisticsItems != null && logisticsItems.size() > 0) {
@@ -1258,6 +1271,8 @@ public class OrderSyncJob extends PointJob {
         //如果是 FBA订单1.检查FBA费用是否异常 2.
         dcBaseOmsSku.setBailunSkuQuantityShipped(0);
         dcBaseOmsSku.setHasFbaS(dcBaseOmsOrder.getHasFbaS());
+        dcBaseOmsSku.setWarningType(dcBaseOmsOrder.getWarningType());
+        dcBaseOmsSku.setWarningTypeName(dcBaseOmsOrder.getWarningTypeName());
     }
 
     /**

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

@@ -935,6 +935,24 @@ public class DcBaseOmsOrder {
     private Boolean hasTransferOrder;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.warning_type
+     *
+     * @mbg.generated
+     */
+    private String warningType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.warning_type_name
+     *
+     * @mbg.generated
+     */
+    private String warningTypeName;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_order
      *
@@ -1049,6 +1067,8 @@ public class DcBaseOmsOrder {
         sb.append(", aftermergedBailunOrderNo=").append(aftermergedBailunOrderNo);
         sb.append(", hasFbaFee=").append(hasFbaFee);
         sb.append(", hasTransferOrder=").append(hasTransferOrder);
+        sb.append(", warningType=").append(warningType);
+        sb.append(", warningTypeName=").append(warningTypeName);
         sb.append("]");
         return sb.toString();
     }
@@ -1173,7 +1193,9 @@ public class DcBaseOmsOrder {
             && (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo()))
             && (this.getAftermergedBailunOrderNo() == null ? other.getAftermergedBailunOrderNo() == null : this.getAftermergedBailunOrderNo().equals(other.getAftermergedBailunOrderNo()))
             && (this.getHasFbaFee() == null ? other.getHasFbaFee() == null : this.getHasFbaFee().equals(other.getHasFbaFee()))
-            && (this.getHasTransferOrder() == null ? other.getHasTransferOrder() == null : this.getHasTransferOrder().equals(other.getHasTransferOrder()));
+            && (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()));
     }
 
     /**
@@ -1289,6 +1311,8 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getAftermergedBailunOrderNo() == null) ? 0 : getAftermergedBailunOrderNo().hashCode());
         result = prime * result + ((getHasFbaFee() == null) ? 0 : getHasFbaFee().hashCode());
         result = prime * result + ((getHasTransferOrder() == null) ? 0 : getHasTransferOrder().hashCode());
+        result = prime * result + ((getWarningType() == null) ? 0 : getWarningType().hashCode());
+        result = prime * result + ((getWarningTypeName() == null) ? 0 : getWarningTypeName().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -1052,6 +1052,24 @@ public class DcBaseOmsSku {
     private Boolean hasTransferOrder;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.warning_type
+     *
+     * @mbg.generated
+     */
+    private String warningType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.warning_type_name
+     *
+     * @mbg.generated
+     */
+    private String warningTypeName;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_sku
      *
@@ -1179,6 +1197,8 @@ public class DcBaseOmsSku {
         sb.append(", bailunSkuQuantityPushed=").append(bailunSkuQuantityPushed);
         sb.append(", amountGeneralCargo=").append(amountGeneralCargo);
         sb.append(", hasTransferOrder=").append(hasTransferOrder);
+        sb.append(", warningType=").append(warningType);
+        sb.append(", warningTypeName=").append(warningTypeName);
         sb.append("]");
         return sb.toString();
     }
@@ -1316,7 +1336,9 @@ public class DcBaseOmsSku {
             && (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()))
             && (this.getBailunSkuQuantityPushed() == null ? other.getBailunSkuQuantityPushed() == null : this.getBailunSkuQuantityPushed().equals(other.getBailunSkuQuantityPushed()))
             && (this.getAmountGeneralCargo() == null ? other.getAmountGeneralCargo() == null : this.getAmountGeneralCargo().equals(other.getAmountGeneralCargo()))
-            && (this.getHasTransferOrder() == null ? other.getHasTransferOrder() == null : this.getHasTransferOrder().equals(other.getHasTransferOrder()));
+            && (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()));
     }
 
     /**
@@ -1445,6 +1467,8 @@ public class DcBaseOmsSku {
         result = prime * result + ((getBailunSkuQuantityPushed() == null) ? 0 : getBailunSkuQuantityPushed().hashCode());
         result = prime * result + ((getAmountGeneralCargo() == null) ? 0 : getAmountGeneralCargo().hashCode());
         result = prime * result + ((getHasTransferOrder() == null) ? 0 : getHasTransferOrder().hashCode());
+        result = prime * result + ((getWarningType() == null) ? 0 : getWarningType().hashCode());
+        result = prime * result + ((getWarningTypeName() == null) ? 0 : getWarningTypeName().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -7000,6 +7000,146 @@ public class DcBaseOmsOrderExample {
             addCriterion("has_transfer_order not between", value1, value2, "hasTransferOrder");
             return (Criteria) this;
         }
+
+        public Criteria andWarningTypeIsNull() {
+            addCriterion("warning_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeIsNotNull() {
+            addCriterion("warning_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeEqualTo(String value) {
+            addCriterion("warning_type =", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNotEqualTo(String value) {
+            addCriterion("warning_type <>", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeGreaterThan(String value) {
+            addCriterion("warning_type >", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("warning_type >=", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeLessThan(String value) {
+            addCriterion("warning_type <", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeLessThanOrEqualTo(String value) {
+            addCriterion("warning_type <=", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeLike(String value) {
+            addCriterion("warning_type like", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNotLike(String value) {
+            addCriterion("warning_type not like", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeIn(List<String> values) {
+            addCriterion("warning_type in", values, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNotIn(List<String> values) {
+            addCriterion("warning_type not in", values, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeBetween(String value1, String value2) {
+            addCriterion("warning_type between", value1, value2, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNotBetween(String value1, String value2) {
+            addCriterion("warning_type not between", value1, value2, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameIsNull() {
+            addCriterion("warning_type_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameIsNotNull() {
+            addCriterion("warning_type_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameEqualTo(String value) {
+            addCriterion("warning_type_name =", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameNotEqualTo(String value) {
+            addCriterion("warning_type_name <>", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameGreaterThan(String value) {
+            addCriterion("warning_type_name >", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameGreaterThanOrEqualTo(String value) {
+            addCriterion("warning_type_name >=", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameLessThan(String value) {
+            addCriterion("warning_type_name <", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameLessThanOrEqualTo(String value) {
+            addCriterion("warning_type_name <=", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameLike(String value) {
+            addCriterion("warning_type_name like", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameNotLike(String value) {
+            addCriterion("warning_type_name not like", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameIn(List<String> values) {
+            addCriterion("warning_type_name in", values, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameNotIn(List<String> values) {
+            addCriterion("warning_type_name not in", values, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameBetween(String value1, String value2) {
+            addCriterion("warning_type_name between", value1, value2, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameNotBetween(String value1, String value2) {
+            addCriterion("warning_type_name not between", value1, value2, "warningTypeName");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -7830,6 +7830,146 @@ public class DcBaseOmsSkuExample {
             addCriterion("has_transfer_order not between", value1, value2, "hasTransferOrder");
             return (Criteria) this;
         }
+
+        public Criteria andWarningTypeIsNull() {
+            addCriterion("warning_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeIsNotNull() {
+            addCriterion("warning_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeEqualTo(String value) {
+            addCriterion("warning_type =", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNotEqualTo(String value) {
+            addCriterion("warning_type <>", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeGreaterThan(String value) {
+            addCriterion("warning_type >", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("warning_type >=", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeLessThan(String value) {
+            addCriterion("warning_type <", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeLessThanOrEqualTo(String value) {
+            addCriterion("warning_type <=", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeLike(String value) {
+            addCriterion("warning_type like", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNotLike(String value) {
+            addCriterion("warning_type not like", value, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeIn(List<String> values) {
+            addCriterion("warning_type in", values, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNotIn(List<String> values) {
+            addCriterion("warning_type not in", values, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeBetween(String value1, String value2) {
+            addCriterion("warning_type between", value1, value2, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNotBetween(String value1, String value2) {
+            addCriterion("warning_type not between", value1, value2, "warningType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameIsNull() {
+            addCriterion("warning_type_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameIsNotNull() {
+            addCriterion("warning_type_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameEqualTo(String value) {
+            addCriterion("warning_type_name =", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameNotEqualTo(String value) {
+            addCriterion("warning_type_name <>", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameGreaterThan(String value) {
+            addCriterion("warning_type_name >", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameGreaterThanOrEqualTo(String value) {
+            addCriterion("warning_type_name >=", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameLessThan(String value) {
+            addCriterion("warning_type_name <", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameLessThanOrEqualTo(String value) {
+            addCriterion("warning_type_name <=", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameLike(String value) {
+            addCriterion("warning_type_name like", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameNotLike(String value) {
+            addCriterion("warning_type_name not like", value, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameIn(List<String> values) {
+            addCriterion("warning_type_name in", values, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameNotIn(List<String> values) {
+            addCriterion("warning_type_name not in", values, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameBetween(String value1, String value2) {
+            addCriterion("warning_type_name between", value1, value2, "warningTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andWarningTypeNameNotBetween(String value1, String value2) {
+            addCriterion("warning_type_name not between", value1, value2, "warningTypeName");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -109,6 +109,8 @@
     <result column="aftermerged_bailun_order_no" jdbcType="VARCHAR" property="aftermergedBailunOrderNo" />
     <result column="has_fba_fee" jdbcType="BIT" property="hasFbaFee" />
     <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" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -200,7 +202,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
+    has_fba_fee, has_transfer_order, warning_type, warning_type_name
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
     <!--
@@ -298,7 +300,8 @@
       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)
+      has_fba_fee, has_transfer_order, warning_type, 
+      warning_type_name)
     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}, 
@@ -336,7 +339,8 @@
       #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{profitOms,jdbcType=DECIMAL}, 
       #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR}, 
       #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, 
-      #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT})
+      #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, 
+      #{warningTypeName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
     <!--
@@ -654,6 +658,12 @@
       <if test="hasTransferOrder != null">
         has_transfer_order,
       </if>
+      <if test="warningType != null">
+        warning_type,
+      </if>
+      <if test="warningTypeName != null">
+        warning_type_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -965,6 +975,12 @@
       <if test="hasTransferOrder != null">
         #{hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="warningType != null">
+        #{warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="warningTypeName != null">
+        #{warningTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
@@ -1293,6 +1309,12 @@
       <if test="record.hasTransferOrder != null">
         has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="record.warningType != null">
+        warning_type = #{record.warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warningTypeName != null">
+        warning_type_name = #{record.warningTypeName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1406,7 +1428,9 @@
       amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL},
       aftermerged_bailun_order_no = #{record.aftermergedBailunOrderNo,jdbcType=VARCHAR},
       has_fba_fee = #{record.hasFbaFee,jdbcType=BIT},
-      has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT}
+      has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT},
+      warning_type = #{record.warningType,jdbcType=VARCHAR},
+      warning_type_name = #{record.warningTypeName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1724,6 +1748,12 @@
       <if test="hasTransferOrder != null">
         has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="warningType != null">
+        warning_type = #{warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="warningTypeName != null">
+        warning_type_name = #{warningTypeName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1834,7 +1864,9 @@
       amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
       aftermerged_bailun_order_no = #{aftermergedBailunOrderNo,jdbcType=VARCHAR},
       has_fba_fee = #{hasFbaFee,jdbcType=BIT},
-      has_transfer_order = #{hasTransferOrder,jdbcType=BIT}
+      has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
+      warning_type = #{warningType,jdbcType=VARCHAR},
+      warning_type_name = #{warningTypeName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
@@ -2154,6 +2186,12 @@
       <if test="hasTransferOrder != null">
         has_transfer_order,
       </if>
+      <if test="warningType != null">
+        warning_type,
+      </if>
+      <if test="warningTypeName != null">
+        warning_type_name,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -2466,6 +2504,12 @@
       <if test="hasTransferOrder != null">
         #{hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="warningType != null">
+        #{warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="warningTypeName != null">
+        #{warningTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -2778,6 +2822,12 @@
       <if test="hasTransferOrder != null">
         has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="warningType != null">
+        warning_type = #{warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="warningTypeName != null">
+        warning_type_name = #{warningTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
@@ -2806,8 +2856,8 @@
       logistics_warehouse_code, logistics_warehouse_name, 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
-      )
+      has_fba_s, amount_general_cargo, aftermerged_bailun_order_no, has_fba_fee, has_transfer_order, 
+      warning_type, warning_type_name)
     values
     (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, 
       #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, 
@@ -2846,7 +2896,8 @@
       #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{profitOms,jdbcType=DECIMAL}, 
       #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR}, 
       #{hasFbaS,jdbcType=BIT}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, 
-      #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT})
+      #{hasFbaFee,jdbcType=BIT}, #{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, 
+      #{warningTypeName,jdbcType=VARCHAR})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     origin_order_id = #{originOrderId,jdbcType=VARCHAR}, 
@@ -2950,7 +3001,9 @@
     amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}, 
     aftermerged_bailun_order_no = #{aftermergedBailunOrderNo,jdbcType=VARCHAR}, 
     has_fba_fee = #{hasFbaFee,jdbcType=BIT}, 
-    has_transfer_order = #{hasTransferOrder,jdbcType=BIT}
+    has_transfer_order = #{hasTransferOrder,jdbcType=BIT}, 
+    warning_type = #{warningType,jdbcType=VARCHAR}, 
+    warning_type_name = #{warningTypeName,jdbcType=VARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
     <!--

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

@@ -122,6 +122,8 @@
     <result column="bailun_sku_quantity_pushed" jdbcType="INTEGER" property="bailunSkuQuantityPushed" />
     <result column="amount_general_cargo" jdbcType="DECIMAL" property="amountGeneralCargo" />
     <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" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -215,7 +217,8 @@
     ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete, 
     has_scalp, has_buyer_remark, has_platsku_remark, logistics_method_code, logistics_method_name, 
     has_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id, 
-    has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, has_transfer_order
+    has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, has_transfer_order, 
+    warning_type, warning_type_name
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
     <!--
@@ -317,7 +320,8 @@
       has_innersale, company_id, bailun_refund_status, 
       refund_obj, refund_type, refund_reference_id, 
       has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, 
-      has_transfer_order)
+      has_transfer_order, warning_type, warning_type_name
+      )
     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}, 
@@ -359,7 +363,8 @@
       #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{bailunRefundStatus,jdbcType=VARCHAR}, 
       #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR}, 
       #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{amountGeneralCargo,jdbcType=DECIMAL}, 
-      #{hasTransferOrder,jdbcType=BIT})
+      #{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, #{warningTypeName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
     <!--
@@ -716,6 +721,12 @@
       <if test="hasTransferOrder != null">
         has_transfer_order,
       </if>
+      <if test="warningType != null">
+        warning_type,
+      </if>
+      <if test="warningTypeName != null">
+        warning_type_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -1066,6 +1077,12 @@
       <if test="hasTransferOrder != null">
         #{hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="warningType != null">
+        #{warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="warningTypeName != null">
+        #{warningTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
@@ -1433,6 +1450,12 @@
       <if test="record.hasTransferOrder != null">
         has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="record.warningType != null">
+        warning_type = #{record.warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.warningTypeName != null">
+        warning_type_name = #{record.warningTypeName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1559,7 +1582,9 @@
       has_fba_s = #{record.hasFbaS,jdbcType=BIT},
       bailun_sku_quantity_pushed = #{record.bailunSkuQuantityPushed,jdbcType=INTEGER},
       amount_general_cargo = #{record.amountGeneralCargo,jdbcType=DECIMAL},
-      has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT}
+      has_transfer_order = #{record.hasTransferOrder,jdbcType=BIT},
+      warning_type = #{record.warningType,jdbcType=VARCHAR},
+      warning_type_name = #{record.warningTypeName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1916,6 +1941,12 @@
       <if test="hasTransferOrder != null">
         has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="warningType != null">
+        warning_type = #{warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="warningTypeName != null">
+        warning_type_name = #{warningTypeName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -2039,7 +2070,9 @@
       has_fba_s = #{hasFbaS,jdbcType=BIT},
       bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
       amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
-      has_transfer_order = #{hasTransferOrder,jdbcType=BIT}
+      has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
+      warning_type = #{warningType,jdbcType=VARCHAR},
+      warning_type_name = #{warningTypeName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
@@ -2398,6 +2431,12 @@
       <if test="hasTransferOrder != null">
         has_transfer_order,
       </if>
+      <if test="warningType != null">
+        warning_type,
+      </if>
+      <if test="warningTypeName != null">
+        warning_type_name,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -2749,6 +2788,12 @@
       <if test="hasTransferOrder != null">
         #{hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="warningType != null">
+        #{warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="warningTypeName != null">
+        #{warningTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -3100,6 +3145,12 @@
       <if test="hasTransferOrder != null">
         has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
       </if>
+      <if test="warningType != null">
+        warning_type = #{warningType,jdbcType=VARCHAR},
+      </if>
+      <if test="warningTypeName != null">
+        warning_type_name = #{warningTypeName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
@@ -3132,7 +3183,7 @@
       has_delete, has_scalp, has_buyer_remark, has_platsku_remark, logistics_method_code, 
       logistics_method_name, has_innersale, company_id, bailun_refund_status, refund_obj, 
       refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, 
-      has_transfer_order)
+      has_transfer_order, warning_type, warning_type_name)
     values
     (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, 
       #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, 
@@ -3175,7 +3226,8 @@
       #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{bailunRefundStatus,jdbcType=VARCHAR}, 
       #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR}, 
       #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{amountGeneralCargo,jdbcType=DECIMAL}, 
-      #{hasTransferOrder,jdbcType=BIT})
+      #{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, #{warningTypeName,jdbcType=VARCHAR}
+      )
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     origin_order_id = #{originOrderId,jdbcType=VARCHAR}, 
@@ -3292,7 +3344,9 @@
     has_fba_s = #{hasFbaS,jdbcType=BIT}, 
     bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER}, 
     amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}, 
-    has_transfer_order = #{hasTransferOrder,jdbcType=BIT}
+    has_transfer_order = #{hasTransferOrder,jdbcType=BIT}, 
+    warning_type = #{warningType,jdbcType=VARCHAR}, 
+    warning_type_name = #{warningTypeName,jdbcType=VARCHAR}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
     <!--