Commit c646363e by wutong

新增对OMS退款字段的解析, 退款只存而不参与计算

parent 23624e9a
......@@ -327,4 +327,14 @@ public class OmsResult {
@JSONField(name = "tenantId")
private Integer companyId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.area_id
*
* @mbg.generated
*/
@JSONField(name = "refund")
private RefundInfo refundInfo;
}
package com.bailuntec.domain.pojo;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class RefundInfo {
private String refundStatus;
private Currency refundAmount;
@JSONField(name = "lastRefundTime")
private LocalDateTime refundTime;
@JSONField(name = "refundTo")
private String refundObj;
private String refundType;
@JSONField(name = "referenceID")
private String refundReferenceId;
}
......@@ -270,6 +270,8 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setRatioWeight(bailunSkuStructure.getSkuWeightRatio());
//总收入
BigDecimal skuAmountTotal = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountTotal()).setScale(3, RoundingMode.HALF_EVEN);
//退款
BigDecimal skuAmountRefund = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountRefund()).setScale(3, RoundingMode.HALF_EVEN);
//商品收入
BigDecimal skuAmountProduct = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountProduct()).setScale(3, RoundingMode.HALF_EVEN);
//礼品包装收入
......@@ -346,6 +348,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsSku.setCostPromotion(skuCostPromotion.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setAmountSales(skuAmountSales.subtract(skuCostPromotion).divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setAmountShipping(skuAmountShipping.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
dcBaseOmsSku.setAmountRefund(skuAmountRefund.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
//单个SKU的销售额
unitSkuAmountSalesRMB = skuAmountSalesRMB.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN);
//单个SKU的支出
......@@ -562,9 +565,8 @@ public class OrderSyncJob extends PointJob {
DcBaseOmsOrderMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class);
mapper.logicDeleteOmsSku(dcBaseOmsOrder);
mapper.logicDeleteOmsPick(dcBaseOmsOrder);
DcBaseCrmRefundMapper crmRefundMapper = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
crmRefundMapper.updateLinked(dcBaseOmsOrder.getOriginOrderId(), dcBaseOmsOrder.getBailunAccountId());
dcBaseOmsOrder.setAmountRefund(BigDecimal.ZERO);
// DcBaseCrmRefundMapper crmRefundMapper = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
// crmRefundMapper.updateLinked(dcBaseOmsOrder.getOriginOrderId(), dcBaseOmsOrder.getBailunAccountId());
} catch (Exception e) {
throw new RuntimeException("Mybatis操作DB失败", e);
} finally {
......@@ -907,6 +909,7 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setPayStatus(omsResult.getPayment().getPayStatus());
dcBaseOmsOrder.setCollectionAccount(omsResult.getPayment().getCollectionAccount());
}
dcBaseOmsOrder.setTransactionId(omsResult.getTransactionId());
dcBaseOmsOrder.setOriginOrderId(omsResult.getOriginOrderId());
dcBaseOmsOrder.setBailunOrderId(omsResult.getBailunOrderId());
......@@ -938,7 +941,17 @@ public class OrderSyncJob extends PointJob {
dcBaseOmsOrder.setCostHandlePlatform(BigDecimal.ZERO);
dcBaseOmsOrder.setCostTail(BigDecimal.ZERO);
dcBaseOmsOrder.setCostFirst(BigDecimal.ZERO);
dcBaseOmsOrder.setAmountRefund(BigDecimal.ZERO);
if (omsResult.getRefundInfo() !=null) {
dcBaseOmsOrder.setRefundTime(omsResult.getRefundInfo().getRefundTime());
dcBaseOmsOrder.setBailunRefundStatus(omsResult.getRefundInfo().getRefundStatus());
dcBaseOmsOrder.setRefundObj(omsResult.getRefundInfo().getRefundObj());
dcBaseOmsOrder.setRefundReferenceId(omsResult.getRefundInfo().getRefundReferenceId());
dcBaseOmsOrder.setRefundType(omsResult.getRefundInfo().getRefundType());
if (omsResult.getRefundInfo().getRefundAmount() != null) {
dcBaseOmsOrder.setAmountRefund(omsResult.getRefundInfo().getRefundAmount().getAmount() != null? omsResult.getRefundInfo().getRefundAmount().getAmount() : BigDecimal.ZERO);
}
}
}
/**
......@@ -1050,6 +1063,13 @@ public class OrderSyncJob extends PointJob {
//如果是 FBA订单1.检查FBA费用是否异常 2.
dcBaseOmsSku.setBailunSkuQuantityShipped(0);
dcBaseOmsSku.setBailunRefundStatus(dcBaseOmsOrder.getBailunRefundStatus());
dcBaseOmsSku.setRefundTime(dcBaseOmsOrder.getRefundTime());
dcBaseOmsSku.setRefundObj(dcBaseOmsOrder.getRefundObj());
dcBaseOmsSku.setRefundReferenceId(dcBaseOmsOrder.getRefundReferenceId());
dcBaseOmsSku.setAmountRefund(dcBaseOmsOrder.getAmountRefund());
dcBaseOmsSku.setRefundType(dcBaseOmsOrder.getRefundType());
}
/**
......
......@@ -34,6 +34,7 @@
<result column="bailun_merge_status" jdbcType="VARCHAR" property="bailunMergeStatus" />
<result column="bailun_interception_status" jdbcType="VARCHAR" property="bailunInterceptionStatus" />
<result column="bailun_shipping_status" jdbcType="VARCHAR" property="bailunShippingStatus" />
<result column="bailun_refund_status" jdbcType="VARCHAR" property="bailunRefundStatus" />
<result column="seller_order_exchange_rate" jdbcType="DECIMAL" property="sellerOrderExchangeRate" />
<result column="seller_other_exchange_rate" jdbcType="DECIMAL" property="sellerOtherExchangeRate" />
<result column="finance_order_exchange_rate" jdbcType="DECIMAL" property="financeOrderExchangeRate" />
......@@ -96,6 +97,9 @@
<result column="has_innersale" jdbcType="BIT" property="hasInnersale" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="profit_oms" jdbcType="DECIMAL" property="profitOms" />
<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" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -173,7 +177,7 @@
refund_time, seller_id, bailun_account_id, hq_account, seller_account, seller_order_id,
seller_email, order_update_time, bailun_order_id, platform_order_status, bailun_order_status,
bailun_payment_status, bailun_merge_status, bailun_interception_status, bailun_shipping_status,
seller_order_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate,
bailun_refund_status, seller_order_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate,
finance_other_exchange_rate, cny_to_usd_exchange_rate, order_to_usd_exchange_rate,
other_to_usd_exchange_rate, order_currency, other_currency, amount_sales, amount_total,
amount_shipping, amount_product, amount_tax, amount_adjustment, amount_gift_wrap,
......@@ -185,7 +189,7 @@
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
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......@@ -256,17 +260,17 @@
bailun_order_id, platform_order_status, bailun_order_status,
bailun_payment_status, bailun_merge_status,
bailun_interception_status, bailun_shipping_status,
seller_order_exchange_rate, seller_other_exchange_rate,
finance_order_exchange_rate, finance_other_exchange_rate,
cny_to_usd_exchange_rate, order_to_usd_exchange_rate,
other_to_usd_exchange_rate, order_currency,
other_currency, amount_sales, amount_total,
amount_shipping, amount_product, amount_tax,
amount_adjustment, amount_gift_wrap, amount_refund,
amount_prepaid, cost_total, cost_promotion,
cost_platform_fee, cost_product, cost_shipping,
cost_package, cost_fba_fee, cost_paypal_fee,
cost_refund_commisson, cost_handle_bailun,
bailun_refund_status, seller_order_exchange_rate,
seller_other_exchange_rate, finance_order_exchange_rate,
finance_other_exchange_rate, cny_to_usd_exchange_rate,
order_to_usd_exchange_rate, other_to_usd_exchange_rate,
order_currency, other_currency, amount_sales,
amount_total, amount_shipping, amount_product,
amount_tax, amount_adjustment, amount_gift_wrap,
amount_refund, amount_prepaid, cost_total,
cost_promotion, cost_platform_fee, cost_product,
cost_shipping, cost_package, cost_fba_fee,
cost_paypal_fee, cost_refund_commisson, cost_handle_bailun,
cost_handle_platform, cost_tail, cost_first,
cost_logistics, profit_total, profit_rate,
receipt_country, receipt_city, receipt_area,
......@@ -279,7 +283,8 @@
logistics_method_code, logistics_method_name,
bailun_picking_status, bailun_require_logistics,
has_scalp, has_innersale, company_id,
profit_oms)
profit_oms, refund_obj, refund_type,
refund_reference_id)
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},
......@@ -290,17 +295,17 @@
#{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR},
#{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunMergeStatus,jdbcType=VARCHAR},
#{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunShippingStatus,jdbcType=VARCHAR},
#{sellerOrderExchangeRate,jdbcType=DECIMAL}, #{sellerOtherExchangeRate,jdbcType=DECIMAL},
#{financeOrderExchangeRate,jdbcType=DECIMAL}, #{financeOtherExchangeRate,jdbcType=DECIMAL},
#{cnyToUsdExchangeRate,jdbcType=DECIMAL}, #{orderToUsdExchangeRate,jdbcType=DECIMAL},
#{otherToUsdExchangeRate,jdbcType=DECIMAL}, #{orderCurrency,jdbcType=VARCHAR},
#{otherCurrency,jdbcType=VARCHAR}, #{amountSales,jdbcType=DECIMAL}, #{amountTotal,jdbcType=DECIMAL},
#{amountShipping,jdbcType=DECIMAL}, #{amountProduct,jdbcType=DECIMAL}, #{amountTax,jdbcType=DECIMAL},
#{amountAdjustment,jdbcType=DECIMAL}, #{amountGiftWrap,jdbcType=DECIMAL}, #{amountRefund,jdbcType=DECIMAL},
#{amountPrepaid,jdbcType=DECIMAL}, #{costTotal,jdbcType=DECIMAL}, #{costPromotion,jdbcType=DECIMAL},
#{costPlatformFee,jdbcType=DECIMAL}, #{costProduct,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL},
#{costPackage,jdbcType=DECIMAL}, #{costFbaFee,jdbcType=DECIMAL}, #{costPaypalFee,jdbcType=DECIMAL},
#{costRefundCommisson,jdbcType=DECIMAL}, #{costHandleBailun,jdbcType=DECIMAL},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{sellerOrderExchangeRate,jdbcType=DECIMAL},
#{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{financeOrderExchangeRate,jdbcType=DECIMAL},
#{financeOtherExchangeRate,jdbcType=DECIMAL}, #{cnyToUsdExchangeRate,jdbcType=DECIMAL},
#{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{otherToUsdExchangeRate,jdbcType=DECIMAL},
#{orderCurrency,jdbcType=VARCHAR}, #{otherCurrency,jdbcType=VARCHAR}, #{amountSales,jdbcType=DECIMAL},
#{amountTotal,jdbcType=DECIMAL}, #{amountShipping,jdbcType=DECIMAL}, #{amountProduct,jdbcType=DECIMAL},
#{amountTax,jdbcType=DECIMAL}, #{amountAdjustment,jdbcType=DECIMAL}, #{amountGiftWrap,jdbcType=DECIMAL},
#{amountRefund,jdbcType=DECIMAL}, #{amountPrepaid,jdbcType=DECIMAL}, #{costTotal,jdbcType=DECIMAL},
#{costPromotion,jdbcType=DECIMAL}, #{costPlatformFee,jdbcType=DECIMAL}, #{costProduct,jdbcType=DECIMAL},
#{costShipping,jdbcType=DECIMAL}, #{costPackage,jdbcType=DECIMAL}, #{costFbaFee,jdbcType=DECIMAL},
#{costPaypalFee,jdbcType=DECIMAL}, #{costRefundCommisson,jdbcType=DECIMAL}, #{costHandleBailun,jdbcType=DECIMAL},
#{costHandlePlatform,jdbcType=DECIMAL}, #{costTail,jdbcType=DECIMAL}, #{costFirst,jdbcType=DECIMAL},
#{costLogistics,jdbcType=DECIMAL}, #{profitTotal,jdbcType=DECIMAL}, #{profitRate,jdbcType=DECIMAL},
#{receiptCountry,jdbcType=VARCHAR}, #{receiptCity,jdbcType=VARCHAR}, #{receiptArea,jdbcType=VARCHAR},
......@@ -313,7 +318,8 @@
#{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL})
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
<!--
......@@ -406,6 +412,9 @@
<if test="bailunShippingStatus != null">
bailun_shipping_status,
</if>
<if test="bailunRefundStatus != null">
bailun_refund_status,
</if>
<if test="sellerOrderExchangeRate != null">
seller_order_exchange_rate,
</if>
......@@ -592,6 +601,15 @@
<if test="profitOms != null">
profit_oms,
</if>
<if test="refundObj != null">
refund_obj,
</if>
<if test="refundType != null">
refund_type,
</if>
<if test="refundReferenceId != null">
refund_reference_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -678,6 +696,9 @@
<if test="bailunShippingStatus != null">
#{bailunShippingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRefundStatus != null">
#{bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="sellerOrderExchangeRate != null">
#{sellerOrderExchangeRate,jdbcType=DECIMAL},
</if>
......@@ -864,6 +885,15 @@
<if test="profitOms != null">
#{profitOms,jdbcType=DECIMAL},
</if>
<if test="refundObj != null">
#{refundObj,jdbcType=VARCHAR},
</if>
<if test="refundType != null">
#{refundType,jdbcType=VARCHAR},
</if>
<if test="refundReferenceId != null">
#{refundReferenceId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultType="java.lang.Long">
......@@ -967,6 +997,9 @@
<if test="record.bailunShippingStatus != null">
bailun_shipping_status = #{record.bailunShippingStatus,jdbcType=VARCHAR},
</if>
<if test="record.bailunRefundStatus != null">
bailun_refund_status = #{record.bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="record.sellerOrderExchangeRate != null">
seller_order_exchange_rate = #{record.sellerOrderExchangeRate,jdbcType=DECIMAL},
</if>
......@@ -1153,6 +1186,15 @@
<if test="record.profitOms != null">
profit_oms = #{record.profitOms,jdbcType=DECIMAL},
</if>
<if test="record.refundObj != null">
refund_obj = #{record.refundObj,jdbcType=VARCHAR},
</if>
<if test="record.refundType != null">
refund_type = #{record.refundType,jdbcType=VARCHAR},
</if>
<if test="record.refundReferenceId != null">
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1192,6 +1234,7 @@
bailun_merge_status = #{record.bailunMergeStatus,jdbcType=VARCHAR},
bailun_interception_status = #{record.bailunInterceptionStatus,jdbcType=VARCHAR},
bailun_shipping_status = #{record.bailunShippingStatus,jdbcType=VARCHAR},
bailun_refund_status = #{record.bailunRefundStatus,jdbcType=VARCHAR},
seller_order_exchange_rate = #{record.sellerOrderExchangeRate,jdbcType=DECIMAL},
seller_other_exchange_rate = #{record.sellerOtherExchangeRate,jdbcType=DECIMAL},
finance_order_exchange_rate = #{record.financeOrderExchangeRate,jdbcType=DECIMAL},
......@@ -1253,7 +1296,10 @@
has_scalp = #{record.hasScalp,jdbcType=BIT},
has_innersale = #{record.hasInnersale,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER},
profit_oms = #{record.profitOms,jdbcType=DECIMAL}
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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1346,6 +1392,9 @@
<if test="bailunShippingStatus != null">
bailun_shipping_status = #{bailunShippingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRefundStatus != null">
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="sellerOrderExchangeRate != null">
seller_order_exchange_rate = #{sellerOrderExchangeRate,jdbcType=DECIMAL},
</if>
......@@ -1532,6 +1581,15 @@
<if test="profitOms != null">
profit_oms = #{profitOms,jdbcType=DECIMAL},
</if>
<if test="refundObj != null">
refund_obj = #{refundObj,jdbcType=VARCHAR},
</if>
<if test="refundType != null">
refund_type = #{refundType,jdbcType=VARCHAR},
</if>
<if test="refundReferenceId != null">
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1568,6 +1626,7 @@
bailun_merge_status = #{bailunMergeStatus,jdbcType=VARCHAR},
bailun_interception_status = #{bailunInterceptionStatus,jdbcType=VARCHAR},
bailun_shipping_status = #{bailunShippingStatus,jdbcType=VARCHAR},
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
seller_order_exchange_rate = #{sellerOrderExchangeRate,jdbcType=DECIMAL},
seller_other_exchange_rate = #{sellerOtherExchangeRate,jdbcType=DECIMAL},
finance_order_exchange_rate = #{financeOrderExchangeRate,jdbcType=DECIMAL},
......@@ -1629,7 +1688,10 @@
has_scalp = #{hasScalp,jdbcType=BIT},
has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER},
profit_oms = #{profitOms,jdbcType=DECIMAL}
profit_oms = #{profitOms,jdbcType=DECIMAL},
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
......@@ -1724,6 +1786,9 @@
<if test="bailunShippingStatus != null">
bailun_shipping_status,
</if>
<if test="bailunRefundStatus != null">
bailun_refund_status,
</if>
<if test="sellerOrderExchangeRate != null">
seller_order_exchange_rate,
</if>
......@@ -1910,6 +1975,15 @@
<if test="profitOms != null">
profit_oms,
</if>
<if test="refundObj != null">
refund_obj,
</if>
<if test="refundType != null">
refund_type,
</if>
<if test="refundReferenceId != null">
refund_reference_id,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -1997,6 +2071,9 @@
<if test="bailunShippingStatus != null">
#{bailunShippingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRefundStatus != null">
#{bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="sellerOrderExchangeRate != null">
#{sellerOrderExchangeRate,jdbcType=DECIMAL},
</if>
......@@ -2183,6 +2260,15 @@
<if test="profitOms != null">
#{profitOms,jdbcType=DECIMAL},
</if>
<if test="refundObj != null">
#{refundObj,jdbcType=VARCHAR},
</if>
<if test="refundType != null">
#{refundType,jdbcType=VARCHAR},
</if>
<if test="refundReferenceId != null">
#{refundReferenceId,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2270,6 +2356,9 @@
<if test="bailunShippingStatus != null">
bailun_shipping_status = #{bailunShippingStatus,jdbcType=VARCHAR},
</if>
<if test="bailunRefundStatus != null">
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="sellerOrderExchangeRate != null">
seller_order_exchange_rate = #{sellerOrderExchangeRate,jdbcType=DECIMAL},
</if>
......@@ -2456,6 +2545,15 @@
<if test="profitOms != null">
profit_oms = #{profitOms,jdbcType=DECIMAL},
</if>
<if test="refundObj != null">
refund_obj = #{refundObj,jdbcType=VARCHAR},
</if>
<if test="refundType != null">
refund_type = #{refundType,jdbcType=VARCHAR},
</if>
<if test="refundReferenceId != null">
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrder">
......@@ -2470,7 +2568,7 @@
refund_time, seller_id, bailun_account_id, hq_account, seller_account, seller_order_id,
seller_email, order_update_time, bailun_order_id, platform_order_status, bailun_order_status,
bailun_payment_status, bailun_merge_status, bailun_interception_status, bailun_shipping_status,
seller_order_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate,
bailun_refund_status, seller_order_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate,
finance_other_exchange_rate, cny_to_usd_exchange_rate, order_to_usd_exchange_rate,
other_to_usd_exchange_rate, order_currency, other_currency, amount_sales, amount_total,
amount_shipping, amount_product, amount_tax, amount_adjustment, amount_gift_wrap,
......@@ -2482,7 +2580,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)
has_scalp, has_innersale, company_id, profit_oms, refund_obj, refund_type, refund_reference_id
)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2494,17 +2593,17 @@
#{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR},
#{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunMergeStatus,jdbcType=VARCHAR},
#{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunShippingStatus,jdbcType=VARCHAR},
#{sellerOrderExchangeRate,jdbcType=DECIMAL}, #{sellerOtherExchangeRate,jdbcType=DECIMAL},
#{financeOrderExchangeRate,jdbcType=DECIMAL}, #{financeOtherExchangeRate,jdbcType=DECIMAL},
#{cnyToUsdExchangeRate,jdbcType=DECIMAL}, #{orderToUsdExchangeRate,jdbcType=DECIMAL},
#{otherToUsdExchangeRate,jdbcType=DECIMAL}, #{orderCurrency,jdbcType=VARCHAR},
#{otherCurrency,jdbcType=VARCHAR}, #{amountSales,jdbcType=DECIMAL}, #{amountTotal,jdbcType=DECIMAL},
#{amountShipping,jdbcType=DECIMAL}, #{amountProduct,jdbcType=DECIMAL}, #{amountTax,jdbcType=DECIMAL},
#{amountAdjustment,jdbcType=DECIMAL}, #{amountGiftWrap,jdbcType=DECIMAL}, #{amountRefund,jdbcType=DECIMAL},
#{amountPrepaid,jdbcType=DECIMAL}, #{costTotal,jdbcType=DECIMAL}, #{costPromotion,jdbcType=DECIMAL},
#{costPlatformFee,jdbcType=DECIMAL}, #{costProduct,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL},
#{costPackage,jdbcType=DECIMAL}, #{costFbaFee,jdbcType=DECIMAL}, #{costPaypalFee,jdbcType=DECIMAL},
#{costRefundCommisson,jdbcType=DECIMAL}, #{costHandleBailun,jdbcType=DECIMAL},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{sellerOrderExchangeRate,jdbcType=DECIMAL},
#{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{financeOrderExchangeRate,jdbcType=DECIMAL},
#{financeOtherExchangeRate,jdbcType=DECIMAL}, #{cnyToUsdExchangeRate,jdbcType=DECIMAL},
#{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{otherToUsdExchangeRate,jdbcType=DECIMAL},
#{orderCurrency,jdbcType=VARCHAR}, #{otherCurrency,jdbcType=VARCHAR}, #{amountSales,jdbcType=DECIMAL},
#{amountTotal,jdbcType=DECIMAL}, #{amountShipping,jdbcType=DECIMAL}, #{amountProduct,jdbcType=DECIMAL},
#{amountTax,jdbcType=DECIMAL}, #{amountAdjustment,jdbcType=DECIMAL}, #{amountGiftWrap,jdbcType=DECIMAL},
#{amountRefund,jdbcType=DECIMAL}, #{amountPrepaid,jdbcType=DECIMAL}, #{costTotal,jdbcType=DECIMAL},
#{costPromotion,jdbcType=DECIMAL}, #{costPlatformFee,jdbcType=DECIMAL}, #{costProduct,jdbcType=DECIMAL},
#{costShipping,jdbcType=DECIMAL}, #{costPackage,jdbcType=DECIMAL}, #{costFbaFee,jdbcType=DECIMAL},
#{costPaypalFee,jdbcType=DECIMAL}, #{costRefundCommisson,jdbcType=DECIMAL}, #{costHandleBailun,jdbcType=DECIMAL},
#{costHandlePlatform,jdbcType=DECIMAL}, #{costTail,jdbcType=DECIMAL}, #{costFirst,jdbcType=DECIMAL},
#{costLogistics,jdbcType=DECIMAL}, #{profitTotal,jdbcType=DECIMAL}, #{profitRate,jdbcType=DECIMAL},
#{receiptCountry,jdbcType=VARCHAR}, #{receiptCity,jdbcType=VARCHAR}, #{receiptArea,jdbcType=VARCHAR},
......@@ -2517,7 +2616,8 @@
#{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasScalp,jdbcType=BIT}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{profitOms,jdbcType=DECIMAL})
#{profitOms,jdbcType=DECIMAL}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -2547,6 +2647,7 @@
bailun_merge_status = #{bailunMergeStatus,jdbcType=VARCHAR},
bailun_interception_status = #{bailunInterceptionStatus,jdbcType=VARCHAR},
bailun_shipping_status = #{bailunShippingStatus,jdbcType=VARCHAR},
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
seller_order_exchange_rate = #{sellerOrderExchangeRate,jdbcType=DECIMAL},
seller_other_exchange_rate = #{sellerOtherExchangeRate,jdbcType=DECIMAL},
finance_order_exchange_rate = #{financeOrderExchangeRate,jdbcType=DECIMAL},
......@@ -2608,7 +2709,10 @@
has_scalp = #{hasScalp,jdbcType=BIT},
has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER},
profit_oms = #{profitOms,jdbcType=DECIMAL}
profit_oms = #{profitOms,jdbcType=DECIMAL},
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsOrderExample" resultMap="BaseResultMap">
<!--
......@@ -2628,7 +2732,6 @@
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>
......
......@@ -110,6 +110,10 @@
<result column="logistics_method_name" jdbcType="VARCHAR" property="logisticsMethodName" />
<result column="has_innersale" jdbcType="BIT" property="hasInnersale" />
<result column="company_id" jdbcType="INTEGER" property="companyId" />
<result column="bailun_refund_status" jdbcType="VARCHAR" property="bailunRefundStatus" />
<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" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
......@@ -201,7 +205,8 @@
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_exception,
has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete,
has_scalp, logistics_method_code, logistics_method_name, has_innersale, company_id
has_scalp, logistics_method_code, logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type, refund_reference_id
</sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......@@ -299,8 +304,9 @@
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
)
logistics_method_name, has_innersale, company_id,
bailun_refund_status, refund_obj, refund_type,
refund_reference_id)
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},
......@@ -338,8 +344,9 @@
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
)
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
<!--
......@@ -660,6 +667,18 @@
<if test="companyId != null">
company_id,
</if>
<if test="bailunRefundStatus != null">
bailun_refund_status,
</if>
<if test="refundObj != null">
refund_obj,
</if>
<if test="refundType != null">
refund_type,
</if>
<if test="refundReferenceId != null">
refund_reference_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
......@@ -974,6 +993,18 @@
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
<if test="bailunRefundStatus != null">
#{bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="refundObj != null">
#{refundObj,jdbcType=VARCHAR},
</if>
<if test="refundType != null">
#{refundType,jdbcType=VARCHAR},
</if>
<if test="refundReferenceId != null">
#{refundReferenceId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultType="java.lang.Long">
......@@ -1305,6 +1336,18 @@
<if test="record.companyId != null">
company_id = #{record.companyId,jdbcType=INTEGER},
</if>
<if test="record.bailunRefundStatus != null">
bailun_refund_status = #{record.bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="record.refundObj != null">
refund_obj = #{record.refundObj,jdbcType=VARCHAR},
</if>
<if test="record.refundType != null">
refund_type = #{record.refundType,jdbcType=VARCHAR},
</if>
<if test="record.refundReferenceId != null">
refund_reference_id = #{record.refundReferenceId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -1419,7 +1462,11 @@
logistics_method_code = #{record.logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{record.logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{record.hasInnersale,jdbcType=BIT},
company_id = #{record.companyId,jdbcType=INTEGER}
company_id = #{record.companyId,jdbcType=INTEGER},
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}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1740,6 +1787,18 @@
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
<if test="bailunRefundStatus != null">
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="refundObj != null">
refund_obj = #{refundObj,jdbcType=VARCHAR},
</if>
<if test="refundType != null">
refund_type = #{refundType,jdbcType=VARCHAR},
</if>
<if test="refundReferenceId != null">
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -1851,7 +1910,11 @@
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
company_id = #{companyId,jdbcType=INTEGER},
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<insert id="upsertSelective" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2174,6 +2237,18 @@
<if test="companyId != null">
company_id,
</if>
<if test="bailunRefundStatus != null">
bailun_refund_status,
</if>
<if test="refundObj != null">
refund_obj,
</if>
<if test="refundType != null">
refund_type,
</if>
<if test="refundReferenceId != null">
refund_reference_id,
</if>
</trim>
values
<trim prefix="(" suffix=")" suffixOverrides=",">
......@@ -2489,6 +2564,18 @@
<if test="companyId != null">
#{companyId,jdbcType=INTEGER},
</if>
<if test="bailunRefundStatus != null">
#{bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="refundObj != null">
#{refundObj,jdbcType=VARCHAR},
</if>
<if test="refundType != null">
#{refundType,jdbcType=VARCHAR},
</if>
<if test="refundReferenceId != null">
#{refundReferenceId,jdbcType=VARCHAR},
</if>
</trim>
on duplicate key update
<trim suffixOverrides=",">
......@@ -2804,6 +2891,18 @@
<if test="companyId != null">
company_id = #{companyId,jdbcType=INTEGER},
</if>
<if test="bailunRefundStatus != null">
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
</if>
<if test="refundObj != null">
refund_obj = #{refundObj,jdbcType=VARCHAR},
</if>
<if test="refundType != null">
refund_type = #{refundType,jdbcType=VARCHAR},
</if>
<if test="refundReferenceId != null">
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<insert id="upsert" parameterType="com.bailuntec.domain.entity.DcBaseOmsSku">
......@@ -2833,7 +2932,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)
has_innersale, company_id, bailun_refund_status, refund_obj, refund_type, refund_reference_id
)
values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
......@@ -2872,8 +2972,9 @@
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR},
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}
)
#{logisticsMethodName,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER},
#{bailunRefundStatus,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR},
#{refundReferenceId,jdbcType=VARCHAR})
on duplicate key update
id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR},
......@@ -2978,7 +3079,11 @@
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}
company_id = #{companyId,jdbcType=INTEGER},
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,jdbcType=VARCHAR},
refund_reference_id = #{refundReferenceId,jdbcType=VARCHAR}
</insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
<!--
......
......@@ -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", "402-2410782-3862701");
map.put("OriginOrderNo", "123761401225-2120745544002");
Request request = new Request.Builder()
.get()
.url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))
......
......@@ -262,6 +262,15 @@ public class DcBaseOmsOrder {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.bailun_refund_status
*
* @mbg.generated
*/
private String bailunRefundStatus;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.seller_order_exchange_rate
*
* @mbg.generated
......@@ -818,6 +827,33 @@ public class DcBaseOmsOrder {
private BigDecimal profitOms;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.refund_obj
*
* @mbg.generated
*/
private String refundObj;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.refund_type
*
* @mbg.generated
*/
private String refundType;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_order.refund_reference_id
*
* @mbg.generated
*/
private String refundReferenceId;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_order
*
......@@ -857,6 +893,7 @@ public class DcBaseOmsOrder {
sb.append(", bailunMergeStatus=").append(bailunMergeStatus);
sb.append(", bailunInterceptionStatus=").append(bailunInterceptionStatus);
sb.append(", bailunShippingStatus=").append(bailunShippingStatus);
sb.append(", bailunRefundStatus=").append(bailunRefundStatus);
sb.append(", sellerOrderExchangeRate=").append(sellerOrderExchangeRate);
sb.append(", sellerOtherExchangeRate=").append(sellerOtherExchangeRate);
sb.append(", financeOrderExchangeRate=").append(financeOrderExchangeRate);
......@@ -919,6 +956,9 @@ public class DcBaseOmsOrder {
sb.append(", hasInnersale=").append(hasInnersale);
sb.append(", companyId=").append(companyId);
sb.append(", profitOms=").append(profitOms);
sb.append(", refundObj=").append(refundObj);
sb.append(", refundType=").append(refundType);
sb.append(", refundReferenceId=").append(refundReferenceId);
sb.append("]");
return sb.toString();
}
......@@ -969,6 +1009,7 @@ public class DcBaseOmsOrder {
&& (this.getBailunMergeStatus() == null ? other.getBailunMergeStatus() == null : this.getBailunMergeStatus().equals(other.getBailunMergeStatus()))
&& (this.getBailunInterceptionStatus() == null ? other.getBailunInterceptionStatus() == null : this.getBailunInterceptionStatus().equals(other.getBailunInterceptionStatus()))
&& (this.getBailunShippingStatus() == null ? other.getBailunShippingStatus() == null : this.getBailunShippingStatus().equals(other.getBailunShippingStatus()))
&& (this.getBailunRefundStatus() == null ? other.getBailunRefundStatus() == null : this.getBailunRefundStatus().equals(other.getBailunRefundStatus()))
&& (this.getSellerOrderExchangeRate() == null ? other.getSellerOrderExchangeRate() == null : this.getSellerOrderExchangeRate().equals(other.getSellerOrderExchangeRate()))
&& (this.getSellerOtherExchangeRate() == null ? other.getSellerOtherExchangeRate() == null : this.getSellerOtherExchangeRate().equals(other.getSellerOtherExchangeRate()))
&& (this.getFinanceOrderExchangeRate() == null ? other.getFinanceOrderExchangeRate() == null : this.getFinanceOrderExchangeRate().equals(other.getFinanceOrderExchangeRate()))
......@@ -1030,7 +1071,10 @@ public class DcBaseOmsOrder {
&& (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
&& (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (this.getProfitOms() == null ? other.getProfitOms() == null : this.getProfitOms().equals(other.getProfitOms()));
&& (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()));
}
/**
......@@ -1071,6 +1115,7 @@ public class DcBaseOmsOrder {
result = prime * result + ((getBailunMergeStatus() == null) ? 0 : getBailunMergeStatus().hashCode());
result = prime * result + ((getBailunInterceptionStatus() == null) ? 0 : getBailunInterceptionStatus().hashCode());
result = prime * result + ((getBailunShippingStatus() == null) ? 0 : getBailunShippingStatus().hashCode());
result = prime * result + ((getBailunRefundStatus() == null) ? 0 : getBailunRefundStatus().hashCode());
result = prime * result + ((getSellerOrderExchangeRate() == null) ? 0 : getSellerOrderExchangeRate().hashCode());
result = prime * result + ((getSellerOtherExchangeRate() == null) ? 0 : getSellerOtherExchangeRate().hashCode());
result = prime * result + ((getFinanceOrderExchangeRate() == null) ? 0 : getFinanceOrderExchangeRate().hashCode());
......@@ -1133,6 +1178,9 @@ public class DcBaseOmsOrder {
result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getProfitOms() == null) ? 0 : getProfitOms().hashCode());
result = prime * result + ((getRefundObj() == null) ? 0 : getRefundObj().hashCode());
result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode());
result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
return result;
}
}
\ No newline at end of file
......@@ -944,6 +944,42 @@ public class DcBaseOmsSku {
private Integer companyId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.bailun_refund_status
*
* @mbg.generated
*/
private String bailunRefundStatus;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.refund_obj
*
* @mbg.generated
*/
private String refundObj;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.refund_type
*
* @mbg.generated
*/
private String refundType;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_base_oms_sku.refund_reference_id
*
* @mbg.generated
*/
private String refundReferenceId;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_base_oms_sku
*
......@@ -1059,6 +1095,10 @@ public class DcBaseOmsSku {
sb.append(", logisticsMethodName=").append(logisticsMethodName);
sb.append(", hasInnersale=").append(hasInnersale);
sb.append(", companyId=").append(companyId);
sb.append(", bailunRefundStatus=").append(bailunRefundStatus);
sb.append(", refundObj=").append(refundObj);
sb.append(", refundType=").append(refundType);
sb.append(", refundReferenceId=").append(refundReferenceId);
sb.append("]");
return sb.toString();
}
......@@ -1184,7 +1224,11 @@ public class DcBaseOmsSku {
&& (this.getLogisticsMethodCode() == null ? other.getLogisticsMethodCode() == null : this.getLogisticsMethodCode().equals(other.getLogisticsMethodCode()))
&& (this.getLogisticsMethodName() == null ? other.getLogisticsMethodName() == null : this.getLogisticsMethodName().equals(other.getLogisticsMethodName()))
&& (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
&& (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
&& (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()));
}
/**
......@@ -1301,6 +1345,10 @@ public class DcBaseOmsSku {
result = prime * result + ((getLogisticsMethodName() == null) ? 0 : getLogisticsMethodName().hashCode());
result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
result = prime * result + ((getBailunRefundStatus() == null) ? 0 : getBailunRefundStatus().hashCode());
result = prime * result + ((getRefundObj() == null) ? 0 : getRefundObj().hashCode());
result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode());
result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
return result;
}
}
\ No newline at end of file
......@@ -2261,6 +2261,76 @@ public class DcBaseOmsOrderExample {
return (Criteria) this;
}
public Criteria andBailunRefundStatusIsNull() {
addCriterion("bailun_refund_status is null");
return (Criteria) this;
}
public Criteria andBailunRefundStatusIsNotNull() {
addCriterion("bailun_refund_status is not null");
return (Criteria) this;
}
public Criteria andBailunRefundStatusEqualTo(String value) {
addCriterion("bailun_refund_status =", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusNotEqualTo(String value) {
addCriterion("bailun_refund_status <>", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusGreaterThan(String value) {
addCriterion("bailun_refund_status >", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusGreaterThanOrEqualTo(String value) {
addCriterion("bailun_refund_status >=", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusLessThan(String value) {
addCriterion("bailun_refund_status <", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusLessThanOrEqualTo(String value) {
addCriterion("bailun_refund_status <=", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusLike(String value) {
addCriterion("bailun_refund_status like", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusNotLike(String value) {
addCriterion("bailun_refund_status not like", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusIn(List<String> values) {
addCriterion("bailun_refund_status in", values, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusNotIn(List<String> values) {
addCriterion("bailun_refund_status not in", values, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusBetween(String value1, String value2) {
addCriterion("bailun_refund_status between", value1, value2, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusNotBetween(String value1, String value2) {
addCriterion("bailun_refund_status not between", value1, value2, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andSellerOrderExchangeRateIsNull() {
addCriterion("seller_order_exchange_rate is null");
return (Criteria) this;
......@@ -6170,6 +6240,216 @@ public class DcBaseOmsOrderExample {
addCriterion("profit_oms not between", value1, value2, "profitOms");
return (Criteria) this;
}
public Criteria andRefundObjIsNull() {
addCriterion("refund_obj is null");
return (Criteria) this;
}
public Criteria andRefundObjIsNotNull() {
addCriterion("refund_obj is not null");
return (Criteria) this;
}
public Criteria andRefundObjEqualTo(String value) {
addCriterion("refund_obj =", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjNotEqualTo(String value) {
addCriterion("refund_obj <>", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjGreaterThan(String value) {
addCriterion("refund_obj >", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjGreaterThanOrEqualTo(String value) {
addCriterion("refund_obj >=", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjLessThan(String value) {
addCriterion("refund_obj <", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjLessThanOrEqualTo(String value) {
addCriterion("refund_obj <=", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjLike(String value) {
addCriterion("refund_obj like", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjNotLike(String value) {
addCriterion("refund_obj not like", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjIn(List<String> values) {
addCriterion("refund_obj in", values, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjNotIn(List<String> values) {
addCriterion("refund_obj not in", values, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjBetween(String value1, String value2) {
addCriterion("refund_obj between", value1, value2, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjNotBetween(String value1, String value2) {
addCriterion("refund_obj not between", value1, value2, "refundObj");
return (Criteria) this;
}
public Criteria andRefundTypeIsNull() {
addCriterion("refund_type is null");
return (Criteria) this;
}
public Criteria andRefundTypeIsNotNull() {
addCriterion("refund_type is not null");
return (Criteria) this;
}
public Criteria andRefundTypeEqualTo(String value) {
addCriterion("refund_type =", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeNotEqualTo(String value) {
addCriterion("refund_type <>", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeGreaterThan(String value) {
addCriterion("refund_type >", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeGreaterThanOrEqualTo(String value) {
addCriterion("refund_type >=", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeLessThan(String value) {
addCriterion("refund_type <", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeLessThanOrEqualTo(String value) {
addCriterion("refund_type <=", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeLike(String value) {
addCriterion("refund_type like", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeNotLike(String value) {
addCriterion("refund_type not like", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeIn(List<String> values) {
addCriterion("refund_type in", values, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeNotIn(List<String> values) {
addCriterion("refund_type not in", values, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeBetween(String value1, String value2) {
addCriterion("refund_type between", value1, value2, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeNotBetween(String value1, String value2) {
addCriterion("refund_type not between", value1, value2, "refundType");
return (Criteria) this;
}
public Criteria andRefundReferenceIdIsNull() {
addCriterion("refund_reference_id is null");
return (Criteria) this;
}
public Criteria andRefundReferenceIdIsNotNull() {
addCriterion("refund_reference_id is not null");
return (Criteria) this;
}
public Criteria andRefundReferenceIdEqualTo(String value) {
addCriterion("refund_reference_id =", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdNotEqualTo(String value) {
addCriterion("refund_reference_id <>", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdGreaterThan(String value) {
addCriterion("refund_reference_id >", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdGreaterThanOrEqualTo(String value) {
addCriterion("refund_reference_id >=", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdLessThan(String value) {
addCriterion("refund_reference_id <", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdLessThanOrEqualTo(String value) {
addCriterion("refund_reference_id <=", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdLike(String value) {
addCriterion("refund_reference_id like", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdNotLike(String value) {
addCriterion("refund_reference_id not like", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdIn(List<String> values) {
addCriterion("refund_reference_id in", values, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdNotIn(List<String> values) {
addCriterion("refund_reference_id not in", values, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdBetween(String value1, String value2) {
addCriterion("refund_reference_id between", value1, value2, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdNotBetween(String value1, String value2) {
addCriterion("refund_reference_id not between", value1, value2, "refundReferenceId");
return (Criteria) this;
}
}
/**
......
......@@ -7070,6 +7070,286 @@ public class DcBaseOmsSkuExample {
addCriterion("company_id not between", value1, value2, "companyId");
return (Criteria) this;
}
public Criteria andBailunRefundStatusIsNull() {
addCriterion("bailun_refund_status is null");
return (Criteria) this;
}
public Criteria andBailunRefundStatusIsNotNull() {
addCriterion("bailun_refund_status is not null");
return (Criteria) this;
}
public Criteria andBailunRefundStatusEqualTo(String value) {
addCriterion("bailun_refund_status =", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusNotEqualTo(String value) {
addCriterion("bailun_refund_status <>", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusGreaterThan(String value) {
addCriterion("bailun_refund_status >", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusGreaterThanOrEqualTo(String value) {
addCriterion("bailun_refund_status >=", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusLessThan(String value) {
addCriterion("bailun_refund_status <", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusLessThanOrEqualTo(String value) {
addCriterion("bailun_refund_status <=", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusLike(String value) {
addCriterion("bailun_refund_status like", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusNotLike(String value) {
addCriterion("bailun_refund_status not like", value, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusIn(List<String> values) {
addCriterion("bailun_refund_status in", values, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusNotIn(List<String> values) {
addCriterion("bailun_refund_status not in", values, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusBetween(String value1, String value2) {
addCriterion("bailun_refund_status between", value1, value2, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andBailunRefundStatusNotBetween(String value1, String value2) {
addCriterion("bailun_refund_status not between", value1, value2, "bailunRefundStatus");
return (Criteria) this;
}
public Criteria andRefundObjIsNull() {
addCriterion("refund_obj is null");
return (Criteria) this;
}
public Criteria andRefundObjIsNotNull() {
addCriterion("refund_obj is not null");
return (Criteria) this;
}
public Criteria andRefundObjEqualTo(String value) {
addCriterion("refund_obj =", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjNotEqualTo(String value) {
addCriterion("refund_obj <>", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjGreaterThan(String value) {
addCriterion("refund_obj >", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjGreaterThanOrEqualTo(String value) {
addCriterion("refund_obj >=", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjLessThan(String value) {
addCriterion("refund_obj <", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjLessThanOrEqualTo(String value) {
addCriterion("refund_obj <=", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjLike(String value) {
addCriterion("refund_obj like", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjNotLike(String value) {
addCriterion("refund_obj not like", value, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjIn(List<String> values) {
addCriterion("refund_obj in", values, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjNotIn(List<String> values) {
addCriterion("refund_obj not in", values, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjBetween(String value1, String value2) {
addCriterion("refund_obj between", value1, value2, "refundObj");
return (Criteria) this;
}
public Criteria andRefundObjNotBetween(String value1, String value2) {
addCriterion("refund_obj not between", value1, value2, "refundObj");
return (Criteria) this;
}
public Criteria andRefundTypeIsNull() {
addCriterion("refund_type is null");
return (Criteria) this;
}
public Criteria andRefundTypeIsNotNull() {
addCriterion("refund_type is not null");
return (Criteria) this;
}
public Criteria andRefundTypeEqualTo(String value) {
addCriterion("refund_type =", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeNotEqualTo(String value) {
addCriterion("refund_type <>", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeGreaterThan(String value) {
addCriterion("refund_type >", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeGreaterThanOrEqualTo(String value) {
addCriterion("refund_type >=", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeLessThan(String value) {
addCriterion("refund_type <", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeLessThanOrEqualTo(String value) {
addCriterion("refund_type <=", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeLike(String value) {
addCriterion("refund_type like", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeNotLike(String value) {
addCriterion("refund_type not like", value, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeIn(List<String> values) {
addCriterion("refund_type in", values, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeNotIn(List<String> values) {
addCriterion("refund_type not in", values, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeBetween(String value1, String value2) {
addCriterion("refund_type between", value1, value2, "refundType");
return (Criteria) this;
}
public Criteria andRefundTypeNotBetween(String value1, String value2) {
addCriterion("refund_type not between", value1, value2, "refundType");
return (Criteria) this;
}
public Criteria andRefundReferenceIdIsNull() {
addCriterion("refund_reference_id is null");
return (Criteria) this;
}
public Criteria andRefundReferenceIdIsNotNull() {
addCriterion("refund_reference_id is not null");
return (Criteria) this;
}
public Criteria andRefundReferenceIdEqualTo(String value) {
addCriterion("refund_reference_id =", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdNotEqualTo(String value) {
addCriterion("refund_reference_id <>", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdGreaterThan(String value) {
addCriterion("refund_reference_id >", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdGreaterThanOrEqualTo(String value) {
addCriterion("refund_reference_id >=", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdLessThan(String value) {
addCriterion("refund_reference_id <", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdLessThanOrEqualTo(String value) {
addCriterion("refund_reference_id <=", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdLike(String value) {
addCriterion("refund_reference_id like", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdNotLike(String value) {
addCriterion("refund_reference_id not like", value, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdIn(List<String> values) {
addCriterion("refund_reference_id in", values, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdNotIn(List<String> values) {
addCriterion("refund_reference_id not in", values, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdBetween(String value1, String value2) {
addCriterion("refund_reference_id between", value1, value2, "refundReferenceId");
return (Criteria) this;
}
public Criteria andRefundReferenceIdNotBetween(String value1, String value2) {
addCriterion("refund_reference_id not between", value1, value2, "refundReferenceId");
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