订单添加判断是否刷单订单.

data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/enumerate/OrderExceptionType.java

+package com.bailuntec.domain.enumerate;
+
+public enum OrderExceptionType {
+    SkuMapLost(1,"SkuMapLost"),//Sku映射缺失
+    ReceiptAddressError(2,"ReceiptAddressError"),//地址识别异常
+    BuyerRemark(3,"BuyerRemark"),//顾客留言
+    LogisticsUnknown(4,"LogisticsUnknown"),//无匹配物流规则
+    WareHouseUnknown(5,"WareHouseUnknown"),//无匹配仓库规则
+    BailunOrder(6,"BailunOrder"),//订单问题规则
+    EbaySpecific(7,"EbaySpecific"),//Ebay特有异常
+    PickingApply(8,"PickingApply"),//配货拦截
+    PlatSkuRemark(9,"PlatSkuRemark"),//产品备注
+    StopPicking(10,"StopPicking"),//人为暂停配货
+    SpecifiedLogisticsUnVerify(11,"SpecifiedLogisticsUnVerify"),//指定物流不可用
+    NoValidLogistics(12,"NoValidLogistics"),//物流配置限制不可用
+    NoValidWarehouse(13,"NoValidWarehouse"),//无该区域发货仓库
+    Scalp(14,"Scalp"),//刷单异常
+    ReceivierPhoneError(15,"ReceivierPhoneError"),//电话/联系人异常
+    Huanqiu(23,"Huanqiu");//环球未配货
+
+    private final int code;
+    private final String value;
+
+
+    OrderExceptionType(int code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public int code() {
+        return code;
+    }
+}

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

@@ -267,6 +267,16 @@ public class OmsResult {
      */
     @JSONField(name = "orderCharge")
     private OrderCharge orderCharge;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.shipping_status
+     *
+     * @mbg.generated
+     */
+    @JSONField(name = "orderExceptions")
+    private List<OrderException> orderExceptions;
     /**
      *
      * This field was generated by MyBatis Generator.

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

+package com.bailuntec.domain.pojo;
+
+import lombok.Data;
+
+@Data
+public class OrderException {
+    private Integer id;
+    private String bailunOrderId;
+    private String exceptionType;
+    private String status;
+}

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.bailuntec.domain.constant.CommonConstant;
 import com.bailuntec.domain.constant.Constant;
 import com.bailuntec.domain.entity.*;
+import com.bailuntec.domain.enumerate.OrderExceptionType;
 import com.bailuntec.domain.enumerate.PlatformType;
 import com.bailuntec.domain.example.*;
 import com.bailuntec.domain.pojo.*;
@@ -74,7 +75,7 @@ public class OrderSyncJob extends PointJob {
         map.put("pageIndex", jobPointLog.getPageIndex() == 0 ? "1" : jobPointLog.getPageIndex().toString());
         map.put("pageCount", jobPointLog.getPageSize().toString());
         //时间回退一点, 避免服务器时间不一致而漏单
-        map.put("BailunLastUpdateTimeFrom", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusMinutes(1)));
+        map.put("BailunLastUpdateTimeFrom", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusMinutes(5)));
         map.put("BailunLastUpdateTimeTo", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getEndTime()));
         Response response = null;
         String omsResultStr = null;
@@ -123,7 +124,8 @@ public class OrderSyncJob extends PointJob {
                 DcBaseOmsOrder dcBaseOmsOrder = new DcBaseOmsOrder();
                 assignmentOrderInfo(omsResult, dcBaseOmsOrder);
                 deleteSku(dcBaseOmsOrder);//因为OMS可能改订单, 部分SKU有可能会被删除, 所以先删除, 再插入, 并且更新退款为未予订单关联
-                Boolean isFbaFeeException = false;
+                //判断是否刷单订单
+                listOrderExceptions(omsResult,dcBaseOmsOrder);
                 // 百伦sku信息, 有销售员和采购价, bailun_sku_order根据sku找对应销售员和采购价
                 HashMap<String, String> saleItemHashMap = putSellerNameInMap(omsResult.getSaleItem());
                 //获取汇率
@@ -163,17 +165,18 @@ public class OrderSyncJob extends PointJob {
                         bailunSkuStructure.setDcBaseWarehouse(dcBaseWarehouse);
                         DcBaseOmsSku dcBaseOmsSku = new DcBaseOmsSku();
                         dcBaseOmsSku.setHasDelete(false);
+                        dcBaseOmsSku.setHasScalp(dcBaseOmsOrder.getHasScalp());
                         /*
                          * 赋值, 初始值避免null
                          */
-                        assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSku, dcBaseWarehouse, saleItemHashMap, isFbaFeeException);
+                        assignmentSkuInfo(omsResult, dcBaseOmsOrder, dcBaseOmsSku, bailunSku, dcBaseWarehouse, saleItemHashMap);
                         if (PlatformType.FBA.value().equals(omsResult.getPlatformType().toUpperCase())) {
                             //FBA费用
                             BigDecimal skuCostFbaFee = bailunSkuStructure.getSkuWeightRatio().multiply(dcBaseOmsOrder.getCostFbaFee()).setScale(3, RoundingMode.HALF_EVEN);
                             dcBaseOmsSku.setCostFbaFee(skuCostFbaFee);
                             //FBA的发货数不用从配货单信息拿, FBA只要下单亚马逊就发货
                             dcBaseOmsSku.setBailunSkuQuantityShipped(bailunSku.getBailunSkuQuantityOrdered());
-                            checkFbaFee(dcBaseOmsSku, isFbaFeeException);
+                            checkFbaFee(dcBaseOmsSku, dcBaseOmsOrder);
                         }
                         bailunSkuStructure.setDcBaseOmsSku(dcBaseOmsSku);
                         bailunSkuInfoMap.put(bailunSku.getBailunSku(), bailunSkuStructure);
@@ -211,8 +214,6 @@ public class OrderSyncJob extends PointJob {
                 } else {
                     costPlatformFeeRMB = dcBaseOmsOrder.getCostPlatformFee().multiply(dcBaseOmsOrder.getSellerOrderExchangeRate()).setScale(3, RoundingMode.HALF_EVEN);
                 }
-                // 是FBA异常订单
-                dcBaseOmsOrder.setHasFbaException(isFbaFeeException);
                 // 如果是亚马逊订单, 检查平台费是否超高
                 if (dcBaseOmsOrder.getPlatformType().toUpperCase().equals(PlatformType.Amazon.value())) {
                     checkPlatformFee(dcBaseOmsOrder);
@@ -394,6 +395,17 @@ public class OrderSyncJob extends PointJob {
         }
     }
 
+    private void listOrderExceptions( OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder) {
+        List<OrderException> orderExceptions = omsResult.getOrderExceptions();
+        if (orderExceptions != null && orderExceptions.size() > 0) {
+            for (OrderException orderException : orderExceptions) {
+                if (StringUtils.isNotBlank(orderException.getExceptionType()) && orderException.getExceptionType().equals(OrderExceptionType.Scalp.value())) {
+                    dcBaseOmsOrder.setHasScalp(true);
+                }
+            }
+        }
+    }
+
     private BigDecimal getTotalCostLogistics(List<LogisticsItem> logisticsItems) {
         BigDecimal totalCostLogistics = BigDecimal.ZERO;
         if (logisticsItems != null && logisticsItems.size() > 0) {
@@ -691,7 +703,7 @@ public class OrderSyncJob extends PointJob {
      *
      * @param dcBaseOmsSku
      */
-    private void checkFbaFee(DcBaseOmsSku dcBaseOmsSku, Boolean isFbaFeeException) {
+    private void checkFbaFee(DcBaseOmsSku dcBaseOmsSku, DcBaseOmsOrder dcBaseOmsOrder) {
         if (dcBaseOmsSku.getBailunSkuQuantityOrdered() > 0 && dcBaseOmsSku.getCostFbaFee().compareTo(BigDecimal.ZERO) == 1) {
             DcMidFbaFeeAvgMapper dcMidFbaFeeAvgMapper = SessionUtil.getSession().getMapper(DcMidFbaFeeAvgMapper.class);
             DcMidFbaFeeAvg dcMidFbaFeeAvg = dcMidFbaFeeAvgMapper.selectOneByExample(DcMidFbaFeeAvgExample.newAndCreateCriteria().andWebsiteEqualTo(dcBaseOmsSku.getWebsite()).andBailunSkuEqualTo(dcBaseOmsSku.getBailunSku()).example());
@@ -699,7 +711,7 @@ public class OrderSyncJob extends PointJob {
                 BigDecimal fbaFeeRmb = dcBaseOmsSku.getCostFbaFee().multiply(dcBaseOmsSku.getFinanceOrderExchangeRate()).divide(BigDecimal.valueOf(dcBaseOmsSku.getBailunSkuQuantityOrdered()), 3, RoundingMode.HALF_EVEN);
                 if (fbaFeeRmb.compareTo(dcMidFbaFeeAvg.getMaxFbaFee()) == 1) {
                     dcBaseOmsSku.setHasFbaException(true);
-                    isFbaFeeException = true;
+                    dcBaseOmsOrder.setHasFbaException(true);
                 }
             }
         }
@@ -801,7 +813,7 @@ public class OrderSyncJob extends PointJob {
      * @param isFbaFeeException
      * @return
      */
-    public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse, HashMap<String, String> saleItemHashMap, Boolean isFbaFeeException) {
+    public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse, HashMap<String, String> saleItemHashMap) {
         dcBaseOmsSku.setBailunInterceptionStatus(dcBaseOmsOrder.getBailunInterceptionStatus());
         dcBaseOmsSku.setBailunSku(bailunSku.getBailunSku());
         if (dcBaseWarehouse != null) {

data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.xml

@@ -92,6 +92,7 @@
     <result column="logistics_method_name" jdbcType="VARCHAR" property="logisticsMethodName" />
     <result column="bailun_picking_status" jdbcType="VARCHAR" property="bailunPickingStatus" />
     <result column="bailun_require_logistics" jdbcType="VARCHAR" property="bailunRequireLogistics" />
+    <result column="has_scalp" jdbcType="BIT" property="hasScalp" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -180,7 +181,8 @@
     receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, 
     buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, 
     gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, 
-    logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics
+    logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics, 
+    has_scalp
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
     <!--
@@ -272,8 +274,8 @@
       gmt_create, gmt_modified, quantity_bailun_sku, 
       logistics_warehouse_code, logistics_warehouse_name, 
       logistics_method_code, logistics_method_name, 
-      bailun_picking_status, bailun_require_logistics
-      )
+      bailun_picking_status, bailun_require_logistics, 
+      has_scalp)
     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}, 
@@ -305,8 +307,8 @@
       #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{quantityBailunSku,jdbcType=INTEGER}, 
       #{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR}, 
       #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR}, 
-      #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}
-      )
+      #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, 
+      #{hasScalp,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
     <!--
@@ -573,6 +575,9 @@
       <if test="bailunRequireLogistics != null">
         bailun_require_logistics,
       </if>
+      <if test="hasScalp != null">
+        has_scalp,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -833,6 +838,9 @@
       <if test="bailunRequireLogistics != null">
         #{bailunRequireLogistics,jdbcType=VARCHAR},
       </if>
+      <if test="hasScalp != null">
+        #{hasScalp,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
@@ -1110,6 +1118,9 @@
       <if test="record.bailunRequireLogistics != null">
         bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
       </if>
+      <if test="record.hasScalp != null">
+        has_scalp = #{record.hasScalp,jdbcType=BIT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1206,7 +1217,8 @@
       logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR},
       logistics_method_name = #{record.logisticsMethodName,jdbcType=VARCHAR},
       bailun_picking_status = #{record.bailunPickingStatus,jdbcType=VARCHAR},
-      bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR}
+      bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
+      has_scalp = #{record.hasScalp,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1473,6 +1485,9 @@
       <if test="bailunRequireLogistics != null">
         bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
       </if>
+      <if test="hasScalp != null">
+        has_scalp = #{hasScalp,jdbcType=BIT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1566,7 +1581,8 @@
       logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
       logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
       bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
-      bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}
+      bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
+      has_scalp = #{hasScalp,jdbcType=BIT}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
@@ -1835,6 +1851,9 @@
       <if test="bailunRequireLogistics != null">
         bailun_require_logistics,
       </if>
+      <if test="hasScalp != null">
+        has_scalp,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -2096,6 +2115,9 @@
       <if test="bailunRequireLogistics != null">
         #{bailunRequireLogistics,jdbcType=VARCHAR},
       </if>
+      <if test="hasScalp != null">
+        #{hasScalp,jdbcType=BIT},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -2357,6 +2379,9 @@
       <if test="bailunRequireLogistics != null">
         bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
       </if>
+      <if test="hasScalp != null">
+        has_scalp = #{hasScalp,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
@@ -2382,8 +2407,8 @@
       receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, 
       buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, 
       gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, 
-      logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics
-      )
+      logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics, 
+      has_scalp)
     values
     (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, 
       #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, 
@@ -2416,8 +2441,8 @@
       #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{quantityBailunSku,jdbcType=INTEGER}, 
       #{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR}, 
       #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR}, 
-      #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}
-      )
+      #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, 
+      #{hasScalp,jdbcType=BIT})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     origin_order_id = #{originOrderId,jdbcType=VARCHAR}, 
@@ -2504,7 +2529,8 @@
     logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR}, 
     logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR}, 
     bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR}, 
-    bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}
+    bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}, 
+    has_scalp = #{hasScalp,jdbcType=BIT}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
     <!--
@@ -2524,6 +2550,7 @@
     limit 1
   </select>
 
+
   <update id="logicDeleteOmsSku">
         update  dc_base_oms_sku set has_delete=1 where origin_order_id=#{originOrderId,jdbcType=VARCHAR} and bailun_account_id = #{bailunAccountId,jdbcType=INTEGER}
   </update>

data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml

@@ -104,6 +104,7 @@
     <result column="bailun_picking_status" jdbcType="VARCHAR" property="bailunPickingStatus" />
     <result column="bailun_require_logistics" jdbcType="VARCHAR" property="bailunRequireLogistics" />
     <result column="has_delete" jdbcType="BIT" property="hasDelete" />
+    <result column="has_scalp" jdbcType="BIT" property="hasScalp" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -194,7 +195,8 @@
     receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code, 
     receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_exception, 
     has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified, 
-    ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete
+    ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete, 
+    has_scalp
   </sql>
   <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
     <!--
@@ -291,7 +293,7 @@
       bailun_category_id, bailun_category_name, gmt_create, 
       gmt_modified, ratio_weight, ratio_price, 
       bailun_picking_status, bailun_require_logistics, 
