Commit 23bb9566 by wutong

Oms支持多用户

parent 46551fb0
...@@ -317,4 +317,14 @@ public class OmsResult { ...@@ -317,4 +317,14 @@ public class OmsResult {
@JSONField(name = "areaId") @JSONField(name = "areaId")
private Integer areaId; private Integer areaId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.area_id
*
* @mbg.generated
*/
@JSONField(name = "tenantId")
private Integer companyId;
} }
...@@ -427,6 +427,7 @@ public class OrderSyncJob extends PointJob { ...@@ -427,6 +427,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsPlatformSku.setCreateTimeSite(timeZoneChange(site, dcBaseOmsOrder.getCreateTime())); dcBaseOmsPlatformSku.setCreateTimeSite(timeZoneChange(site, dcBaseOmsOrder.getCreateTime()));
dcBaseOmsPlatformSku.setPaidTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPaidTime())); dcBaseOmsPlatformSku.setPaidTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPaidTime()));
dcBaseOmsPlatformSku.setPayTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPayTime())); dcBaseOmsPlatformSku.setPayTimeSite(timeZoneChange(site, dcBaseOmsOrder.getPayTime()));
dcBaseOmsPlatformSku.setCompanyId(omsResult.getCompanyId());
int ii = mapper.updateByExampleSelective(dcBaseOmsPlatformSku, DcBaseOmsPlatformSkuExample.newAndCreateCriteria().andPlatformSkuEqualTo(dcBaseOmsPlatformSku.getPlatformSku()).andOriginOrderIdEqualTo(dcBaseOmsPlatformSku.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsPlatformSku.getBailunAccountId()).example()); int ii = mapper.updateByExampleSelective(dcBaseOmsPlatformSku, DcBaseOmsPlatformSkuExample.newAndCreateCriteria().andPlatformSkuEqualTo(dcBaseOmsPlatformSku.getPlatformSku()).andOriginOrderIdEqualTo(dcBaseOmsPlatformSku.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsPlatformSku.getBailunAccountId()).example());
if (ii == 0) { if (ii == 0) {
mapper.insertSelective(dcBaseOmsPlatformSku); mapper.insertSelective(dcBaseOmsPlatformSku);
...@@ -749,7 +750,7 @@ public class OrderSyncJob extends PointJob { ...@@ -749,7 +750,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsPick.setShippingStatus(pickingOrder.getShippingStatus()); dcBaseOmsPick.setShippingStatus(pickingOrder.getShippingStatus());
dcBaseOmsPick.setTrackingOrderId(pickingOrder.getTrackingOrderId()); dcBaseOmsPick.setTrackingOrderId(pickingOrder.getTrackingOrderId());
dcBaseOmsPick.setTrackingProvider(pickingOrder.getTrackingProvider()); dcBaseOmsPick.setTrackingProvider(pickingOrder.getTrackingProvider());
dcBaseOmsPick.setCompanyId(omsResult.getCompanyId());
if (bailunSkuStructure != null) { if (bailunSkuStructure != null) {
DcBaseOmsSku dcBaseOmsSku = bailunSkuStructure.getDcBaseOmsSku(); DcBaseOmsSku dcBaseOmsSku = bailunSkuStructure.getDcBaseOmsSku();
dcBaseOmsSku.setBailunSkuQuantityShipped(dcBaseOmsSku.getBailunSkuQuantityShipped() != null ? dcBaseOmsSku.getBailunSkuQuantityShipped() + dcBaseOmsPick.getQuantityShipped() : dcBaseOmsPick.getQuantityShipped()); dcBaseOmsSku.setBailunSkuQuantityShipped(dcBaseOmsSku.getBailunSkuQuantityShipped() != null ? dcBaseOmsSku.getBailunSkuQuantityShipped() + dcBaseOmsPick.getQuantityShipped() : dcBaseOmsPick.getQuantityShipped());
...@@ -845,8 +846,10 @@ public class OrderSyncJob extends PointJob { ...@@ -845,8 +846,10 @@ public class OrderSyncJob extends PointJob {
* @return * @return
*/ */
public void assignmentOrderInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder) { public void assignmentOrderInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder) {
dcBaseOmsOrder.setCompanyId(omsResult.getCompanyId());
dcBaseOmsOrder.setAreaId(omsResult.getAreaId()); dcBaseOmsOrder.setAreaId(omsResult.getAreaId());
dcBaseOmsOrder.setHasCancle(omsResult.getHasCancle()); dcBaseOmsOrder.setHasCancle(omsResult.getHasCancle());
if (omsResult.getLogisticsItems() != null && omsResult.getLogisticsItems().size() > 0) { if (omsResult.getLogisticsItems() != null && omsResult.getLogisticsItems().size() > 0) {
Warehouse warehouse = omsResult.getLogisticsItems().get(0).getWarehouse(); Warehouse warehouse = omsResult.getLogisticsItems().get(0).getWarehouse();
Logistics logisticsMethod = omsResult.getLogisticsItems().get(0).getLogisticsMethod(); Logistics logisticsMethod = omsResult.getLogisticsItems().get(0).getLogisticsMethod();
...@@ -934,6 +937,7 @@ public class OrderSyncJob extends PointJob { ...@@ -934,6 +937,7 @@ public class OrderSyncJob extends PointJob {
* @return * @return
*/ */
public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse, HashMap<String, Logistics> logisticsHashMap) { public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse, HashMap<String, Logistics> logisticsHashMap) {
dcBaseOmsOrder.setCompanyId(omsResult.getCompanyId());
dcBaseOmsSku.setBailunSkuQuantityShipped(0); dcBaseOmsSku.setBailunSkuQuantityShipped(0);
dcBaseOmsSku.setBailunSkuQuantityPicked(0); dcBaseOmsSku.setBailunSkuQuantityPicked(0);
dcBaseOmsSku.setCostHandlePlatform(BigDecimal.ZERO); dcBaseOmsSku.setCostHandlePlatform(BigDecimal.ZERO);
......
...@@ -122,6 +122,7 @@ public interface DcBaseOmsOrderMapper { ...@@ -122,6 +122,7 @@ public interface DcBaseOmsOrderMapper {
*/ */
int upsertSelective(DcBaseOmsOrder record); int upsertSelective(DcBaseOmsOrder record);
void logicDeleteOmsSku(DcBaseOmsOrder dcBaseOmsOrder); void logicDeleteOmsSku(DcBaseOmsOrder dcBaseOmsOrder);
void logicDeleteOmsPick(DcBaseOmsOrder dcBaseOmsOrder); void logicDeleteOmsPick(DcBaseOmsOrder dcBaseOmsOrder);
......
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
<result column="bailun_require_logistics" jdbcType="VARCHAR" property="bailunRequireLogistics" /> <result column="bailun_require_logistics" jdbcType="VARCHAR" property="bailunRequireLogistics" />
<result column="has_scalp" jdbcType="BIT" property="hasScalp" /> <result column="has_scalp" jdbcType="BIT" property="hasScalp" />
<result column="has_innersale" jdbcType="BIT" property="hasInnersale" /> <result column="has_innersale" jdbcType="BIT" property="hasInnersale" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -183,7 +184,7 @@ ...@@ -183,7 +184,7 @@
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, 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, 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, has_innersale has_scalp, has_innersale, company_id
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -276,7 +277,8 @@ ...@@ -276,7 +277,8 @@
logistics_warehouse_code, logistics_warehouse_name, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, logistics_method_code, logistics_method_name,
bailun_picking_status, bailun_require_logistics, bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale) has_scalp, has_innersale, company_id
)
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},
...@@ -309,7 +311,8 @@ ...@@ -309,7 +311,8 @@
#{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR}, #{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR},
#{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}) #{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
<!-- <!--
...@@ -582,6 +585,9 @@ ...@@ -582,6 +585,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
has_innersale, has_innersale,
</if> </if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -848,6 +854,9 @@ ...@@ -848,6 +854,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
#{hasInnersale,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
...@@ -1131,6 +1140,9 @@ ...@@ -1131,6 +1140,9 @@
<if test="record.hasInnersale != null"> <if test="record.hasInnersale != null">
has_innersale = #{record.hasInnersale,jdbcType=BIT}, has_innersale = #{record.hasInnersale,jdbcType=BIT},
</if> </if>
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=INTEGER},
</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" />
...@@ -1229,7 +1241,8 @@ ...@@ -1229,7 +1241,8 @@
bailun_picking_status = #{record.bailunPickingStatus,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}, has_scalp = #{record.hasScalp,jdbcType=BIT},
has_innersale = #{record.hasInnersale,jdbcType=BIT} has_innersale = #{record.hasInnersale,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -1502,6 +1515,9 @@ ...@@ -1502,6 +1515,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
has_innersale = #{hasInnersale,jdbcType=BIT}, has_innersale = #{hasInnersale,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1597,7 +1613,8 @@ ...@@ -1597,7 +1613,8 @@
bailun_picking_status = #{bailunPickingStatus,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}, has_scalp = #{hasScalp,jdbcType=BIT},
has_innersale = #{hasInnersale,jdbcType=BIT} has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
...@@ -1872,6 +1889,9 @@ ...@@ -1872,6 +1889,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
has_innersale, has_innersale,
</if> </if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -2139,6 +2159,9 @@ ...@@ -2139,6 +2159,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
#{hasInnersale,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -2406,6 +2429,9 @@ ...@@ -2406,6 +2429,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
has_innersale = #{hasInnersale,jdbcType=BIT}, has_innersale = #{hasInnersale,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
...@@ -2432,7 +2458,7 @@ ...@@ -2432,7 +2458,7 @@
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, 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, 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, has_innersale) has_scalp, has_innersale, company_id)
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},
...@@ -2466,7 +2492,8 @@ ...@@ -2466,7 +2492,8 @@
#{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR}, #{logisticsWarehouseCode,jdbcType=VARCHAR}, #{logisticsWarehouseName,jdbcType=VARCHAR},
#{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}) #{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
)
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},
...@@ -2555,7 +2582,8 @@ ...@@ -2555,7 +2582,8 @@
bailun_picking_status = #{bailunPickingStatus,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}, has_scalp = #{hasScalp,jdbcType=BIT},
has_innersale = #{hasInnersale,jdbcType=BIT} has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -2578,6 +2606,7 @@ ...@@ -2578,6 +2606,7 @@
<update id="logicDeleteOmsSku"> <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 dc_base_oms_sku set has_delete=1 where origin_order_id=#{originOrderId,jdbcType=VARCHAR} and bailun_account_id = #{bailunAccountId,jdbcType=INTEGER}
</update> </update>
<update id="logicDeleteOmsPick"> <update id="logicDeleteOmsPick">
update dc_base_oms_pick set has_delete=1 where origin_order_id=#{originOrderId,jdbcType=VARCHAR} and bailun_account_id = #{bailunAccountId,jdbcType=INTEGER} update dc_base_oms_pick set has_delete=1 where origin_order_id=#{originOrderId,jdbcType=VARCHAR} and bailun_account_id = #{bailunAccountId,jdbcType=INTEGER}
</update> </update>
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
<result column="bailun_sku_cost_packaging" jdbcType="DECIMAL" property="bailunSkuCostPackaging" /> <result column="bailun_sku_cost_packaging" jdbcType="DECIMAL" property="bailunSkuCostPackaging" />
<result column="bailun_sku_outbound_weight" jdbcType="DECIMAL" property="bailunSkuOutboundWeight" /> <result column="bailun_sku_outbound_weight" jdbcType="DECIMAL" property="bailunSkuOutboundWeight" />
<result column="has_delete" jdbcType="BIT" property="hasDelete" /> <result column="has_delete" jdbcType="BIT" property="hasDelete" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -110,7 +111,7 @@ ...@@ -110,7 +111,7 @@
logistics_order_id, logistics_order_name, gmt_create, gmt_modified, quantity_picked, logistics_order_id, logistics_order_name, gmt_create, gmt_modified, quantity_picked,
quantity_shipped, bailun_sku, declare_price, cost_shipping, cost_packaging, outbound_weight, quantity_shipped, bailun_sku, declare_price, cost_shipping, cost_packaging, outbound_weight,
bailun_sku_cost_shipping, bailun_sku_cost_packaging, bailun_sku_outbound_weight, bailun_sku_cost_shipping, bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete has_delete, company_id
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -180,7 +181,7 @@ ...@@ -180,7 +181,7 @@
bailun_sku, declare_price, cost_shipping, bailun_sku, declare_price, cost_shipping,
cost_packaging, outbound_weight, bailun_sku_cost_shipping, cost_packaging, outbound_weight, bailun_sku_cost_shipping,
bailun_sku_cost_packaging, bailun_sku_outbound_weight, bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete) has_delete, company_id)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER}, values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{bailunOrderId,jdbcType=VARCHAR}, #{pickOrderId,jdbcType=VARCHAR}, #{trackingProvider,jdbcType=VARCHAR}, #{bailunOrderId,jdbcType=VARCHAR}, #{pickOrderId,jdbcType=VARCHAR}, #{trackingProvider,jdbcType=VARCHAR},
#{trackingOrderId,jdbcType=VARCHAR}, #{shippingStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{trackingOrderId,jdbcType=VARCHAR}, #{shippingStatus,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
...@@ -190,7 +191,7 @@ ...@@ -190,7 +191,7 @@
#{bailunSku,jdbcType=VARCHAR}, #{declarePrice,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL}, #{bailunSku,jdbcType=VARCHAR}, #{declarePrice,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL},
#{costPackaging,jdbcType=DECIMAL}, #{outboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostShipping,jdbcType=DECIMAL}, #{costPackaging,jdbcType=DECIMAL}, #{outboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostShipping,jdbcType=DECIMAL},
#{bailunSkuCostPackaging,jdbcType=DECIMAL}, #{bailunSkuOutboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostPackaging,jdbcType=DECIMAL}, #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
#{hasDelete,jdbcType=BIT}) #{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER})
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
<!-- <!--
...@@ -280,6 +281,9 @@ ...@@ -280,6 +281,9 @@
<if test="hasDelete != null"> <if test="hasDelete != null">
has_delete, has_delete,
</if> </if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -363,6 +367,9 @@ ...@@ -363,6 +367,9 @@
<if test="hasDelete != null"> <if test="hasDelete != null">
#{hasDelete,jdbcType=BIT}, #{hasDelete,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultType="java.lang.Long">
...@@ -463,6 +470,9 @@ ...@@ -463,6 +470,9 @@
<if test="record.hasDelete != null"> <if test="record.hasDelete != null">
has_delete = #{record.hasDelete,jdbcType=BIT}, has_delete = #{record.hasDelete,jdbcType=BIT},
</if> </if>
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=INTEGER},
</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" />
...@@ -500,7 +510,8 @@ ...@@ -500,7 +510,8 @@
bailun_sku_cost_shipping = #{record.bailunSkuCostShipping,jdbcType=DECIMAL}, bailun_sku_cost_shipping = #{record.bailunSkuCostShipping,jdbcType=DECIMAL},
bailun_sku_cost_packaging = #{record.bailunSkuCostPackaging,jdbcType=DECIMAL}, bailun_sku_cost_packaging = #{record.bailunSkuCostPackaging,jdbcType=DECIMAL},
bailun_sku_outbound_weight = #{record.bailunSkuOutboundWeight,jdbcType=DECIMAL}, bailun_sku_outbound_weight = #{record.bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{record.hasDelete,jdbcType=BIT} has_delete = #{record.hasDelete,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -590,6 +601,9 @@ ...@@ -590,6 +601,9 @@
<if test="hasDelete != null"> <if test="hasDelete != null">
has_delete = #{hasDelete,jdbcType=BIT}, has_delete = #{hasDelete,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -624,7 +638,8 @@ ...@@ -624,7 +638,8 @@
bailun_sku_cost_shipping = #{bailunSkuCostShipping,jdbcType=DECIMAL}, bailun_sku_cost_shipping = #{bailunSkuCostShipping,jdbcType=DECIMAL},
bailun_sku_cost_packaging = #{bailunSkuCostPackaging,jdbcType=DECIMAL}, bailun_sku_cost_packaging = #{bailunSkuCostPackaging,jdbcType=DECIMAL},
bailun_sku_outbound_weight = #{bailunSkuOutboundWeight,jdbcType=DECIMAL}, bailun_sku_outbound_weight = #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{hasDelete,jdbcType=BIT} has_delete = #{hasDelete,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
...@@ -716,6 +731,9 @@ ...@@ -716,6 +731,9 @@
<if test="hasDelete != null"> <if test="hasDelete != null">
has_delete, has_delete,
</if> </if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -800,6 +818,9 @@ ...@@ -800,6 +818,9 @@
<if test="hasDelete != null"> <if test="hasDelete != null">
#{hasDelete,jdbcType=BIT}, #{hasDelete,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -884,6 +905,9 @@ ...@@ -884,6 +905,9 @@
<if test="hasDelete != null"> <if test="hasDelete != null">
has_delete = #{hasDelete,jdbcType=BIT}, has_delete = #{hasDelete,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsPick">
...@@ -898,7 +922,7 @@ ...@@ -898,7 +922,7 @@
warehouse_code, logistics_order_id, logistics_order_name, gmt_create, gmt_modified, warehouse_code, logistics_order_id, logistics_order_name, gmt_create, gmt_modified,
quantity_picked, quantity_shipped, bailun_sku, declare_price, cost_shipping, cost_packaging, quantity_picked, quantity_shipped, bailun_sku, declare_price, cost_shipping, cost_packaging,
outbound_weight, bailun_sku_cost_shipping, bailun_sku_cost_packaging, bailun_sku_outbound_weight, outbound_weight, bailun_sku_cost_shipping, bailun_sku_cost_packaging, bailun_sku_outbound_weight,
has_delete) has_delete, company_id)
values values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER}, (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{bailunOrderId,jdbcType=VARCHAR}, #{pickOrderId,jdbcType=VARCHAR}, #{trackingProvider,jdbcType=VARCHAR}, #{bailunOrderId,jdbcType=VARCHAR}, #{pickOrderId,jdbcType=VARCHAR}, #{trackingProvider,jdbcType=VARCHAR},
...@@ -909,7 +933,7 @@ ...@@ -909,7 +933,7 @@
#{bailunSku,jdbcType=VARCHAR}, #{declarePrice,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL}, #{bailunSku,jdbcType=VARCHAR}, #{declarePrice,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL},
#{costPackaging,jdbcType=DECIMAL}, #{outboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostShipping,jdbcType=DECIMAL}, #{costPackaging,jdbcType=DECIMAL}, #{outboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostShipping,jdbcType=DECIMAL},
#{bailunSkuCostPackaging,jdbcType=DECIMAL}, #{bailunSkuOutboundWeight,jdbcType=DECIMAL}, #{bailunSkuCostPackaging,jdbcType=DECIMAL}, #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
#{hasDelete,jdbcType=BIT}) #{hasDelete,jdbcType=BIT}, #{companyId,jdbcType=INTEGER})
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},
...@@ -937,7 +961,8 @@ ...@@ -937,7 +961,8 @@
bailun_sku_cost_shipping = #{bailunSkuCostShipping,jdbcType=DECIMAL}, bailun_sku_cost_shipping = #{bailunSkuCostShipping,jdbcType=DECIMAL},
bailun_sku_cost_packaging = #{bailunSkuCostPackaging,jdbcType=DECIMAL}, bailun_sku_cost_packaging = #{bailunSkuCostPackaging,jdbcType=DECIMAL},
bailun_sku_outbound_weight = #{bailunSkuOutboundWeight,jdbcType=DECIMAL}, bailun_sku_outbound_weight = #{bailunSkuOutboundWeight,jdbcType=DECIMAL},
has_delete = #{hasDelete,jdbcType=BIT} has_delete = #{hasDelete,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPickExample" resultMap="BaseResultMap">
<!-- <!--
......
...@@ -64,6 +64,7 @@ ...@@ -64,6 +64,7 @@
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" /> <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
<result column="has_delete" jdbcType="BIT" property="hasDelete" /> <result column="has_delete" jdbcType="BIT" property="hasDelete" />
<result column="has_scalp" jdbcType="BIT" property="hasScalp" /> <result column="has_scalp" jdbcType="BIT" property="hasScalp" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -146,7 +147,8 @@ ...@@ -146,7 +147,8 @@
platform_sku_title_cn, platform_sku_quantity_ordered, platform_sku_quantity_shipped, platform_sku_title_cn, platform_sku_quantity_ordered, platform_sku_quantity_shipped,
platform_sku_unit_price, receipt_country, receipt_city, receipt_area, receipt_address, platform_sku_unit_price, receipt_country, receipt_city, receipt_area, receipt_address,
receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name,
buyer_email, has_cancle, area_id, gmt_create, gmt_modified, has_delete, has_scalp buyer_email, has_cancle, area_id, gmt_create, gmt_modified, has_delete, has_scalp,
company_id
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPlatformSkuExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPlatformSkuExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -228,7 +230,8 @@ ...@@ -228,7 +230,8 @@
receiver, receiver_phone, buyer_id, receiver, receiver_phone, buyer_id,
buyer_name, buyer_email, has_cancle, buyer_name, buyer_email, has_cancle,
area_id, gmt_create, gmt_modified, area_id, gmt_create, gmt_modified,
has_delete, has_scalp) has_delete, has_scalp, company_id
)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTimeSite,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, #{transactionId,jdbcType=VARCHAR}, #{payTimeSite,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP},
#{payMethod,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payMethod,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR},
...@@ -250,7 +253,8 @@ ...@@ -250,7 +253,8 @@
#{receiver,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{buyerId,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{buyerId,jdbcType=VARCHAR},
#{buyerName,jdbcType=VARCHAR}, #{buyerEmail,jdbcType=VARCHAR}, #{hasCancle,jdbcType=BIT}, #{buyerName,jdbcType=VARCHAR}, #{buyerEmail,jdbcType=VARCHAR}, #{hasCancle,jdbcType=BIT},
#{areaId,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{areaId,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}) #{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPlatformSku"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPlatformSku">
<!-- <!--
...@@ -433,6 +437,9 @@ ...@@ -433,6 +437,9 @@
<if test="hasScalp != null"> <if test="hasScalp != null">
has_scalp, has_scalp,
</if> </if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -609,6 +616,9 @@ ...@@ -609,6 +616,9 @@
<if test="hasScalp != null"> <if test="hasScalp != null">
#{hasScalp,jdbcType=BIT}, #{hasScalp,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPlatformSkuExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPlatformSkuExample" resultType="java.lang.Long">
...@@ -802,6 +812,9 @@ ...@@ -802,6 +812,9 @@
<if test="record.hasScalp != null"> <if test="record.hasScalp != null">
has_scalp = #{record.hasScalp,jdbcType=BIT}, has_scalp = #{record.hasScalp,jdbcType=BIT},
</if> </if>
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=INTEGER},
</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" />
...@@ -870,7 +883,8 @@ ...@@ -870,7 +883,8 @@
gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP}, gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP}, gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
has_delete = #{record.hasDelete,jdbcType=BIT}, has_delete = #{record.hasDelete,jdbcType=BIT},
has_scalp = #{record.hasScalp,jdbcType=BIT} has_scalp = #{record.hasScalp,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -1053,6 +1067,9 @@ ...@@ -1053,6 +1067,9 @@
<if test="hasScalp != null"> <if test="hasScalp != null">
has_scalp = #{hasScalp,jdbcType=BIT}, has_scalp = #{hasScalp,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1118,7 +1135,8 @@ ...@@ -1118,7 +1135,8 @@
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
has_delete = #{hasDelete,jdbcType=BIT}, has_delete = #{hasDelete,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT} has_scalp = #{hasScalp,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPlatformSku"> <insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsPlatformSku">
...@@ -1303,6 +1321,9 @@ ...@@ -1303,6 +1321,9 @@
<if test="hasScalp != null"> <if test="hasScalp != null">
has_scalp, has_scalp,
</if> </if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -1480,6 +1501,9 @@ ...@@ -1480,6 +1501,9 @@
<if test="hasScalp != null"> <if test="hasScalp != null">
#{hasScalp,jdbcType=BIT}, #{hasScalp,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -1657,6 +1681,9 @@ ...@@ -1657,6 +1681,9 @@
<if test="hasScalp != null"> <if test="hasScalp != null">
has_scalp = #{hasScalp,jdbcType=BIT}, has_scalp = #{hasScalp,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsPlatformSku"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsPlatformSku">
...@@ -1676,8 +1703,8 @@ ...@@ -1676,8 +1703,8 @@
platform_sku_title_cn, platform_sku_quantity_ordered, platform_sku_quantity_shipped, platform_sku_title_cn, platform_sku_quantity_ordered, platform_sku_quantity_shipped,
platform_sku_unit_price, receipt_country, receipt_city, receipt_area, receipt_address, platform_sku_unit_price, receipt_country, receipt_city, receipt_area, receipt_address,
receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, receipt_address_2, receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name,
buyer_email, has_cancle, area_id, gmt_create, gmt_modified, has_delete, has_scalp buyer_email, has_cancle, area_id, gmt_create, gmt_modified, has_delete, has_scalp,
) company_id)
values values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTimeSite,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP}, #{transactionId,jdbcType=VARCHAR}, #{payTimeSite,jdbcType=TIMESTAMP}, #{payTime,jdbcType=TIMESTAMP},
...@@ -1700,7 +1727,8 @@ ...@@ -1700,7 +1727,8 @@
#{receiver,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{buyerId,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{buyerId,jdbcType=VARCHAR},
#{buyerName,jdbcType=VARCHAR}, #{buyerEmail,jdbcType=VARCHAR}, #{hasCancle,jdbcType=BIT}, #{buyerName,jdbcType=VARCHAR}, #{buyerEmail,jdbcType=VARCHAR}, #{hasCancle,jdbcType=BIT},
#{areaId,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP}, #{areaId,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP}, #{gmtModified,jdbcType=TIMESTAMP},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}) #{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
)
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},
...@@ -1759,7 +1787,8 @@ ...@@ -1759,7 +1787,8 @@
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
has_delete = #{hasDelete,jdbcType=BIT}, has_delete = #{hasDelete,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT} has_scalp = #{hasScalp,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPlatformSkuExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsPlatformSkuExample" resultMap="BaseResultMap">
<!-- <!--
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
<result column="logistics_method_code" jdbcType="VARCHAR" property="logisticsMethodCode" /> <result column="logistics_method_code" jdbcType="VARCHAR" property="logisticsMethodCode" />
<result column="logistics_method_name" jdbcType="VARCHAR" property="logisticsMethodName" /> <result column="logistics_method_name" jdbcType="VARCHAR" property="logisticsMethodName" />
<result column="has_innersale" jdbcType="BIT" property="hasInnersale" /> <result column="has_innersale" jdbcType="BIT" property="hasInnersale" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -200,7 +201,7 @@ ...@@ -200,7 +201,7 @@
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_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, gmt_create, gmt_modified, 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, logistics_method_code, logistics_method_name, has_innersale has_scalp, logistics_method_code, logistics_method_name, has_innersale, company_id
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -298,7 +299,8 @@ ...@@ -298,7 +299,8 @@
gmt_modified, ratio_weight, ratio_price, gmt_modified, ratio_weight, ratio_price,
bailun_picking_status, bailun_require_logistics, bailun_picking_status, bailun_require_logistics,
has_delete, has_scalp, logistics_method_code, has_delete, has_scalp, logistics_method_code,
logistics_method_name, has_innersale) logistics_method_name, has_innersale, company_id
)
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},
...@@ -336,7 +338,8 @@ ...@@ -336,7 +338,8 @@
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}, #{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}) #{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
)
</insert> </insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku"> <insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!-- <!--
...@@ -654,6 +657,9 @@ ...@@ -654,6 +657,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
has_innersale, has_innersale,
</if> </if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
...@@ -965,6 +971,9 @@ ...@@ -965,6 +971,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
#{hasInnersale,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</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">
...@@ -1293,6 +1302,9 @@ ...@@ -1293,6 +1302,9 @@
<if test="record.hasInnersale != null"> <if test="record.hasInnersale != null">
has_innersale = #{record.hasInnersale,jdbcType=BIT}, has_innersale = #{record.hasInnersale,jdbcType=BIT},
</if> </if>
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=INTEGER},
</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" />
...@@ -1406,7 +1418,8 @@ ...@@ -1406,7 +1418,8 @@
has_scalp = #{record.hasScalp,jdbcType=BIT}, has_scalp = #{record.hasScalp,jdbcType=BIT},
logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR}, logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{record.logisticsMethodName,jdbcType=VARCHAR}, logistics_method_name = #{record.logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{record.hasInnersale,jdbcType=BIT} has_innersale = #{record.hasInnersale,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
...@@ -1724,6 +1737,9 @@ ...@@ -1724,6 +1737,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
has_innersale = #{hasInnersale,jdbcType=BIT}, has_innersale = #{hasInnersale,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</set> </set>
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</update> </update>
...@@ -1834,7 +1850,8 @@ ...@@ -1834,7 +1850,8 @@
has_scalp = #{hasScalp,jdbcType=BIT}, has_scalp = #{hasScalp,jdbcType=BIT},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR}, logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR}, logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{hasInnersale,jdbcType=BIT} has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
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">
...@@ -2154,6 +2171,9 @@ ...@@ -2154,6 +2171,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
has_innersale, has_innersale,
</if> </if>
<if test="companyId != null">
company_id,
</if>
</trim> </trim>
values values
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
...@@ -2466,6 +2486,9 @@ ...@@ -2466,6 +2486,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
#{hasInnersale,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
...@@ -2778,6 +2801,9 @@ ...@@ -2778,6 +2801,9 @@
<if test="hasInnersale != null"> <if test="hasInnersale != null">
has_innersale = #{hasInnersale,jdbcType=BIT}, has_innersale = #{hasInnersale,jdbcType=BIT},
</if> </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
</trim> </trim>
</insert> </insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku"> <insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
...@@ -2807,7 +2833,7 @@ ...@@ -2807,7 +2833,7 @@
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, bailun_category_id, 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_category_name, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status,
bailun_require_logistics, has_delete, has_scalp, logistics_method_code, logistics_method_name, bailun_require_logistics, has_delete, has_scalp, logistics_method_code, logistics_method_name,
has_innersale) has_innersale, company_id)
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},
...@@ -2846,7 +2872,8 @@ ...@@ -2846,7 +2872,8 @@
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}, #{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}) #{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
)
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},
...@@ -2950,7 +2977,8 @@ ...@@ -2950,7 +2977,8 @@
has_scalp = #{hasScalp,jdbcType=BIT}, has_scalp = #{hasScalp,jdbcType=BIT},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR}, logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR}, logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{hasInnersale,jdbcType=BIT} has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!-- <!--
......
...@@ -800,6 +800,15 @@ public class DcBaseOmsOrder { ...@@ -800,6 +800,15 @@ public class DcBaseOmsOrder {
private Boolean hasInnersale; private Boolean hasInnersale;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.company_id
*
* @mbg.generated
*/
private Integer companyId;
/**
* 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
* *
...@@ -899,6 +908,7 @@ public class DcBaseOmsOrder { ...@@ -899,6 +908,7 @@ public class DcBaseOmsOrder {
sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics); sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
sb.append(", hasScalp=").append(hasScalp); sb.append(", hasScalp=").append(hasScalp);
sb.append(", hasInnersale=").append(hasInnersale); sb.append(", hasInnersale=").append(hasInnersale);
sb.append(", companyId=").append(companyId);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -1008,7 +1018,8 @@ public class DcBaseOmsOrder { ...@@ -1008,7 +1018,8 @@ public class DcBaseOmsOrder {
&& (this.getBailunPickingStatus() == null ? other.getBailunPickingStatus() == null : this.getBailunPickingStatus().equals(other.getBailunPickingStatus())) && (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())) && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
&& (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale())); && (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
} }
/** /**
...@@ -1109,6 +1120,7 @@ public class DcBaseOmsOrder { ...@@ -1109,6 +1120,7 @@ public class DcBaseOmsOrder {
result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode()); result = prime * result + ((getBailunRequireLogistics() == null) ? 0 : getBailunRequireLogistics().hashCode());
result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode()); result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode()); result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
...@@ -251,6 +251,15 @@ public class DcBaseOmsPick { ...@@ -251,6 +251,15 @@ public class DcBaseOmsPick {
private Boolean hasDelete; private Boolean hasDelete;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_pick.company_id
*
* @mbg.generated
*/
private Integer companyId;
/**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_pick * This method corresponds to the database table dc_base_oms_pick
* *
...@@ -289,6 +298,7 @@ public class DcBaseOmsPick { ...@@ -289,6 +298,7 @@ public class DcBaseOmsPick {
sb.append(", bailunSkuCostPackaging=").append(bailunSkuCostPackaging); sb.append(", bailunSkuCostPackaging=").append(bailunSkuCostPackaging);
sb.append(", bailunSkuOutboundWeight=").append(bailunSkuOutboundWeight); sb.append(", bailunSkuOutboundWeight=").append(bailunSkuOutboundWeight);
sb.append(", hasDelete=").append(hasDelete); sb.append(", hasDelete=").append(hasDelete);
sb.append(", companyId=").append(companyId);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -337,7 +347,8 @@ public class DcBaseOmsPick { ...@@ -337,7 +347,8 @@ public class DcBaseOmsPick {
&& (this.getBailunSkuCostShipping() == null ? other.getBailunSkuCostShipping() == null : this.getBailunSkuCostShipping().equals(other.getBailunSkuCostShipping())) && (this.getBailunSkuCostShipping() == null ? other.getBailunSkuCostShipping() == null : this.getBailunSkuCostShipping().equals(other.getBailunSkuCostShipping()))
&& (this.getBailunSkuCostPackaging() == null ? other.getBailunSkuCostPackaging() == null : this.getBailunSkuCostPackaging().equals(other.getBailunSkuCostPackaging())) && (this.getBailunSkuCostPackaging() == null ? other.getBailunSkuCostPackaging() == null : this.getBailunSkuCostPackaging().equals(other.getBailunSkuCostPackaging()))
&& (this.getBailunSkuOutboundWeight() == null ? other.getBailunSkuOutboundWeight() == null : this.getBailunSkuOutboundWeight().equals(other.getBailunSkuOutboundWeight())) && (this.getBailunSkuOutboundWeight() == null ? other.getBailunSkuOutboundWeight() == null : this.getBailunSkuOutboundWeight().equals(other.getBailunSkuOutboundWeight()))
&& (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete())); && (this.getHasDelete() == null ? other.getHasDelete() == null : this.getHasDelete().equals(other.getHasDelete()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
} }
/** /**
...@@ -377,6 +388,7 @@ public class DcBaseOmsPick { ...@@ -377,6 +388,7 @@ public class DcBaseOmsPick {
result = prime * result + ((getBailunSkuCostPackaging() == null) ? 0 : getBailunSkuCostPackaging().hashCode()); result = prime * result + ((getBailunSkuCostPackaging() == null) ? 0 : getBailunSkuCostPackaging().hashCode());
result = prime * result + ((getBailunSkuOutboundWeight() == null) ? 0 : getBailunSkuOutboundWeight().hashCode()); result = prime * result + ((getBailunSkuOutboundWeight() == null) ? 0 : getBailunSkuOutboundWeight().hashCode());
result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode()); result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
...@@ -530,6 +530,15 @@ public class DcBaseOmsPlatformSku { ...@@ -530,6 +530,15 @@ public class DcBaseOmsPlatformSku {
private Boolean hasScalp; private Boolean hasScalp;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_platform_sku.company_id
*
* @mbg.generated
*/
private Integer companyId;
/**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_platform_sku * This method corresponds to the database table dc_base_oms_platform_sku
* *
...@@ -599,6 +608,7 @@ public class DcBaseOmsPlatformSku { ...@@ -599,6 +608,7 @@ public class DcBaseOmsPlatformSku {
sb.append(", gmtModified=").append(gmtModified); sb.append(", gmtModified=").append(gmtModified);
sb.append(", hasDelete=").append(hasDelete); sb.append(", hasDelete=").append(hasDelete);
sb.append(", hasScalp=").append(hasScalp); sb.append(", hasScalp=").append(hasScalp);
sb.append(", companyId=").append(companyId);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -678,7 +688,8 @@ public class DcBaseOmsPlatformSku { ...@@ -678,7 +688,8 @@ public class DcBaseOmsPlatformSku {
&& (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.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())); && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
} }
/** /**
...@@ -749,6 +760,7 @@ public class DcBaseOmsPlatformSku { ...@@ -749,6 +760,7 @@ public class DcBaseOmsPlatformSku {
result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode()); result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode());
result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode()); result = prime * result + ((getHasDelete() == null) ? 0 : getHasDelete().hashCode());
result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode()); result = prime * result + ((getHasScalp() == null) ? 0 : getHasScalp().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
...@@ -935,6 +935,15 @@ public class DcBaseOmsSku { ...@@ -935,6 +935,15 @@ public class DcBaseOmsSku {
private Boolean hasInnersale; private Boolean hasInnersale;
/** /**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.company_id
*
* @mbg.generated
*/
private Integer companyId;
/**
* 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
* *
...@@ -1049,6 +1058,7 @@ public class DcBaseOmsSku { ...@@ -1049,6 +1058,7 @@ public class DcBaseOmsSku {
sb.append(", logisticsMethodCode=").append(logisticsMethodCode); sb.append(", logisticsMethodCode=").append(logisticsMethodCode);
sb.append(", logisticsMethodName=").append(logisticsMethodName); sb.append(", logisticsMethodName=").append(logisticsMethodName);
sb.append(", hasInnersale=").append(hasInnersale); sb.append(", hasInnersale=").append(hasInnersale);
sb.append(", companyId=").append(companyId);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
...@@ -1173,7 +1183,8 @@ public class DcBaseOmsSku { ...@@ -1173,7 +1183,8 @@ public class DcBaseOmsSku {
&& (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp())) && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
&& (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.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale())); && (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
} }
/** /**
...@@ -1289,6 +1300,7 @@ public class DcBaseOmsSku { ...@@ -1289,6 +1300,7 @@ public class DcBaseOmsSku {
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 + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode()); result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
return result; return result;
} }
} }
\ No newline at end of file
...@@ -6050,6 +6050,66 @@ public class DcBaseOmsOrderExample { ...@@ -6050,6 +6050,66 @@ public class DcBaseOmsOrderExample {
addCriterion("has_innersale not between", value1, value2, "hasInnersale"); addCriterion("has_innersale not between", value1, value2, "hasInnersale");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompanyIdIsNull() {
addCriterion("company_id is null");
return (Criteria) this;
}
public Criteria andCompanyIdIsNotNull() {
addCriterion("company_id is not null");
return (Criteria) this;
}
public Criteria andCompanyIdEqualTo(Integer value) {
addCriterion("company_id =", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotEqualTo(Integer value) {
addCriterion("company_id <>", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThan(Integer value) {
addCriterion("company_id >", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
addCriterion("company_id >=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThan(Integer value) {
addCriterion("company_id <", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
addCriterion("company_id <=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdIn(List<Integer> values) {
addCriterion("company_id in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotIn(List<Integer> values) {
addCriterion("company_id not in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
addCriterion("company_id between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
} }
/** /**
......
...@@ -2100,6 +2100,66 @@ public class DcBaseOmsPickExample { ...@@ -2100,6 +2100,66 @@ public class DcBaseOmsPickExample {
addCriterion("has_delete not between", value1, value2, "hasDelete"); addCriterion("has_delete not between", value1, value2, "hasDelete");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompanyIdIsNull() {
addCriterion("company_id is null");
return (Criteria) this;
}
public Criteria andCompanyIdIsNotNull() {
addCriterion("company_id is not null");
return (Criteria) this;
}
public Criteria andCompanyIdEqualTo(Integer value) {
addCriterion("company_id =", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotEqualTo(Integer value) {
addCriterion("company_id <>", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThan(Integer value) {
addCriterion("company_id >", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
addCriterion("company_id >=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThan(Integer value) {
addCriterion("company_id <", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
addCriterion("company_id <=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdIn(List<Integer> values) {
addCriterion("company_id in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotIn(List<Integer> values) {
addCriterion("company_id not in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
addCriterion("company_id between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
} }
/** /**
......
...@@ -4210,6 +4210,66 @@ public class DcBaseOmsPlatformSkuExample { ...@@ -4210,6 +4210,66 @@ public class DcBaseOmsPlatformSkuExample {
addCriterion("has_scalp not between", value1, value2, "hasScalp"); addCriterion("has_scalp not between", value1, value2, "hasScalp");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompanyIdIsNull() {
addCriterion("company_id is null");
return (Criteria) this;
}
public Criteria andCompanyIdIsNotNull() {
addCriterion("company_id is not null");
return (Criteria) this;
}
public Criteria andCompanyIdEqualTo(Integer value) {
addCriterion("company_id =", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotEqualTo(Integer value) {
addCriterion("company_id <>", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThan(Integer value) {
addCriterion("company_id >", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
addCriterion("company_id >=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThan(Integer value) {
addCriterion("company_id <", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
addCriterion("company_id <=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdIn(List<Integer> values) {
addCriterion("company_id in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotIn(List<Integer> values) {
addCriterion("company_id not in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
addCriterion("company_id between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
} }
/** /**
......
...@@ -7010,6 +7010,66 @@ public class DcBaseOmsSkuExample { ...@@ -7010,6 +7010,66 @@ public class DcBaseOmsSkuExample {
addCriterion("has_innersale not between", value1, value2, "hasInnersale"); addCriterion("has_innersale not between", value1, value2, "hasInnersale");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCompanyIdIsNull() {
addCriterion("company_id is null");
return (Criteria) this;
}
public Criteria andCompanyIdIsNotNull() {
addCriterion("company_id is not null");
return (Criteria) this;
}
public Criteria andCompanyIdEqualTo(Integer value) {
addCriterion("company_id =", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotEqualTo(Integer value) {
addCriterion("company_id <>", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThan(Integer value) {
addCriterion("company_id >", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
addCriterion("company_id >=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThan(Integer value) {
addCriterion("company_id <", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
addCriterion("company_id <=", value, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdIn(List<Integer> values) {
addCriterion("company_id in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotIn(List<Integer> values) {
addCriterion("company_id not in", values, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
addCriterion("company_id between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
addCriterion("company_id not between", value1, value2, "companyId");
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