Skip to content

D
dc-java
Commit 9c407e08 by wutong
Options

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

parent 5b8989ee
Showing with 504 additions and 50 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/BailunSkuStructure.java
package com.bailuntec.domain.pojo;
import com.bailuntec.domain.entity.DcBaseOmsSku;
import com.bailuntec.domain.entity.DcBaseWarehouse;
import lombok.Data;
import java.math.BigDecimal;
......@@ -15,8 +16,9 @@ public class BailunSkuStructure {
private BigDecimal bailunSkuUnitPrice;
private BigDecimal skuCostRatio;//这是根据采购价摊分比例
private BigDecimal skuWeightRatio;//这是根据重量摊分比例
private DcBaseOmsSku dcBaseOmsSku;
private Integer skuQuantityOrderd;
private DcBaseOmsSku dcBaseOmsSku;
private DcBaseWarehouse dcBaseWarehouse;
public BailunSkuStructure() {
}
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/OmsResult.java
......@@ -225,6 +225,26 @@ public class OmsResult {
*
* @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")
private List<BailunSku> bailunSku;
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
......@@ -74,7 +74,7 @@ public class OrderSyncJob extends PointJob {
map.put("pageIndex", jobPointLog.getPageIndex() == 0 ? "1" : jobPointLog.getPageIndex().toString());
map.put("pageCount", jobPointLog.getPageSize().toString());
//时间回退一点, 避免服务器时间不一致而漏单
map.put("BailunLastUpdateTimeFrom", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusMinutes(5)));
map.put("BailunLastUpdateTimeFrom", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getStartTime().minusMinutes(1)));
map.put("BailunLastUpdateTimeTo", DateTimeFormatter.ofPattern(CommonConstant.TIME_FORMAT).format(jobPointLog.getEndTime()));
Response response = null;
String omsResultStr = null;
......@@ -138,11 +138,8 @@ public class OrderSyncJob extends PointJob {
}
}
}
//如果订单中存在百伦SKU, 去拿一些放在SKU里的信息
Map<String, BailunSkuStructure> bailunSkuInfoMap = new HashMap<>();
//拿仓库信息
DcBaseWarehouse dcBaseWarehouse = getDcBaseWarehouse(omsResult);
BigDecimal totalCostFirst = BigDecimal.ZERO;
if (omsResult.getBailunSku() != null && omsResult.getBailunSku().size() > 0) {
/*
......@@ -153,9 +150,10 @@ public class OrderSyncJob extends PointJob {
//SKU总个数
dcBaseOmsOrder.setQuantityBailunSku(bailunSkuCumulative.getTotalQuantity());
//计算每个SKU采购价占总采购价比重(用于摊分SKU售价之类) 以及 每个SKU重量价占总重量的比重
for (BailunSku bailunSku : omsResult.getBailunSku()) {
//拿每个SKU的发货仓库信息
DcBaseWarehouse dcBaseWarehouse = getDcBaseWarehouse(bailunSku, omsResult);
BailunSkuStructure bailunSkuStructure = new BailunSkuStructure();
bailunSkuStructure.setBailunSku(bailunSku.getBailunSku());
bailunSkuStructure.setBailunSkuUnitPrice((bailunSku.getBailunSkuUnitPrice() != null&&bailunSku.getBailunSkuUnitPrice().getAmount() != null)?bailunSku.getBailunSkuUnitPrice().getAmount() : BigDecimal.ZERO);
......@@ -163,6 +161,7 @@ public class OrderSyncJob extends PointJob {
bailunSkuStructure.setSkuCostRatio(dcBaseOmsOrder.getCostProduct().compareTo(BigDecimal.ZERO) ==1 ?bailunSkuStructure.getBailunSkuUnitPrice().multiply(BigDecimal.valueOf(bailunSku.getBailunSkuQuantityOrdered())).divide(dcBaseOmsOrder.getCostProduct(), 3 ,RoundingMode.HALF_EVEN) : BigDecimal.ONE);
bailunSkuStructure.setSkuWeightRatio(bailunSkuCumulative.getTotalWeight().compareTo(BigDecimal.ZERO) ==1 ? bailunSkuStructure.getBailunSkuWeight().multiply(BigDecimal.valueOf(bailunSku.getBailunSkuQuantityOrdered())).divide(bailunSkuCumulative.getTotalWeight(), 3 ,RoundingMode.HALF_EVEN) : BigDecimal.ONE);
bailunSkuStructure.setSkuQuantityOrderd(bailunSku.getBailunSkuQuantityOrdered() != null? bailunSku.getBailunSkuQuantityOrdered(): 0);
bailunSkuStructure.setDcBaseWarehouse(dcBaseWarehouse);
DcBaseOmsSku dcBaseOmsSku = new DcBaseOmsSku();
/*
* 赋值, 初始值避免null
......@@ -179,8 +178,11 @@ public class OrderSyncJob extends PointJob {
bailunSkuStructure.setDcBaseOmsSku(dcBaseOmsSku);
bailunSkuInfoMap.put(bailunSku.getBailunSku(), bailunSkuStructure);
}
//按规则计算处理费
caculateBailunHandleFee(dcBaseOmsOrder, bailunSkuCumulative, dcBaseWarehouse);
/*
* 按规则计算百伦处理费
* 处理费算到订单维度
*/
caculateBailunHandleFee(dcBaseOmsOrder, bailunSkuCumulative, bailunSkuInfoMap.get(omsResult.getBailunSku().get(0).getBailunSku()).getDcBaseWarehouse());
}
/*
* 配货单处理,
......@@ -232,6 +234,7 @@ public class OrderSyncJob extends PointJob {
*/
for (BailunSkuStructure bailunSkuStructure : bailunSkuInfoMap.values()) {
DcBaseOmsSku dcBaseOmsSku =bailunSkuStructure.getDcBaseOmsSku();
DcBaseWarehouse dcBaseWarehouse =bailunSkuStructure.getDcBaseWarehouse();
dcBaseOmsSku.setRatioPrice(bailunSkuStructure.getSkuCostRatio());
dcBaseOmsSku.setRatioWeight(bailunSkuStructure.getSkuWeightRatio());
//总收入
......@@ -315,7 +318,7 @@ public class OrderSyncJob extends PointJob {
.add(dcBaseOmsSku.getCostProduct())//采购成本
.add(skuPaypalFeeRmb.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN))//Paypal费
.setScale(3, RoundingMode.HALF_EVEN);
} else {
} else {//除非发货了, 不然费用都是0
dcBaseOmsSku.setAmountAdjustment(BigDecimal.ZERO);
dcBaseOmsSku.setAmountTax(BigDecimal.ZERO);
dcBaseOmsSku.setCostPromotion(BigDecimal.ZERO);
......@@ -409,7 +412,7 @@ public class OrderSyncJob extends PointJob {
/**
* 计算百伦的处理费用
*
* 阶梯计费
* @param dcBaseOmsOrder
* @param bailunSkuCumulative
* @param dcBaseWarehouse
......@@ -514,22 +517,22 @@ public class OrderSyncJob extends PointJob {
return bailunSkuCumulative;
}
private DcBaseWarehouse getDcBaseWarehouse(OmsResult omsResult) {
private DcBaseWarehouse getDcBaseWarehouse(BailunSku bailunSku, OmsResult omsResult) {
DcBaseWarehouse dcBaseWarehouse = null;
try {
DcBaseWarehouseMapper baseWarehouseMapper = SessionUtil.getSession().getMapper(DcBaseWarehouseMapper.class);
if (PlatformType.FBA.value().equals(omsResult.getPlatformType())) {
dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andBailunAccountIdEqualTo(omsResult.getSeller().getBailunAccountId()).example());
} else if (omsResult.getBailunSku().size() > 0 && StringUtils.isNotBlank(omsResult.getBailunSku().get(0).getWarehouseCode())) {
if (omsResult.getLogisticsItems() != null && omsResult.getLogisticsItems().size() > 0 && omsResult.getLogisticsItems().get(0).getWarehouse() != null && omsResult.getLogisticsItems().get(0).getWarehouse().getWarehouseCode() != null) {
} else {
if (StringUtils.isNotBlank(bailunSku.getWarehouseCode())) {
dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andWarehouseCodeEqualTo(bailunSku.getWarehouseCode()).example());
} else if (omsResult.getLogisticsItems() != null && omsResult.getLogisticsItems().size() > 0 && omsResult.getLogisticsItems().get(0).getWarehouse() != null && omsResult.getLogisticsItems().get(0).getWarehouse().getWarehouseCode() != null){
dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andWarehouseCodeEqualTo(omsResult.getLogisticsItems().get(0).getWarehouse().getWarehouseCode()).example());
} else if (omsResult.getBailunSku() != null && omsResult.getBailunSku().size() > 0){
dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andWarehouseCodeEqualTo(omsResult.getBailunSku().get(0).getWarehouseCode()).example());
}
}
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("MYBATIS操作DB失败", e);
throw new RuntimeException("MYBATIS操作DB查询仓库信息失败", e);
} finally {
SessionUtil.closeSession();
}
......@@ -640,20 +643,6 @@ public class OrderSyncJob extends PointJob {
}
}
/**
* 对每一个订单中的多个百伦SKU进行处理
* @param dcBaseWarehouse
* @param dcBaseOmsOrder
* @param dcBaseOmsSku
*/
public void skuOrderHandle(DcBaseWarehouse dcBaseWarehouse, DcBaseOmsOrder dcBaseOmsOrder, BailunSkuCumulative bailunSkuCumulative, Map<String, BailunSkuStructure> skuStructureMap, DcBaseOmsSku dcBaseOmsSku, OmsResult omsResult, BailunSku bailunSku, HashMap<String, String> saleItemHashMap, Boolean isFbaFeeException) {
// -- end 调用产品库信息 skuProductInfo, 获取分类信息
//处理SKU费用信息
skuOrderFeeHandle(dcBaseOmsOrder, bailunSkuCumulative.getTotalWeight(), skuStructureMap, dcBaseOmsSku, omsResult);
}
/**
* 拿SkU基础信息
......@@ -802,6 +791,8 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setBailunShippingStatus(omsResult.getBailunShippingStatus());
dcBaseOmsOrder.setBailunPaymentStatus(omsResult.getBailunPaymentStatus());
dcBaseOmsOrder.setOrderUpdateTime(omsResult.getOrderUpdateTime());
dcBaseOmsOrder.setBailunPickingStatus(omsResult.getBailunPickingStatus());
dcBaseOmsOrder.setBailunRequireLogistics(omsResult.getBailunRequireLogistics());
dcBaseOmsOrder.setAmountGiftWrap((omsResult.getOrderCharge().getAmountGiftWrap() != null && omsResult.getOrderCharge().getAmountGiftWrap().getAmount() != null) ? omsResult.getOrderCharge().getAmountGiftWrap().getAmount() : BigDecimal.ZERO);
dcBaseOmsOrder.setAmountTotal((omsResult.getOrderCharge().getAmountTotal() != null && omsResult.getOrderCharge().getAmountTotal().getAmount() != null) ? omsResult.getOrderCharge().getAmountTotal().getAmount() : BigDecimal.ZERO);
......@@ -889,6 +880,9 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setShippingStatus(omsResult.getBailunShippingStatus());
dcBaseOmsSku.setBailunPaymentStatus(omsResult.getBailunPaymentStatus());
dcBaseOmsSku.setOrderUpdateTime(omsResult.getOrderUpdateTime());
dcBaseOmsSku.setBailunPickingStatus(omsResult.getBailunPickingStatus());
dcBaseOmsSku.setBailunRequireLogistics(omsResult.getBailunRequireLogistics());
//币种和汇率
dcBaseOmsSku.setOrderCurrency(dcBaseOmsOrder.getOrderCurrency());
dcBaseOmsSku.setOtherCurrency(dcBaseOmsOrder.getOtherCurrency());
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.xml
......@@ -86,6 +86,8 @@
<result column="logistics_warehouse_name" jdbcType="VARCHAR" property="logisticsWarehouseName" />
<result column="logistics_method_code" jdbcType="VARCHAR" property="logisticsMethodCode" />
<result column="logistics_method_name" jdbcType="VARCHAR" property="logisticsMethodName" />
<result column="bailun_picking_status" jdbcType="VARCHAR" property="bailunPickingStatus" />
<result column="bailun_require_logistics" jdbcType="VARCHAR" property="bailunRequireLogistics" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -173,7 +175,7 @@
receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, buyer_email,
has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, gmt_modified,
quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, logistics_method_code,
logistics_method_name
logistics_method_name, bailun_picking_status, bailun_require_logistics
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......@@ -262,7 +264,8 @@
has_cancle, area_id, gmt_create,
gmt_modified, quantity_bailun_sku, logistics_warehouse_code,
logistics_warehouse_name, logistics_method_code,
logistics_method_name)
logistics_method_name, bailun_picking_status,
bailun_require_logistics)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
......@@ -291,7 +294,8 @@
#{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP}, #{quantityBailunSku,jdbcType=INTEGER}, #{logisticsWarehouseCode,jdbcType=VARCHAR},
#{logisticsWarehouseName,jdbcType=VARCHAR}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR})
#{logisticsMethodName,jdbcType=VARCHAR}, #{bailunPickingStatus,jdbcType=VARCHAR},
#{bailunRequireLogistics,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
<!--
......@@ -540,6 +544,12 @@
<if test="logisticsMethodName != null">
logistics_method_name,
</if>
<if test="bailunPickingStatus != null">
bailun_picking_status,
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -782,6 +792,12 @@
<if test="logisticsMethodName != null">
#{logisticsMethodName,jdbcType=VARCHAR},
</if>
<if test="bailunPickingStatus != null">
#{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
#{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
......@@ -1041,6 +1057,12 @@
<if test="record.logisticsMethodName != null">
logistics_method_name = #{record.logisticsMethodName,jdbcType=VARCHAR},
</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>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1131,7 +1153,9 @@
logistics_warehouse_code = #{record.logisticsWarehouseCode,jdbcType=VARCHAR},
logistics_warehouse_name = #{record.logisticsWarehouseName,jdbcType=VARCHAR},
logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{record.logisticsMethodName,jdbcType=VARCHAR}
logistics_method_name = #{record.logisticsMethodName,jdbcType=VARCHAR},
bailun_picking_status = #{record.bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{record.bailunRequireLogistics,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1380,6 +1404,12 @@
<if test="logisticsMethodName != null">
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
</if>
<if test="bailunPickingStatus != null">
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1467,7 +1497,9 @@
logistics_warehouse_code = #{logisticsWarehouseCode,jdbcType=VARCHAR},
logistics_warehouse_name = #{logisticsWarehouseName,jdbcType=VARCHAR},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR}
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
......@@ -1718,6 +1750,12 @@
<if test="logisticsMethodName != null">
logistics_method_name,
</if>
<if test="bailunPickingStatus != null">
bailun_picking_status,
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -1961,6 +1999,12 @@
<if test="logisticsMethodName != null">
#{logisticsMethodName,jdbcType=VARCHAR},
</if>
<if test="bailunPickingStatus != null">
#{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
#{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2204,6 +2248,12 @@
<if test="logisticsMethodName != null">
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
</if>
<if test="bailunPickingStatus != null">
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
......@@ -2228,7 +2278,7 @@
receipt_postal_code, receiver, receiver_phone, buyer_id, buyer_name, buyer_email,
has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create, gmt_modified,
quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name, logistics_method_code,
logistics_method_name)
logistics_method_name, bailun_picking_status, bailun_require_logistics)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2258,7 +2308,8 @@
#{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP}, #{quantityBailunSku,jdbcType=INTEGER}, #{logisticsWarehouseCode,jdbcType=VARCHAR},
#{logisticsWarehouseName,jdbcType=VARCHAR}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR})
#{logisticsMethodName,jdbcType=VARCHAR}, #{bailunPickingStatus,jdbcType=VARCHAR},
#{bailunRequireLogistics,jdbcType=VARCHAR})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -2339,7 +2390,9 @@
logistics_warehouse_code = #{logisticsWarehouseCode,jdbcType=VARCHAR},
logistics_warehouse_name = #{logisticsWarehouseName,jdbcType=VARCHAR},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR}
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
......@@ -97,6 +97,8 @@
<result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
<result column="ratio_weight" jdbcType="DECIMAL" property="ratioWeight" />
<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>
<sql id="Example_Where_Clause">
<!--
......@@ -186,7 +188,7 @@
receipt_area, receipt_address, receipt_address_2, receipt_postal_code, receiver,
receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_exception,
has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......@@ -279,7 +281,8 @@
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)
ratio_weight, ratio_price, bailun_picking_status,
bailun_require_logistics)
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
......@@ -312,7 +315,8 @@
#{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT}, #{hasPlatformException,jdbcType=BIT},
#{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{bailunCategoryId,jdbcType=INTEGER},
#{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 id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!--
......@@ -594,6 +598,12 @@
<if test="ratioPrice != null">
ratio_price,
</if>
<if test="bailunPickingStatus != null">
bailun_picking_status,
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -869,6 +879,12 @@
<if test="ratioPrice != null">
#{ratioPrice,jdbcType=DECIMAL},
</if>
<if test="bailunPickingStatus != null">
#{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
#{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
......@@ -1161,6 +1177,12 @@
<if test="record.ratioPrice != null">
ratio_price = #{record.ratioPrice,jdbcType=DECIMAL},
</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>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1262,7 +1284,9 @@
gmt_create = #{record.gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{record.gmtModified,jdbcType=TIMESTAMP},
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">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1544,6 +1568,12 @@
<if test="ratioPrice != null">
ratio_price = #{ratioPrice,jdbcType=DECIMAL},
</if>
<if test="bailunPickingStatus != null">
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1642,7 +1672,9 @@
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
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}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -1926,6 +1958,12 @@
<if test="ratioPrice != null">
ratio_price,
</if>
<if test="bailunPickingStatus != null">
bailun_picking_status,
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -2202,6 +2240,12 @@
<if test="ratioPrice != null">
#{ratioPrice,jdbcType=DECIMAL},
</if>
<if test="bailunPickingStatus != null">
#{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
#{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2478,6 +2522,12 @@
<if test="ratioPrice != null">
ratio_price = #{ratioPrice,jdbcType=DECIMAL},
</if>
<if test="bailunPickingStatus != null">
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRequireLogistics != null">
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2504,7 +2554,8 @@
receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code,
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception,
has_platform_exception, has_cancle, area_id, bailun_category_id, bailun_category_name,
gmt_create, gmt_modified, ratio_weight, ratio_price)
gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics
)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2538,7 +2589,8 @@
#{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT}, #{hasPlatformException,jdbcType=BIT},
#{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{bailunCategoryId,jdbcType=INTEGER},
#{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
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -2630,7 +2682,9 @@
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
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>
<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
NAME_SPACE=data-center
JOB_NAME=base-sync-oms-order-coroutine
#JOB_NAME=base-sync-oms-order
JOB_CRON=0/1 * * * * ? *
JOB_CRON=0/1 * 1-23 * * ? *
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 {
LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
map.put("pageIndex", "1");
map.put("pageCount", "100");
map.put("OriginOrderNo", "263334209922-2394744359016");
map.put("OriginOrderNo", "249457436016");
Request request = new Request.Builder()
.get()
.url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))
......
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsOrder.java
......@@ -728,6 +728,24 @@ public class DcBaseOmsOrder {
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 corresponds to the database table dc_base_oms_order
*
......@@ -819,6 +837,8 @@ public class DcBaseOmsOrder {
sb.append(", logisticsWarehouseName=").append(logisticsWarehouseName);
sb.append(", logisticsMethodCode=").append(logisticsMethodCode);
sb.append(", logisticsMethodName=").append(logisticsMethodName);
sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
sb.append("]");
return sb.toString();
}
......@@ -920,7 +940,9 @@ public class DcBaseOmsOrder {
&& (this.getLogisticsWarehouseCode() == null ? other.getLogisticsWarehouseCode() == null : this.getLogisticsWarehouseCode().equals(other.getLogisticsWarehouseCode()))
&& (this.getLogisticsWarehouseName() == null ? other.getLogisticsWarehouseName() == null : this.getLogisticsWarehouseName().equals(other.getLogisticsWarehouseName()))
&& (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 {
result = prime * result + ((getLogisticsWarehouseName() == null) ? 0 : getLogisticsWarehouseName().hashCode());
result = prime * result + ((getLogisticsMethodCode() == null) ? 0 : getLogisticsMethodCode().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;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java
......@@ -827,6 +827,24 @@ public class DcBaseOmsSku {
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 corresponds to the database table dc_base_oms_sku
*
......@@ -929,6 +947,8 @@ public class DcBaseOmsSku {
sb.append(", gmtModified=").append(gmtModified);
sb.append(", ratioWeight=").append(ratioWeight);
sb.append(", ratioPrice=").append(ratioPrice);
sb.append(", bailunPickingStatus=").append(bailunPickingStatus);
sb.append(", bailunRequireLogistics=").append(bailunRequireLogistics);
sb.append("]");
return sb.toString();
}
......@@ -1041,7 +1061,9 @@ public class DcBaseOmsSku {
&& (this.getGmtCreate() == null ? other.getGmtCreate() == null : this.getGmtCreate().equals(other.getGmtCreate()))
&& (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
&& (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 {
result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode());
result = prime * result + ((getRatioWeight() == null) ? 0 : getRatioWeight().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;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsOrderExample.java
......@@ -5550,6 +5550,146 @@ public class DcBaseOmsOrderExample {
addCriterion("logistics_method_name not between", value1, value2, "logisticsMethodName");
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 {
addCriterion("ratio_price not between", value1, value2, "ratioPrice");
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