-      has_delete)
+      has_delete, has_scalp)
     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}, 
@@ -328,7 +330,7 @@
       #{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, 
       #{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}, 
       #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, 
-      #{hasDelete,jdbcType=BIT})
+      #{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT})
   </insert>
   <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
     <!--
@@ -631,6 +633,9 @@
       <if test="hasDelete != null">
         has_delete,
       </if>
+      <if test="hasScalp != null">
+        has_scalp,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -927,6 +932,9 @@
       <if test="hasDelete != null">
         #{hasDelete,jdbcType=BIT},
       </if>
+      <if test="hasScalp != null">
+        #{hasScalp,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
@@ -1240,6 +1248,9 @@
       <if test="record.hasDelete != null">
         has_delete = #{record.hasDelete,jdbcType=BIT},
       </if>
+      <if test="record.hasScalp != null">
+        has_scalp = #{record.hasScalp,jdbcType=BIT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -1348,7 +1359,8 @@
       ratio_price = #{record.ratioPrice,jdbcType=DECIMAL},
       bailun_picking_status = #{record.bailunPickingStatus,jdbcType=VARCHAR},
       bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
-      has_delete = #{record.hasDelete,jdbcType=BIT}
+      has_delete = #{record.hasDelete,jdbcType=BIT},
+      has_scalp = #{record.hasScalp,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1651,6 +1663,9 @@
       <if test="hasDelete != null">
         has_delete = #{hasDelete,jdbcType=BIT},
       </if>
