Skip to content

D
dc-java
Commit 9c407e08 by wutong
Options

订单处理新增字段, 并精准取每个SKU的仓库.

parent 5b8989ee
Showing with 443 additions and 42 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/BailunSkuStructure.java
package com.bailuntec.domain.pojo; package com.bailuntec.domain.pojo;
import com.bailuntec.domain.entity.DcBaseOmsSku; import com.bailuntec.domain.entity.DcBaseOmsSku;
import com.bailuntec.domain.entity.DcBaseWarehouse;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -15,8 +16,9 @@ public class BailunSkuStructure { ...@@ -15,8 +16,9 @@ public class BailunSkuStructure {
private BigDecimal bailunSkuUnitPrice; private BigDecimal bailunSkuUnitPrice;
private BigDecimal skuCostRatio;//这是根据采购价摊分比例 private BigDecimal skuCostRatio;//这是根据采购价摊分比例
private BigDecimal skuWeightRatio;//这是根据重量摊分比例 private BigDecimal skuWeightRatio;//这是根据重量摊分比例
private DcBaseOmsSku dcBaseOmsSku;
private Integer skuQuantityOrderd; private Integer skuQuantityOrderd;
private DcBaseOmsSku dcBaseOmsSku;
private DcBaseWarehouse dcBaseWarehouse;
public BailunSkuStructure() { public BailunSkuStructure() {
} }
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/OmsResult.java
...@@ -225,6 +225,26 @@ public class OmsResult { ...@@ -225,6 +225,26 @@ public class OmsResult {
* *
* @mbg.generated * @mbg.generated
*/ */
@JSONField(name = "pickingStatus")
private String bailunPickingStatus;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.shipping_status
*
* @mbg.generated
*/
@JSONField(name = "requirePlatLogistics")
private String bailunRequireLogistics;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.shipping_status
*
* @mbg.generated
*/
@JSONField(name = "proSkuList") @JSONField(name = "proSkuList")
private List<BailunSku> bailunSku; private List<BailunSku> bailunSku;
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
...@@ -97,6 +97,8 @@ ...@@ -97,6 +97,8 @@
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" /> <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
<result column="ratio_weight" jdbcType="DECIMAL" property="ratioWeight" /> <result column="ratio_weight" jdbcType="DECIMAL" property="ratioWeight" />
<result column="ratio_price" jdbcType="DECIMAL" property="ratioPrice" /> <result column="ratio_price" jdbcType="DECIMAL" property="ratioPrice" />
<result column="bailun_picking_status" jdbcType="VARCHAR" property="bailunPickingStatus" />
<result column="bailun_require_logistics" jdbcType="VARCHAR" property="bailunRequireLogistics" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -186,7 +188,7 @@ ...@@ -186,7 +188,7 @@
receipt_area, receipt_address, receipt_address_2, receipt_postal_code, receiver, 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, 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, has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -279,7 +281,8 @@ ...@@ -279,7 +281,8 @@
buyer_email, has_fba_exception, has_platform_exception, buyer_email, has_fba_exception, has_platform_exception,
has_cancle, area_id, bailun_category_id, has_cancle, area_id, bailun_category_id,
bailun_category_name, gmt_create, gmt_modified, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price) ratio_weight, ratio_price, bailun_picking_status,
bailun_require_logistics)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
...@@ -312,7 +315,8 @@ ...@@ -312,7 +315,8 @@
#{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT}, #{hasPlatformException,jdbcType=BIT}, #{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT}, #{hasPlatformException,jdbcType=BIT},
#{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{bailunCategoryId,jdbcType=INTEGER}, #{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{bailunCategoryId,jdbcType=INTEGER},
#{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}) #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}, #{bailunPickingStatus,jdbcType=VARCHAR},
#{bailunRequireLogistics,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!-- <!--
...@@ -594,6 +598,12 @@ ...@@ -594,6 +598,12 @@
<if test="ratioPrice != null"> <if test="ratioPrice != null">
ratio_price, ratio_price,
</if> </if>
<if test="bailunPickingStatus != null">
bailun_picking_status,
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -869,6 +879,12 @@ ...@@ -869,6 +879,12 @@
<if test="ratioPrice != null"> <if test="ratioPrice != null">
#{ratioPrice,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
</if> </if>
<if test="bailunPickingStatus != null">
#{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
#{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
...@@ -1161,6 +1177,12 @@ ...@@ -1161,6 +1177,12 @@
<if test="record.ratioPrice != null"> <if test="record.ratioPrice != null">
ratio_price = #{record.ratioPrice,jdbcType=DECIMAL}, ratio_price = #{record.ratioPrice,jdbcType=DECIMAL},
</if> </if>
<if test="record.bailunPickingStatus != null">
bailun_picking_status = #{record.bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="record.bailunRequireLogistics != null">
bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -1262,7 +1284,9 @@ ...@@ -1262,7 +1284,9 @@
gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
ratio_weight = #{record.ratioWeight,jdbcType=DECIMAL}, ratio_weight = #{record.ratioWeight,jdbcType=DECIMAL},
ratio_price = #{record.ratioPrice,jdbcType=DECIMAL} ratio_price = #{record.ratioPrice,jdbcType=DECIMAL},
bailun_picking_status = #{record.bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -1544,6 +1568,12 @@ ...@@ -1544,6 +1568,12 @@
<if test="ratioPrice != null"> <if test="ratioPrice != null">
ratio_price = #{ratioPrice,jdbcType=DECIMAL}, ratio_price = #{ratioPrice,jdbcType=DECIMAL},
</if> </if>
<if test="bailunPickingStatus != null">
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1642,7 +1672,9 @@ ...@@ -1642,7 +1672,9 @@
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
ratio_weight = #{ratioWeight,jdbcType=DECIMAL}, ratio_weight = #{ratioWeight,jdbcType=DECIMAL},
ratio_price = #{ratioPrice,jdbcType=DECIMAL} ratio_price = #{ratioPrice,jdbcType=DECIMAL},
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
...@@ -1926,6 +1958,12 @@ ...@@ -1926,6 +1958,12 @@
<if test="ratioPrice != null"> <if test="ratioPrice != null">
ratio_price, ratio_price,
</if> </if>
<if test="bailunPickingStatus != null">
bailun_picking_status,
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -2202,6 +2240,12 @@ ...@@ -2202,6 +2240,12 @@
<if test="ratioPrice != null"> <if test="ratioPrice != null">
#{ratioPrice,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
</if> </if>
<if test="bailunPickingStatus != null">
#{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
#{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -2478,6 +2522,12 @@ ...@@ -2478,6 +2522,12 @@
<if test="ratioPrice != null"> <if test="ratioPrice != null">
ratio_price = #{ratioPrice,jdbcType=DECIMAL}, ratio_price = #{ratioPrice,jdbcType=DECIMAL},
</if> </if>
<if test="bailunPickingStatus != null">
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
...@@ -2504,7 +2554,8 @@ ...@@ -2504,7 +2554,8 @@
receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code, receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code,
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, 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, has_platform_exception, has_cancle, area_id, bailun_category_id, bailun_category_name,
gmt_create, gmt_modified, ratio_weight, ratio_price) gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics
)
values values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
...@@ -2538,7 +2589,8 @@ ...@@ -2538,7 +2589,8 @@
#{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT}, #{hasPlatformException,jdbcType=BIT}, #{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT}, #{hasPlatformException,jdbcType=BIT},
#{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{bailunCategoryId,jdbcType=INTEGER}, #{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{bailunCategoryId,jdbcType=INTEGER},
#{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}) #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}, #{bailunPickingStatus,jdbcType=VARCHAR},
#{bailunRequireLogistics,jdbcType=VARCHAR})
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR}, origin_order_id = #{originOrderId,jdbcType=VARCHAR},
...@@ -2630,7 +2682,9 @@ ...@@ -2630,7 +2682,9 @@
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
ratio_weight = #{ratioWeight,jdbcType=DECIMAL}, ratio_weight = #{ratioWeight,jdbcType=DECIMAL},
ratio_price = #{ratioPrice,jdbcType=DECIMAL} ratio_price = #{ratioPrice,jdbcType=DECIMAL},
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!-- <!--
......
data-base/base-sync-oms-order/src/main/resources/job.properties
...@@ -11,5 +11,5 @@ ZOOKEEPER_SERVER=172.31.255.120:2181 ...@@ -11,5 +11,5 @@ ZOOKEEPER_SERVER=172.31.255.120:2181
NAME_SPACE=data-center NAME_SPACE=data-center
JOB_NAME=base-sync-oms-order-coroutine JOB_NAME=base-sync-oms-order-coroutine
#JOB_NAME=base-sync-oms-order #JOB_NAME=base-sync-oms-order
JOB_CRON=0/1 * * * * ? * JOB_CRON=0/1 * 1-23 * * ? *
SHARDING_TOTAL_COUNT=1 SHARDING_TOTAL_COUNT=1
\ No newline at end of file
data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java
...@@ -78,7 +78,7 @@ public class OmsOrderTest { ...@@ -78,7 +78,7 @@ public class OmsOrderTest {
LinkedHashMap<String, String> map = new LinkedHashMap<>(4); LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
map.put("pageIndex", "1"); map.put("pageIndex", "1");
map.put("pageCount", "100"); map.put("pageCount", "100");
map.put("OriginOrderNo", "263334209922-2394744359016"); map.put("OriginOrderNo", "249457436016");
Request request = new Request.Builder() Request request = new Request.Builder()
.get() .get()
.url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map)) .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsOrder.java
...@@ -728,6 +728,24 @@ public class DcBaseOmsOrder { ...@@ -728,6 +728,24 @@ public class DcBaseOmsOrder {
private String logisticsMethodName; private String logisticsMethodName;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.bailun_picking_status
*
* @mbg.generated
*/
private String bailunPickingStatus;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.bailun_require_logistics
*
* @mbg.generated
*/
private String bailunRequireLogistics;
/**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_order * This method corresponds to the database table dc_base_oms_order
* *
...@@ -819,6 +837,8 @@ public class DcBaseOmsOrder { ...@@ -819,6 +837,8 @@ public class DcBaseOmsOrder {
sb.append(", logisticsWarehouseName=").append(logisticsWarehouseName); sb.append(", logisticsWarehouseName=").append(logisticsWarehouseName);
sb.append(", logisticsMethodCode=").append(logisticsMethodCode); sb.append(", logisticsMethodCode=").append(logisticsMethodCode);
sb.append(", logisticsMethodName=").append(logisticsMethodName); sb.append(", logisticsMethodName=").append(logisticsMethodName);
sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -920,7 +940,9 @@ public class DcBaseOmsOrder { ...@@ -920,7 +940,9 @@ public class DcBaseOmsOrder {
&& (this.getLogisticsWarehouseCode() == null ? other.getLogisticsWarehouseCode() == null : this.getLogisticsWarehouseCode().equals(other.getLogisticsWarehouseCode())) && (this.getLogisticsWarehouseCode() == null ? other.getLogisticsWarehouseCode() == null : this.getLogisticsWarehouseCode().equals(other.getLogisticsWarehouseCode()))
&& (this.getLogisticsWarehouseName() == null ? other.getLogisticsWarehouseName() == null : this.getLogisticsWarehouseName().equals(other.getLogisticsWarehouseName())) && (this.getLogisticsWarehouseName() == null ? other.getLogisticsWarehouseName() == null : this.getLogisticsWarehouseName().equals(other.getLogisticsWarehouseName()))
&& (this.getLogisticsMethodCode() == null ? other.getLogisticsMethodCode() == null : this.getLogisticsMethodCode().equals(other.getLogisticsMethodCode())) && (this.getLogisticsMethodCode() == null ? other.getLogisticsMethodCode() == null : this.getLogisticsMethodCode().equals(other.getLogisticsMethodCode()))
&& (this.getLogisticsMethodName() == null ? other.getLogisticsMethodName() == null : this.getLogisticsMethodName().equals(other.getLogisticsMethodName())); && (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()));
} }
/** /**
...@@ -1013,6 +1035,8 @@ public class DcBaseOmsOrder { ...@@ -1013,6 +1035,8 @@ public class DcBaseOmsOrder {
result = prime * result + ((getLogisticsWarehouseName() == null) ? 0 : getLogisticsWarehouseName().hashCode()); result = prime * result + ((getLogisticsWarehouseName() == null) ? 0 : getLogisticsWarehouseName().hashCode());
result = prime * result + ((getLogisticsMethodCode() == null) ? 0 : getLogisticsMethodCode().hashCode()); result = prime * result + ((getLogisticsMethodCode() == null) ? 0 : getLogisticsMethodCode().hashCode());
result = prime * result + ((getLogisticsMethodName() == null) ? 0 : getLogisticsMethodName().hashCode()); result = prime * result + ((getLogisticsMethodName() == null) ? 0 : getLogisticsMethodName().hashCode());
result = prime * result + ((getBailunPickingStatus() == null) ? 0 : getBailunPickingStatus().hashCode());
result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java
...@@ -827,6 +827,24 @@ public class DcBaseOmsSku { ...@@ -827,6 +827,24 @@ public class DcBaseOmsSku {
private BigDecimal ratioPrice; private BigDecimal ratioPrice;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.bailun_picking_status
*
* @mbg.generated
*/
private String bailunPickingStatus;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.bailun_require_logistics
*
* @mbg.generated
*/
private String bailunRequireLogistics;
/**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_sku * This method corresponds to the database table dc_base_oms_sku
* *
...@@ -929,6 +947,8 @@ public class DcBaseOmsSku { ...@@ -929,6 +947,8 @@ public class DcBaseOmsSku {
sb.append(", gmtModified=").append(gmtModified); sb.append(", gmtModified=").append(gmtModified);
sb.append(", ratioWeight=").append(ratioWeight); sb.append(", ratioWeight=").append(ratioWeight);
sb.append(", ratioPrice=").append(ratioPrice); sb.append(", ratioPrice=").append(ratioPrice);
sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -1041,7 +1061,9 @@ public class DcBaseOmsSku { ...@@ -1041,7 +1061,9 @@ public class DcBaseOmsSku {
&& (this.getGmtCreate() == null ? other.getGmtCreate() == null : this.getGmtCreate().equals(other.getGmtCreate())) && (this.getGmtCreate() == null ? other.getGmtCreate() == null : this.getGmtCreate().equals(other.getGmtCreate()))
&& (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified())) && (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
&& (this.getRatioWeight() == null ? other.getRatioWeight() == null : this.getRatioWeight().equals(other.getRatioWeight())) && (this.getRatioWeight() == null ? other.getRatioWeight() == null : this.getRatioWeight().equals(other.getRatioWeight()))
&& (this.getRatioPrice() == null ? other.getRatioPrice() == null : this.getRatioPrice().equals(other.getRatioPrice())); && (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()));
} }
/** /**
...@@ -1145,6 +1167,8 @@ public class DcBaseOmsSku { ...@@ -1145,6 +1167,8 @@ public class DcBaseOmsSku {
result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode()); result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode());
result = prime * result + ((getRatioWeight() == null) ? 0 : getRatioWeight().hashCode()); result = prime * result + ((getRatioWeight() == null) ? 0 : getRatioWeight().hashCode());
result = prime * result + ((getRatioPrice() == null) ? 0 : getRatioPrice().hashCode()); result = prime * result + ((getRatioPrice() == null) ? 0 : getRatioPrice().hashCode());
result = prime * result + ((getBailunPickingStatus() == null) ? 0 : getBailunPickingStatus().hashCode());
result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsOrderExample.java
...@@ -5550,6 +5550,146 @@ public class DcBaseOmsOrderExample { ...@@ -5550,6 +5550,146 @@ public class DcBaseOmsOrderExample {
addCriterion("logistics_method_name not between", value1, value2, "logisticsMethodName"); addCriterion("logistics_method_name not between", value1, value2, "logisticsMethodName");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunPickingStatusIsNull() {
addCriterion("bailun_picking_status is null");
return (Criteria) this;
}
public Criteria andBailunPickingStatusIsNotNull() {
addCriterion("bailun_picking_status is not null");
return (Criteria) this;
}
public Criteria andBailunPickingStatusEqualTo(String value) {
addCriterion("bailun_picking_status =", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusNotEqualTo(String value) {
addCriterion("bailun_picking_status <>", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusGreaterThan(String value) {
addCriterion("bailun_picking_status >", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusGreaterThanOrEqualTo(String value) {
addCriterion("bailun_picking_status >=", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusLessThan(String value) {
addCriterion("bailun_picking_status <", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusLessThanOrEqualTo(String value) {
addCriterion("bailun_picking_status <=", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusLike(String value) {
addCriterion("bailun_picking_status like", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusNotLike(String value) {
addCriterion("bailun_picking_status not like", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusIn(List<String> values) {
addCriterion("bailun_picking_status in", values, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusNotIn(List<String> values) {
addCriterion("bailun_picking_status not in", values, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusBetween(String value1, String value2) {
addCriterion("bailun_picking_status between", value1, value2, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusNotBetween(String value1, String value2) {
addCriterion("bailun_picking_status not between", value1, value2, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsIsNull() {
addCriterion("bailun_require_logistics is null");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsIsNotNull() {
addCriterion("bailun_require_logistics is not null");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsEqualTo(String value) {
addCriterion("bailun_require_logistics =", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsNotEqualTo(String value) {
addCriterion("bailun_require_logistics <>", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsGreaterThan(String value) {
addCriterion("bailun_require_logistics >", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsGreaterThanOrEqualTo(String value) {
addCriterion("bailun_require_logistics >=", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsLessThan(String value) {
addCriterion("bailun_require_logistics <", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsLessThanOrEqualTo(String value) {
addCriterion("bailun_require_logistics <=", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsLike(String value) {
addCriterion("bailun_require_logistics like", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsNotLike(String value) {
addCriterion("bailun_require_logistics not like", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsIn(List<String> values) {
addCriterion("bailun_require_logistics in", values, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsNotIn(List<String> values) {
addCriterion("bailun_require_logistics not in", values, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsBetween(String value1, String value2) {
addCriterion("bailun_require_logistics between", value1, value2, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsNotBetween(String value1, String value2) {
addCriterion("bailun_require_logistics not between", value1, value2, "bailunRequireLogistics");
return (Criteria) this;
}
} }
/** /**
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsSkuExample.java
...@@ -6240,6 +6240,146 @@ public class DcBaseOmsSkuExample { ...@@ -6240,6 +6240,146 @@ public class DcBaseOmsSkuExample {
addCriterion("ratio_price not between", value1, value2, "ratioPrice"); addCriterion("ratio_price not between", value1, value2, "ratioPrice");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBailunPickingStatusIsNull() {
addCriterion("bailun_picking_status is null");
return (Criteria) this;
}
public Criteria andBailunPickingStatusIsNotNull() {
addCriterion("bailun_picking_status is not null");
return (Criteria) this;
}
public Criteria andBailunPickingStatusEqualTo(String value) {
addCriterion("bailun_picking_status =", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusNotEqualTo(String value) {
addCriterion("bailun_picking_status <>", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusGreaterThan(String value) {
addCriterion("bailun_picking_status >", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusGreaterThanOrEqualTo(String value) {
addCriterion("bailun_picking_status >=", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusLessThan(String value) {
addCriterion("bailun_picking_status <", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusLessThanOrEqualTo(String value) {
addCriterion("bailun_picking_status <=", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusLike(String value) {
addCriterion("bailun_picking_status like", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusNotLike(String value) {
addCriterion("bailun_picking_status not like", value, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusIn(List<String> values) {
addCriterion("bailun_picking_status in", values, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusNotIn(List<String> values) {
addCriterion("bailun_picking_status not in", values, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusBetween(String value1, String value2) {
addCriterion("bailun_picking_status between", value1, value2, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunPickingStatusNotBetween(String value1, String value2) {
addCriterion("bailun_picking_status not between", value1, value2, "bailunPickingStatus");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsIsNull() {
addCriterion("bailun_require_logistics is null");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsIsNotNull() {
addCriterion("bailun_require_logistics is not null");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsEqualTo(String value) {
addCriterion("bailun_require_logistics =", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsNotEqualTo(String value) {
addCriterion("bailun_require_logistics <>", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsGreaterThan(String value) {
addCriterion("bailun_require_logistics >", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsGreaterThanOrEqualTo(String value) {
addCriterion("bailun_require_logistics >=", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsLessThan(String value) {
addCriterion("bailun_require_logistics <", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsLessThanOrEqualTo(String value) {
addCriterion("bailun_require_logistics <=", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsLike(String value) {
addCriterion("bailun_require_logistics like", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsNotLike(String value) {
addCriterion("bailun_require_logistics not like", value, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsIn(List<String> values) {
addCriterion("bailun_require_logistics in", values, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsNotIn(List<String> values) {
addCriterion("bailun_require_logistics not in", values, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsBetween(String value1, String value2) {
addCriterion("bailun_require_logistics between", value1, value2, "bailunRequireLogistics");
return (Criteria) this;
}
public Criteria andBailunRequireLogisticsNotBetween(String value1, String value2) {
addCriterion("bailun_require_logistics not between", value1, value2, "bailunRequireLogistics");
return (Criteria) this;
}
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment