Skip to content

D
dc-java
Commit 1ee14ae9 by wutong
Options

订单处理费逻辑修改； 新增字段， 区分是否FBA-S01前缀的订单， 这类订单不计销量

parent d22427c0
Showing with 240 additions and 32 deletions
data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java
......@@ -108,6 +108,8 @@ public class OrderSyncJob extends PointJob {
DcBaseOmsOrder dcBaseOmsOrder = new DcBaseOmsOrder();
assignmentOrderInfo(omsResult, dcBaseOmsOrder);
deleteSku(dcBaseOmsOrder);//因为OMS可能改订单, 部分SKU有可能会被删除, 所以先删除, 再插入, 并且更新退款为未予订单关联
//判断是否FBA单号前缀为S0的单
hasS0(omsResult, dcBaseOmsOrder);
//判断是否内购订单
hasInnerSale(omsResult, dcBaseOmsOrder);
//判断是否刷单订单
......@@ -454,6 +456,17 @@ public class OrderSyncJob extends PointJob {
}
}
private void hasS0(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder) {
if (omsResult.getPlatformType().toUpperCase().equals(PlatformType.FBA.value()) && omsResult.getOriginOrderId().length() > 2) {
String substring = omsResult.getOriginOrderId().substring(0, 2);
dcBaseOmsOrder.setHasFbaS(false);
if (substring.toUpperCase().equals("S0")) {
dcBaseOmsOrder.setHasFbaS(true);
}
}
}
private void hasInnerSale(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder) {
if (omsResult.getOriginOrderId().length() > 6) {
String substring = omsResult.getOriginOrderId().substring(0, 6);
......@@ -581,28 +594,26 @@ public class OrderSyncJob extends PointJob {
* @param dcBaseOmsOrder
*/
private void caculateBailunHandleFee(DcBaseOmsOrder dcBaseOmsOrder, BailunSkuCumulative bailunSkuCumulative) {
BigDecimal costBailunHandle = BigDecimal.valueOf(1.2);//海外仓和FBA 的，都是直接1.2元一个单
BigDecimal costBailunHandle = BigDecimal.ONE;//海外仓和FBA 的，都是直接1元一个单
if(bailunSkuCumulative.getDomesticOrOverseas()) {
switch (bailunSkuCumulative.getCountSelfProducrSku()) {
case 0:
case 1:
costBailunHandle = BigDecimal.valueOf(2.0);
costBailunHandle = BigDecimal.ZERO;
break;
case 1:
case 2:
case 3:
case 4:
case 5:
costBailunHandle = BigDecimal.valueOf(bailunSkuCumulative.getCountSelfProducrSku() - 1).add(BigDecimal.valueOf(2.0));
break;
case 6:
case 7:
case 8:
case 9:
case 10:
costBailunHandle = BigDecimal.valueOf(0.5).multiply(BigDecimal.valueOf(bailunSkuCumulative.getCountSelfProducrSku() - 5)).add(BigDecimal.valueOf(6.0));
costBailunHandle = BigDecimal.valueOf(0.3).multiply(BigDecimal.valueOf(bailunSkuCumulative.getCountSelfProducrSku() - 1)).add(BigDecimal.ONE);
break;
default:
costBailunHandle = BigDecimal.valueOf(8.5);
costBailunHandle = BigDecimal.valueOf(3.7);//超过10个只取10个的费用
}
}
dcBaseOmsOrder.setCostHandleBailun(costBailunHandle);
......@@ -962,7 +973,7 @@ public class OrderSyncJob extends PointJob {
* @return
*/
public void assignmentSkuInfo(OmsResult omsResult, DcBaseOmsOrder dcBaseOmsOrder, DcBaseOmsSku dcBaseOmsSku, BailunSku bailunSku, DcBaseWarehouse dcBaseWarehouse, HashMap<String, Logistics> logisticsHashMap) {
dcBaseOmsOrder.setCompanyId(omsResult.getCompanyId());
dcBaseOmsSku.setCompanyId(omsResult.getCompanyId());
dcBaseOmsSku.setBailunSkuQuantityShipped(0);
dcBaseOmsSku.setBailunSkuQuantityPicked(0);
dcBaseOmsSku.setCostHandlePlatform(BigDecimal.ZERO);
......@@ -1069,7 +1080,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setRefundReferenceId(dcBaseOmsOrder.getRefundReferenceId());
dcBaseOmsSku.setAmountRefund(dcBaseOmsOrder.getAmountRefund());
dcBaseOmsSku.setRefundType(dcBaseOmsOrder.getRefundType());
dcBaseOmsSku.setHasFbaS(dcBaseOmsOrder.getHasFbaS());
}
/**
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.java
......@@ -121,7 +121,7 @@ public interface DcBaseOmsOrderMapper {
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int upsertSelective(DcBaseOmsOrder record);
void logicDeleteOmsSku(DcBaseOmsOrder dcBaseOmsOrder);
void logicDeleteOmsPick(DcBaseOmsOrder dcBaseOmsOrder);
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderMapper.xml
......@@ -100,6 +100,7 @@
<result column="refund_obj" jdbcType="VARCHAR" property="refundObj" />
<result column="refund_type" jdbcType="VARCHAR" property="refundType" />
<result column="refund_reference_id" jdbcType="VARCHAR" property="refundReferenceId" />
<result column="has_fba_s" jdbcType="BIT" property="hasFbaS" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -189,7 +190,8 @@
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create,
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id,
has_fba_s
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......@@ -284,7 +286,7 @@
bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id,
profit_oms, refund_obj, refund_type,
refund_reference_id)
refund_reference_id, has_fba_s)
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},
......@@ -319,7 +321,7 @@
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR})
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
<!--
......@@ -610,6 +612,9 @@
<if test="refundReferenceId != null">
refund_reference_id,
</if>
<if test="hasFbaS != null">
has_fba_s,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -894,6 +899,9 @@
<if test="refundReferenceId != null">
#{refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="hasFbaS != null">
#{hasFbaS,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
......@@ -1195,6 +1203,9 @@
<if test="record.refundReferenceId != null">
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="record.hasFbaS != null">
has_fba_s = #{record.hasFbaS,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1299,7 +1310,8 @@
profit_oms = #{record.profitOms,jdbcType=DECIMAL},
refund_obj = #{record.refundObj,jdbcType=VARCHAR},
refund_type = #{record.refundType,jdbcType=VARCHAR},
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR}
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{record.hasFbaS,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1590,6 +1602,9 @@
<if test="refundReferenceId != null">
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="hasFbaS != null">
has_fba_s = #{hasFbaS,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1691,7 +1706,8 @@
profit_oms = #{profitOms,jdbcType=DECIMAL},
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
......@@ -1984,6 +2000,9 @@
<if test="refundReferenceId != null">
refund_reference_id,
</if>
<if test="hasFbaS != null">
has_fba_s,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -2269,6 +2288,9 @@
<if test="refundReferenceId != null">
#{refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="hasFbaS != null">
#{hasFbaS,jdbcType=BIT},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2554,6 +2576,9 @@
<if test="refundReferenceId != null">
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="hasFbaS != null">
has_fba_s = #{hasFbaS,jdbcType=BIT},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
......@@ -2580,8 +2605,8 @@
buyer_email, has_fba_exception, has_platform_exception, has_cancle, area_id, gmt_create,
gmt_modified, quantity_bailun_sku, logistics_warehouse_code, logistics_warehouse_name,
logistics_method_code, logistics_method_name, bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id
)
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id,
has_fba_s)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2617,7 +2642,7 @@
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR})
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -2712,7 +2737,8 @@
profit_oms = #{profitOms,jdbcType=DECIMAL},
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......@@ -2731,7 +2757,7 @@
</if>
limit 1
</select>
<update id="logicDeleteOmsSku">
update dc_base_oms_sku set has_delete=1 where origin_order_id=#{originOrderId,jdbcType=VARCHAR} and bailun_account_id = #{bailunAccountId,jdbcType=INTEGER}
</update>
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
......@@ -114,6 +114,7 @@
<result column="refund_obj" jdbcType="VARCHAR" property="refundObj" />
<result column="refund_type" jdbcType="VARCHAR" property="refundType" />
<result column="refund_reference_id" jdbcType="VARCHAR" property="refundReferenceId" />
<result column="has_fba_s" jdbcType="BIT" property="hasFbaS" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -206,7 +207,7 @@
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,
has_scalp, logistics_method_code, logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type, refund_reference_id
bailun_refund_status, refund_obj, refund_type, refund_reference_id, has_fba_s
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......@@ -306,7 +307,7 @@
has_delete, has_scalp, logistics_method_code,
logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type,
refund_reference_id)
refund_reference_id, has_fba_s)
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},
......@@ -346,7 +347,7 @@
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR})
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!--
......@@ -679,6 +680,9 @@
<if test="refundReferenceId != null">
refund_reference_id,
</if>
<if test="hasFbaS != null">
has_fba_s,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -1005,6 +1009,9 @@
<if test="refundReferenceId != null">
#{refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="hasFbaS != null">
#{hasFbaS,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
......@@ -1348,6 +1355,9 @@
<if test="record.refundReferenceId != null">
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="record.hasFbaS != null">
has_fba_s = #{record.hasFbaS,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1466,7 +1476,8 @@
bailun_refund_status = #{record.bailunRefundStatus,jdbcType=VARCHAR},
refund_obj = #{record.refundObj,jdbcType=VARCHAR},
refund_type = #{record.refundType,jdbcType=VARCHAR},
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR}
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{record.hasFbaS,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1799,6 +1810,9 @@
<if test="refundReferenceId != null">
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="hasFbaS != null">
has_fba_s = #{hasFbaS,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1914,7 +1928,8 @@
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2249,6 +2264,9 @@
<if test="refundReferenceId != null">
refund_reference_id,
</if>
<if test="hasFbaS != null">
has_fba_s,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -2576,6 +2594,9 @@
<if test="refundReferenceId != null">
#{refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="hasFbaS != null">
#{hasFbaS,jdbcType=BIT},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2903,6 +2924,9 @@
<if test="refundReferenceId != null">
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
</if>
<if test="hasFbaS != null">
has_fba_s = #{hasFbaS,jdbcType=BIT},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2932,8 +2956,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, bailun_picking_status,
bailun_require_logistics, has_delete, has_scalp, logistics_method_code, logistics_method_name,
has_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id
)
has_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id,
has_fba_s)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2974,7 +2998,7 @@
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR})
#{refundReferenceId,jdbcType=VARCHAR}, #{hasFbaS,jdbcType=BIT})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -3083,7 +3107,8 @@
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
has_fba_s = #{hasFbaS,jdbcType=BIT}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......
data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java
......@@ -73,7 +73,7 @@ public class OmsOrderTest {
LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
map.put("pageIndex", "1");
map.put("pageCount", "100");
map.put("OriginOrderNo", "123761401225-2120745544002");
map.put("OriginOrderNo", "S02-9738824-8579305");
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
......@@ -854,6 +854,15 @@ public class DcBaseOmsOrder {
private String refundReferenceId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.has_fba_s
*
* @mbg.generated
*/
private Boolean hasFbaS;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_order
*
......@@ -959,6 +968,7 @@ public class DcBaseOmsOrder {
sb.append(", refundObj=").append(refundObj);
sb.append(", refundType=").append(refundType);
sb.append(", refundReferenceId=").append(refundReferenceId);
sb.append(", hasFbaS=").append(hasFbaS);
sb.append("]");
return sb.toString();
}
......@@ -1074,7 +1084,8 @@ public class DcBaseOmsOrder {
&& (this.getProfitOms() == null ? other.getProfitOms() == null : this.getProfitOms().equals(other.getProfitOms()))
&& (this.getRefundObj() == null ? other.getRefundObj() == null : this.getRefundObj().equals(other.getRefundObj()))
&& (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType()))
&& (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()));
&& (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()))
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()));
}
/**
......@@ -1181,6 +1192,7 @@ public class DcBaseOmsOrder {
result = prime * result + ((getRefundObj() == null) ? 0 : getRefundObj().hashCode());
result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode());
result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
result = prime * result + ((getHasFbaS() == null) ? 0 : getHasFbaS().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsSku.java
......@@ -980,6 +980,15 @@ public class DcBaseOmsSku {
private String refundReferenceId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.has_fba_s
*
* @mbg.generated
*/
private Boolean hasFbaS;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_sku
*
......@@ -1099,6 +1108,7 @@ public class DcBaseOmsSku {
sb.append(", refundObj=").append(refundObj);
sb.append(", refundType=").append(refundType);
sb.append(", refundReferenceId=").append(refundReferenceId);
sb.append(", hasFbaS=").append(hasFbaS);
sb.append("]");
return sb.toString();
}
......@@ -1228,7 +1238,8 @@ public class DcBaseOmsSku {
&& (this.getBailunRefundStatus() == null ? other.getBailunRefundStatus() == null : this.getBailunRefundStatus().equals(other.getBailunRefundStatus()))
&& (this.getRefundObj() == null ? other.getRefundObj() == null : this.getRefundObj().equals(other.getRefundObj()))
&& (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType()))
&& (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()));
&& (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()))
&& (this.getHasFbaS() == null ? other.getHasFbaS() == null : this.getHasFbaS().equals(other.getHasFbaS()));
}
/**
......@@ -1349,6 +1360,7 @@ public class DcBaseOmsSku {
result = prime * result + ((getRefundObj() == null) ? 0 : getRefundObj().hashCode());
result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode());
result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
result = prime * result + ((getHasFbaS() == null) ? 0 : getHasFbaS().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsOrderExample.java
......@@ -6450,6 +6450,66 @@ public class DcBaseOmsOrderExample {
addCriterion("refund_reference_id not between", value1, value2, "refundReferenceId");
return (Criteria) this;
}
public Criteria andHasFbaSIsNull() {
addCriterion("has_fba_s is null");
return (Criteria) this;
}
public Criteria andHasFbaSIsNotNull() {
addCriterion("has_fba_s is not null");
return (Criteria) this;
}
public Criteria andHasFbaSEqualTo(Boolean value) {
addCriterion("has_fba_s =", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSNotEqualTo(Boolean value) {
addCriterion("has_fba_s <>", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSGreaterThan(Boolean value) {
addCriterion("has_fba_s >", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_fba_s >=", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSLessThan(Boolean value) {
addCriterion("has_fba_s <", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSLessThanOrEqualTo(Boolean value) {
addCriterion("has_fba_s <=", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSIn(List<Boolean> values) {
addCriterion("has_fba_s in", values, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSNotIn(List<Boolean> values) {
addCriterion("has_fba_s not in", values, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSBetween(Boolean value1, Boolean value2) {
addCriterion("has_fba_s between", value1, value2, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_fba_s not between", value1, value2, "hasFbaS");
return (Criteria) this;
}
}
/**
......
data-common/src/main/java/com/bailuntec/domain/example/DcBaseOmsSkuExample.java
......@@ -7350,6 +7350,66 @@ public class DcBaseOmsSkuExample {
addCriterion("refund_reference_id not between", value1, value2, "refundReferenceId");
return (Criteria) this;
}
public Criteria andHasFbaSIsNull() {
addCriterion("has_fba_s is null");
return (Criteria) this;
}
public Criteria andHasFbaSIsNotNull() {
addCriterion("has_fba_s is not null");
return (Criteria) this;
}
public Criteria andHasFbaSEqualTo(Boolean value) {
addCriterion("has_fba_s =", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSNotEqualTo(Boolean value) {
addCriterion("has_fba_s <>", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSGreaterThan(Boolean value) {
addCriterion("has_fba_s >", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSGreaterThanOrEqualTo(Boolean value) {
addCriterion("has_fba_s >=", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSLessThan(Boolean value) {
addCriterion("has_fba_s <", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSLessThanOrEqualTo(Boolean value) {
addCriterion("has_fba_s <=", value, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSIn(List<Boolean> values) {
addCriterion("has_fba_s in", values, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSNotIn(List<Boolean> values) {
addCriterion("has_fba_s not in", values, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSBetween(Boolean value1, Boolean value2) {
addCriterion("has_fba_s between", value1, value2, "hasFbaS");
return (Criteria) this;
}
public Criteria andHasFbaSNotBetween(Boolean value1, Boolean value2) {
addCriterion("has_fba_s not between", value1, value2, "hasFbaS");
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