+      <if test="hasScalp != null">
+        has_scalp = #{hasScalp,jdbcType=BIT},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1756,7 +1771,8 @@
       ratio_price = #{ratioPrice,jdbcType=DECIMAL},
       bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
       bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
-      has_delete = #{hasDelete,jdbcType=BIT}
+      has_delete = #{hasDelete,jdbcType=BIT},
+      has_scalp = #{hasScalp,jdbcType=BIT}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
@@ -2061,6 +2077,9 @@
       <if test="hasDelete != null">
         has_delete,
       </if>
+      <if test="hasScalp != null">
+        has_scalp,
+      </if>
     </trim>
     values
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -2358,6 +2377,9 @@
       <if test="hasDelete != null">
         #{hasDelete,jdbcType=BIT},
       </if>
+      <if test="hasScalp != null">
+        #{hasScalp,jdbcType=BIT},
+      </if>
     </trim>
     on duplicate key update 
     <trim suffixOverrides=",">
@@ -2655,6 +2677,9 @@
       <if test="hasDelete != null">
         has_delete = #{hasDelete,jdbcType=BIT},
       </if>
+      <if test="hasScalp != null">
+        has_scalp = #{hasScalp,jdbcType=BIT},
+      </if>
     </trim>
   </insert>
   <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
@@ -2683,7 +2708,7 @@
       receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, buyer_email, 
       has_fba_exception, has_platform_exception, has_cancle, area_id, bailun_category_id, 
       bailun_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status, 
-      bailun_require_logistics, has_delete)
+      bailun_require_logistics, has_delete, has_scalp)
     values
     (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, 
       #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, 
@@ -2721,7 +2746,7 @@
       #{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, 
       #{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}, 
       #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, 
-      #{hasDelete,jdbcType=BIT})
+      #{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT})
     on duplicate key update 
     id = #{id,jdbcType=INTEGER}, 
     origin_order_id = #{originOrderId,jdbcType=VARCHAR}, 
@@ -2820,7 +2845,8 @@
     ratio_price = #{ratioPrice,jdbcType=DECIMAL}, 
     bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR}, 
     bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}, 
-    has_delete = #{hasDelete,jdbcType=BIT}
+    has_delete = #{hasDelete,jdbcType=BIT}, 
+    has_scalp = #{hasScalp,jdbcType=BIT}
   </insert>
   <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
     <!--

data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java

@@ -78,7 +78,7 @@ public class OmsOrderTest {
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
         map.put("pageIndex", "1");
         map.put("pageCount", "100");
-        map.put("OriginOrderNo", "113-3746779-1981056");
+        map.put("OriginOrderNo", "273575005722-2138181383017");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))

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

@@ -782,6 +782,15 @@ public class DcBaseOmsOrder {
     private String bailunRequireLogistics;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.has_scalp
+     *
+     * @mbg.generated
+     */
+    private Boolean hasScalp;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_order
      *
@@ -879,6 +888,7 @@ public class DcBaseOmsOrder {
         sb.append(", logisticsMethodName=").append(logisticsMethodName);
         sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
         sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
+        sb.append(", hasScalp=").append(hasScalp);
         sb.append("]");
         return sb.toString();
     }
@@ -986,7 +996,8 @@ public class DcBaseOmsOrder {
             && (this.getLogisticsMethodCode() == null ? other.getLogisticsMethodCode() == null : this.getLogisticsMethodCode().equals(other.getLogisticsMethodCode()))
             && (this.getLogisticsMethodName() == null ? other.getLogisticsMethodName() == null : this.getLogisticsMethodName().equals(other.getLogisticsMethodName()))
             && (this.getBailunPickingStatus() == null ? other.getBailunPickingStatus() == null : this.getBailunPickingStatus().equals(other.getBailunPickingStatus()))
-            && (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()));
+            && (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()))
+            && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()));
     }
 
     /**
@@ -1085,6 +1096,7 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getLogisticsMethodName() == null) ? 0 : getLogisticsMethodName().hashCode());
         result = prime * result + ((getBailunPickingStatus() == null) ? 0 : getBailunPickingStatus().hashCode());
         result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
+        result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -890,6 +890,15 @@ public class DcBaseOmsSku {
     private Boolean hasDelete;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.has_scalp
+     *
+     * @mbg.generated
+     */
+    private Boolean hasScalp;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_sku
      *
@@ -999,6 +1008,7 @@ public class DcBaseOmsSku {
         sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
         sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
         sb.append(", hasDelete=").append(hasDelete);
+        sb.append(", hasScalp=").append(hasScalp);
         sb.append("]");
         return sb.toString();
     }
@@ -1118,7 +1128,8 @@ public class DcBaseOmsSku {
             && (this.getRatioPrice() == null ? other.getRatioPrice() == null : this.getRatioPrice().equals(other.getRatioPrice()))
             && (this.getBailunPickingStatus() == null ? other.getBailunPickingStatus() == null : this.getBailunPickingStatus().equals(other.getBailunPickingStatus()))
             && (this.getBailunRequireLogistics() == null ? other.getBailunRequireLogistics() == null : this.getBailunRequireLogistics().equals(other.getBailunRequireLogistics()))
-            && (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()));
+            && (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()))
+            && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()));
     }
 
     /**
@@ -1229,6 +1240,7 @@ public class DcBaseOmsSku {
         result = prime * result + ((getBailunPickingStatus() == null) ? 0 : getBailunPickingStatus().hashCode());
         result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
         result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
+        result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -5930,6 +5930,66 @@ public class DcBaseOmsOrderExample {
             addCriterion("bailun_require_logistics not between", value1, value2, "bailunRequireLogistics");
             return (Criteria) this;
         }
+
+        public Criteria andHasScalpIsNull() {
+            addCriterion("has_scalp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpIsNotNull() {
+            addCriterion("has_scalp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpEqualTo(Boolean value) {
+            addCriterion("has_scalp =", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpNotEqualTo(Boolean value) {
+            addCriterion("has_scalp <>", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpGreaterThan(Boolean value) {
+            addCriterion("has_scalp >", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_scalp >=", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpLessThan(Boolean value) {
+            addCriterion("has_scalp <", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_scalp <=", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpIn(List<Boolean> values) {
+            addCriterion("has_scalp in", values, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpNotIn(List<Boolean> values) {
+            addCriterion("has_scalp not in", values, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_scalp between", value1, value2, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_scalp not between", value1, value2, "hasScalp");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -6680,6 +6680,66 @@ public class DcBaseOmsSkuExample {
             addCriterion("has_delete not between", value1, value2, "hasDelete");
             return (Criteria) this;
         }
+
+        public Criteria andHasScalpIsNull() {
+            addCriterion("has_scalp is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpIsNotNull() {
+            addCriterion("has_scalp is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpEqualTo(Boolean value) {
+            addCriterion("has_scalp =", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpNotEqualTo(Boolean value) {
+            addCriterion("has_scalp <>", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpGreaterThan(Boolean value) {
+            addCriterion("has_scalp >", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("has_scalp >=", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpLessThan(Boolean value) {
+            addCriterion("has_scalp <", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpLessThanOrEqualTo(Boolean value) {
+            addCriterion("has_scalp <=", value, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpIn(List<Boolean> values) {
+            addCriterion("has_scalp in", values, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpNotIn(List<Boolean> values) {
+            addCriterion("has_scalp not in", values, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_scalp between", value1, value2, "hasScalp");
+            return (Criteria) this;
+        }
+
+        public Criteria andHasScalpNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("has_scalp not between", value1, value2, "hasScalp");
+            return (Criteria) this;
+        }
     }
 
     /**