Skip to content

D
dc-java
Commit c4f7b0be by huluobin
Options

黑五

parent 69731924
Showing with 351 additions and 323 deletions
data-base/base-sync-finance-ebay/src/main/java/com/bailuntec/job/EbayFinanceAdSyncJob.java
...@@ -53,7 +53,7 @@ public class EbayFinanceAdSyncJob extends PointJob { ...@@ -53,7 +53,7 @@ public class EbayFinanceAdSyncJob extends PointJob {
if (startTime.toLocalDate().compareTo(LocalDate.now()) < 0) { if (startTime.toLocalDate().compareTo(LocalDate.now()) < 0) {
listByPage.parallelStream().forEach(jobAccountLog -> { listByPage.forEach(jobAccountLog -> {
//先删除再更新 //先删除再更新
dcBaseFinanceEbayMapper.deleteByExample(DcBaseFinanceEbayExample.newAndCreateCriteria() dcBaseFinanceEbayMapper.deleteByExample(DcBaseFinanceEbayExample.newAndCreateCriteria()
.andBjDateBetween(startTime, endTime) .andBjDateBetween(startTime, endTime)
......
data-base/base-sync-finance-ebay/src/test/java/com/bailuntec/job/EbayFinanceAdSyncJobTest.java
...@@ -84,15 +84,37 @@ public class EbayFinanceAdSyncJobTest { ...@@ -84,15 +84,37 @@ public class EbayFinanceAdSyncJobTest {
public void testThreadPool() { public void testThreadPool() {
EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob(); EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
LocalDateTime start = LocalDateTime.of(2020, 11, 17, 0, 0); LocalDateTime start = LocalDateTime.of(2020, 11, 18, 0, 0);
LocalDateTime end = LocalDateTime.of(2020, 11, 19, 0, 0); LocalDateTime end = LocalDateTime.of(2020, 12, 2, 0, 0);
List<LocalDateTime> localDateTimeList = Stream.iterate(start, List<LocalDateTime> localDateTimeList = Stream.iterate(start,
localDateTime -> localDateTime.plusDays(1)) localDateTime -> localDateTime.plusDays(1))
.limit(ChronoUnit.DAYS.between(start, end) + 1) .limit(ChronoUnit.DAYS.between(start, end) + 1)
.collect(Collectors.toList()); .collect(Collectors.toList());
localDateTimeList.parallelStream().forEach(localDateTime -> { localDateTimeList.forEach(localDateTime -> {
JobPointLog jobPointLog = new JobPointLog();
jobPointLog.setStartTime(localDateTime);
jobPointLog.setEndTime(localDateTime.plusDays(1));
ebayFinanceAdSyncJob.executeJob(null, jobPointLog);
});
}
@Test
public void testThreadPool2() {
EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
LocalDateTime start = LocalDateTime.of(2020, 11, 25, 0, 0);
LocalDateTime end = LocalDateTime.of(2020, 12, 2, 0, 0);
List<LocalDateTime> localDateTimeList = Stream.iterate(start,
localDateTime -> localDateTime.plusDays(1))
.limit(ChronoUnit.DAYS.between(start, end) + 1)
.collect(Collectors.toList());
localDateTimeList.forEach(localDateTime -> {
JobPointLog jobPointLog = new JobPointLog(); JobPointLog jobPointLog = new JobPointLog();
jobPointLog.setStartTime(localDateTime); jobPointLog.setStartTime(localDateTime);
jobPointLog.setEndTime(localDateTime.plusDays(1)); jobPointLog.setEndTime(localDateTime.plusDays(1));
......
data-common/src/main/java/com/bailuntec/mapper/DcAutoSalesMapper.xml
...@@ -3139,6 +3139,10 @@ ...@@ -3139,6 +3139,10 @@
and warehouse_code = #{warehouseCode} and warehouse_code = #{warehouseCode}
and !(paid_time &gt;= '2020-11-11 00:00:00' and paid_time &lt;= '2020-11-13 00:00:00' and and !(paid_time &gt;= '2020-11-11 00:00:00' and paid_time &lt;= '2020-11-13 00:00:00' and
platform_type = 'Aliexpress') platform_type = 'Aliexpress')
and !(paid_time &gt;= '2020-11-23 00:00:00' and paid_time &lt;= '2020-11-28 00:00:00' and
platform_type = 'Aliexpress')
and !(paid_time &gt;= '2020-11-23 00:00:00' and paid_time &lt;= '2020-12-06 00:00:00' and
platform_type = 'FBA')
and platform_order_type != '手工单' and platform_order_type != '手工单'
) sales_table ) sales_table
......
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml
...@@ -208,29 +208,29 @@ ...@@ -208,29 +208,29 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account, id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account,
pay_status, collection_account, platform_order_type, website, create_time, purchase_create_time, pay_status, collection_account, platform_order_type, website, create_time, purchase_create_time,
has_paytime, paid_time, refund_time, seller_id, bailun_account_id, hq_account, seller_account, has_paytime, paid_time, refund_time, seller_id, bailun_account_id, hq_account, seller_account,
seller_order_id, seller_email, order_update_time, seller_order_exchange_rate, seller_other_exchange_rate, seller_order_id, seller_email, order_update_time, seller_order_exchange_rate, seller_other_exchange_rate,
finance_order_exchange_rate, finance_other_exchange_rate, cny_to_usd_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, order_to_usd_exchange_rate, other_to_usd_exchange_rate, order_currency, other_currency,
seller_name, bailun_order_id, platform_order_status, bailun_order_status, bailun_payment_status, seller_name, bailun_order_id, platform_order_status, bailun_order_status, bailun_payment_status,
bailun_interception_status, shipping_status, bailun_sku, bailun_sku_title_en, bailun_sku_title_cn, bailun_interception_status, shipping_status, bailun_sku, bailun_sku_title_en, bailun_sku_title_cn,
bailun_sku_quantity_ordered, bailun_sku_quantity_shipped, bailun_sku_quantity_refund, bailun_sku_quantity_ordered, bailun_sku_quantity_shipped, bailun_sku_quantity_refund,
bailun_sku_quantity_picked, warehouse_name, warehouse_code_fba, warehouse_code, bailun_sku_unit_price, bailun_sku_quantity_picked, warehouse_name, warehouse_code_fba, warehouse_code, bailun_sku_unit_price,
bailun_sku_weight, bailun_sku_size, amount_sales, amount_total, amount_shipping, bailun_sku_weight, bailun_sku_size, amount_sales, amount_total, amount_shipping,
amount_product, amount_tax, amount_adjustment, amount_gift_wrap, amount_refund, amount_prepaid, 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_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_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, cost_tail, cost_first, cost_logistics, profit_total, profit_rate, receipt_country,
receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code, receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code,
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_exception, receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, has_platform_exception,
has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified, has_cancle, area_id, bailun_category_id, bailun_category_name, gmt_create, gmt_modified,
ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete, ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, has_delete,
has_scalp, has_buyer_remark, has_platsku_remark, logistics_method_code, logistics_method_name, has_scalp, has_buyer_remark, has_platsku_remark, 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, bailun_sku_quantity_pushed, amount_general_cargo, has_transfer_order, has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, has_transfer_order,
warning_type, warning_type_name, total_fee, shipping, opf, fsc, dt, rsf, otf, whf, warning_type, warning_type_name, total_fee, shipping, opf, fsc, dt, rsf, otf, whf,
currency_code, wms_to_cny_exchange_rate, wms_to_usd_exchange_rate, shipping_deadline_real currency_code, wms_to_cny_exchange_rate, wms_to_usd_exchange_rate, shipping_deadline_real
</sql> </sql>
<select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from dc_base_oms_sku from dc_base_oms_sku
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
...@@ -292,98 +292,98 @@ ...@@ -292,98 +292,98 @@
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into dc_base_oms_sku (id, origin_order_id, platform_type, insert into dc_base_oms_sku (id, origin_order_id, platform_type,
transaction_id, pay_time, pay_method, transaction_id, pay_time, pay_method,
pay_account, pay_status, collection_account, pay_account, pay_status, collection_account,
platform_order_type, website, create_time, platform_order_type, website, create_time,
purchase_create_time, has_paytime, paid_time, purchase_create_time, has_paytime, paid_time,
refund_time, seller_id, bailun_account_id, refund_time, seller_id, bailun_account_id,
hq_account, seller_account, seller_order_id, hq_account, seller_account, seller_order_id,
seller_email, order_update_time, seller_order_exchange_rate, seller_email, order_update_time, seller_order_exchange_rate,
seller_other_exchange_rate, finance_order_exchange_rate, seller_other_exchange_rate, finance_order_exchange_rate,
finance_other_exchange_rate, cny_to_usd_exchange_rate, finance_other_exchange_rate, cny_to_usd_exchange_rate,
order_to_usd_exchange_rate, other_to_usd_exchange_rate, order_to_usd_exchange_rate, other_to_usd_exchange_rate,
order_currency, other_currency, seller_name, order_currency, other_currency, seller_name,
bailun_order_id, platform_order_status, bailun_order_status, bailun_order_id, platform_order_status, bailun_order_status,
bailun_payment_status, bailun_interception_status, bailun_payment_status, bailun_interception_status,
shipping_status, bailun_sku, bailun_sku_title_en, shipping_status, bailun_sku, bailun_sku_title_en,
bailun_sku_title_cn, bailun_sku_quantity_ordered, bailun_sku_title_cn, bailun_sku_quantity_ordered,
bailun_sku_quantity_shipped, bailun_sku_quantity_refund, bailun_sku_quantity_shipped, bailun_sku_quantity_refund,
bailun_sku_quantity_picked, warehouse_name, bailun_sku_quantity_picked, warehouse_name,
warehouse_code_fba, warehouse_code, bailun_sku_unit_price, warehouse_code_fba, warehouse_code, bailun_sku_unit_price,
bailun_sku_weight, bailun_sku_size, amount_sales, bailun_sku_weight, bailun_sku_size, amount_sales,
amount_total, amount_shipping, amount_product, amount_total, amount_shipping, amount_product,
amount_tax, amount_adjustment, amount_gift_wrap, amount_tax, amount_adjustment, amount_gift_wrap,
amount_refund, amount_prepaid, cost_total, amount_refund, amount_prepaid, cost_total,
cost_promotion, cost_platform_fee, cost_product, cost_promotion, cost_platform_fee, cost_product,
cost_shipping, cost_package, cost_fba_fee, cost_shipping, cost_package, cost_fba_fee,
cost_paypal_fee, cost_refund_commisson, cost_handle_bailun, cost_paypal_fee, cost_refund_commisson, cost_handle_bailun,
cost_handle_platform, cost_tail, cost_first, cost_handle_platform, cost_tail, cost_first,
cost_logistics, profit_total, profit_rate, cost_logistics, profit_total, profit_rate,
receipt_country, receipt_city, receipt_area, receipt_country, receipt_city, receipt_area,
receipt_address, receipt_address_2, receipt_postal_code, receipt_address, receipt_address_2, receipt_postal_code,
receiver, receiver_phone, buyer_id, receiver, receiver_phone, buyer_id,
buyer_name, buyer_email, has_fba_exception, buyer_name, buyer_email, has_fba_exception,
has_platform_exception, has_cancle, area_id, has_platform_exception, has_cancle, area_id,
bailun_category_id, bailun_category_name, gmt_create, bailun_category_id, bailun_category_name, gmt_create,
gmt_modified, ratio_weight, ratio_price, gmt_modified, ratio_weight, ratio_price,
bailun_picking_status, bailun_require_logistics, bailun_picking_status, bailun_require_logistics,
has_delete, has_scalp, has_buyer_remark, has_delete, has_scalp, has_buyer_remark,
has_platsku_remark, logistics_method_code, logistics_method_name, has_platsku_remark, logistics_method_code, logistics_method_name,
has_innersale, company_id, bailun_refund_status, has_innersale, company_id, bailun_refund_status,
refund_obj, refund_type, refund_reference_id, refund_obj, refund_type, refund_reference_id,
has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo,
has_transfer_order, warning_type, warning_type_name, has_transfer_order, warning_type, warning_type_name,
total_fee, shipping, opf, total_fee, shipping, opf,
fsc, dt, rsf, otf, fsc, dt, rsf, otf,
whf, currency_code, wms_to_cny_exchange_rate, whf, currency_code, wms_to_cny_exchange_rate,
wms_to_usd_exchange_rate, shipping_deadline_real wms_to_usd_exchange_rate, shipping_deadline_real
) )
values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, values (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
#{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{purchaseCreateTime,jdbcType=TIMESTAMP}, #{hasPaytime,jdbcType=BIT}, #{paidTime,jdbcType=TIMESTAMP}, #{purchaseCreateTime,jdbcType=TIMESTAMP}, #{hasPaytime,jdbcType=BIT}, #{paidTime,jdbcType=TIMESTAMP},
#{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{sellerOrderId,jdbcType=VARCHAR}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{sellerOrderId,jdbcType=VARCHAR},
#{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{sellerOrderExchangeRate,jdbcType=DECIMAL}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{sellerOrderExchangeRate,jdbcType=DECIMAL},
#{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{financeOrderExchangeRate,jdbcType=DECIMAL}, #{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{financeOrderExchangeRate,jdbcType=DECIMAL},
#{financeOtherExchangeRate,jdbcType=DECIMAL}, #{cnyToUsdExchangeRate,jdbcType=DECIMAL}, #{financeOtherExchangeRate,jdbcType=DECIMAL}, #{cnyToUsdExchangeRate,jdbcType=DECIMAL},
#{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{otherToUsdExchangeRate,jdbcType=DECIMAL}, #{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{otherToUsdExchangeRate,jdbcType=DECIMAL},
#{orderCurrency,jdbcType=VARCHAR}, #{otherCurrency,jdbcType=VARCHAR}, #{sellerName,jdbcType=VARCHAR}, #{orderCurrency,jdbcType=VARCHAR}, #{otherCurrency,jdbcType=VARCHAR}, #{sellerName,jdbcType=VARCHAR},
#{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR}, #{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR},
#{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR},
#{shippingStatus,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitleEn,jdbcType=VARCHAR}, #{shippingStatus,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitleEn,jdbcType=VARCHAR},
#{bailunSkuTitleCn,jdbcType=VARCHAR}, #{bailunSkuQuantityOrdered,jdbcType=INTEGER}, #{bailunSkuTitleCn,jdbcType=VARCHAR}, #{bailunSkuQuantityOrdered,jdbcType=INTEGER},
#{bailunSkuQuantityShipped,jdbcType=INTEGER}, #{bailunSkuQuantityRefund,jdbcType=INTEGER}, #{bailunSkuQuantityShipped,jdbcType=INTEGER}, #{bailunSkuQuantityRefund,jdbcType=INTEGER},
#{bailunSkuQuantityPicked,jdbcType=INTEGER}, #{warehouseName,jdbcType=VARCHAR}, #{bailunSkuQuantityPicked,jdbcType=INTEGER}, #{warehouseName,jdbcType=VARCHAR},
#{warehouseCodeFba,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{bailunSkuUnitPrice,jdbcType=DECIMAL}, #{warehouseCodeFba,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{bailunSkuUnitPrice,jdbcType=DECIMAL},
#{bailunSkuWeight,jdbcType=DECIMAL}, #{bailunSkuSize,jdbcType=VARCHAR}, #{amountSales,jdbcType=DECIMAL}, #{bailunSkuWeight,jdbcType=DECIMAL}, #{bailunSkuSize,jdbcType=VARCHAR}, #{amountSales,jdbcType=DECIMAL},
#{amountTotal,jdbcType=DECIMAL}, #{amountShipping,jdbcType=DECIMAL}, #{amountProduct,jdbcType=DECIMAL}, #{amountTotal,jdbcType=DECIMAL}, #{amountShipping,jdbcType=DECIMAL}, #{amountProduct,jdbcType=DECIMAL},
#{amountTax,jdbcType=DECIMAL}, #{amountAdjustment,jdbcType=DECIMAL}, #{amountGiftWrap,jdbcType=DECIMAL}, #{amountTax,jdbcType=DECIMAL}, #{amountAdjustment,jdbcType=DECIMAL}, #{amountGiftWrap,jdbcType=DECIMAL},
#{amountRefund,jdbcType=DECIMAL}, #{amountPrepaid,jdbcType=DECIMAL}, #{costTotal,jdbcType=DECIMAL}, #{amountRefund,jdbcType=DECIMAL}, #{amountPrepaid,jdbcType=DECIMAL}, #{costTotal,jdbcType=DECIMAL},
#{costPromotion,jdbcType=DECIMAL}, #{costPlatformFee,jdbcType=DECIMAL}, #{costProduct,jdbcType=DECIMAL}, #{costPromotion,jdbcType=DECIMAL}, #{costPlatformFee,jdbcType=DECIMAL}, #{costProduct,jdbcType=DECIMAL},
#{costShipping,jdbcType=DECIMAL}, #{costPackage,jdbcType=DECIMAL}, #{costFbaFee,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL}, #{costPackage,jdbcType=DECIMAL}, #{costFbaFee,jdbcType=DECIMAL},
#{costPaypalFee,jdbcType=DECIMAL}, #{costRefundCommisson,jdbcType=DECIMAL}, #{costHandleBailun,jdbcType=DECIMAL}, #{costPaypalFee,jdbcType=DECIMAL}, #{costRefundCommisson,jdbcType=DECIMAL}, #{costHandleBailun,jdbcType=DECIMAL},
#{costHandlePlatform,jdbcType=DECIMAL}, #{costTail,jdbcType=DECIMAL}, #{costFirst,jdbcType=DECIMAL}, #{costHandlePlatform,jdbcType=DECIMAL}, #{costTail,jdbcType=DECIMAL}, #{costFirst,jdbcType=DECIMAL},
#{costLogistics,jdbcType=DECIMAL}, #{profitTotal,jdbcType=DECIMAL}, #{profitRate,jdbcType=DECIMAL}, #{costLogistics,jdbcType=DECIMAL}, #{profitTotal,jdbcType=DECIMAL}, #{profitRate,jdbcType=DECIMAL},
#{receiptCountry,jdbcType=VARCHAR}, #{receiptCity,jdbcType=VARCHAR}, #{receiptArea,jdbcType=VARCHAR}, #{receiptCountry,jdbcType=VARCHAR}, #{receiptCity,jdbcType=VARCHAR}, #{receiptArea,jdbcType=VARCHAR},
#{receiptAddress,jdbcType=VARCHAR}, #{receiptAddress2,jdbcType=VARCHAR}, #{receiptPostalCode,jdbcType=VARCHAR}, #{receiptAddress,jdbcType=VARCHAR}, #{receiptAddress2,jdbcType=VARCHAR}, #{receiptPostalCode,jdbcType=VARCHAR},
#{receiver,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{buyerId,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{buyerId,jdbcType=VARCHAR},
#{buyerName,jdbcType=VARCHAR}, #{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT}, #{buyerName,jdbcType=VARCHAR}, #{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT},
#{hasPlatformException,jdbcType=BIT}, #{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{hasPlatformException,jdbcType=BIT}, #{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER},
#{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, #{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}, #{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{hasBuyerRemark,jdbcType=BIT}, #{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{hasBuyerRemark,jdbcType=BIT},
#{hasPlatskuRemark,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR}, #{hasPlatskuRemark,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{bailunRefundStatus,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{bailunRefundStatus,jdbcType=VARCHAR},
#{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR},
#{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{amountGeneralCargo,jdbcType=DECIMAL},
#{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, #{warningTypeName,jdbcType=VARCHAR}, #{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, #{warningTypeName,jdbcType=VARCHAR},
#{totalFee,jdbcType=DECIMAL}, #{shipping,jdbcType=DECIMAL}, #{opf,jdbcType=DECIMAL}, #{totalFee,jdbcType=DECIMAL}, #{shipping,jdbcType=DECIMAL}, #{opf,jdbcType=DECIMAL},
#{fsc,jdbcType=DECIMAL}, #{dt,jdbcType=DECIMAL}, #{rsf,jdbcType=DECIMAL}, #{otf,jdbcType=DECIMAL}, #{fsc,jdbcType=DECIMAL}, #{dt,jdbcType=DECIMAL}, #{rsf,jdbcType=DECIMAL}, #{otf,jdbcType=DECIMAL},
#{whf,jdbcType=DECIMAL}, #{currencyCode,jdbcType=VARCHAR}, #{wmsToCnyExchangeRate,jdbcType=DECIMAL}, #{whf,jdbcType=DECIMAL}, #{currencyCode,jdbcType=VARCHAR}, #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
#{wmsToUsdExchangeRate,jdbcType=DECIMAL}, #{shippingDeadlineReal,jdbcType=TIMESTAMP} #{wmsToUsdExchangeRate,jdbcType=DECIMAL}, #{shippingDeadlineReal,jdbcType=TIMESTAMP}
) )
</insert> </insert>
...@@ -3056,7 +3056,7 @@ ...@@ -3056,7 +3056,7 @@
#{shippingDeadlineReal,jdbcType=TIMESTAMP}, #{shippingDeadlineReal,jdbcType=TIMESTAMP},
</if> </if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
...@@ -3457,210 +3457,210 @@ ...@@ -3457,210 +3457,210 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
insert into dc_base_oms_sku insert into dc_base_oms_sku
(id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account, (id, origin_order_id, platform_type, transaction_id, pay_time, pay_method, pay_account,
pay_status, collection_account, platform_order_type, website, create_time, purchase_create_time, pay_status, collection_account, platform_order_type, website, create_time, purchase_create_time,
has_paytime, paid_time, refund_time, seller_id, bailun_account_id, hq_account, has_paytime, paid_time, refund_time, seller_id, bailun_account_id, hq_account,
seller_account, seller_order_id, seller_email, order_update_time, seller_order_exchange_rate, seller_account, seller_order_id, seller_email, order_update_time, seller_order_exchange_rate,
seller_other_exchange_rate, finance_order_exchange_rate, finance_other_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, cny_to_usd_exchange_rate, order_to_usd_exchange_rate, other_to_usd_exchange_rate,
order_currency, other_currency, seller_name, bailun_order_id, platform_order_status, order_currency, other_currency, seller_name, bailun_order_id, platform_order_status,
bailun_order_status, bailun_payment_status, bailun_interception_status, shipping_status, bailun_order_status, bailun_payment_status, bailun_interception_status, shipping_status,
bailun_sku, bailun_sku_title_en, bailun_sku_title_cn, bailun_sku_quantity_ordered, bailun_sku, bailun_sku_title_en, bailun_sku_title_cn, bailun_sku_quantity_ordered,
bailun_sku_quantity_shipped, bailun_sku_quantity_refund, bailun_sku_quantity_picked, bailun_sku_quantity_shipped, bailun_sku_quantity_refund, bailun_sku_quantity_picked,
warehouse_name, warehouse_code_fba, warehouse_code, bailun_sku_unit_price, bailun_sku_weight, warehouse_name, warehouse_code_fba, warehouse_code, bailun_sku_unit_price, bailun_sku_weight,
bailun_sku_size, amount_sales, amount_total, amount_shipping, amount_product, amount_tax, bailun_sku_size, amount_sales, amount_total, amount_shipping, amount_product, amount_tax,
amount_adjustment, amount_gift_wrap, amount_refund, amount_prepaid, cost_total, 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_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_paypal_fee, cost_refund_commisson, cost_handle_bailun, cost_handle_platform,
cost_tail, cost_first, cost_logistics, profit_total, profit_rate, receipt_country, cost_tail, cost_first, cost_logistics, profit_total, profit_rate, receipt_country,
receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code, receipt_city, receipt_area, receipt_address, receipt_address_2, receipt_postal_code,
receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception, receiver, receiver_phone, buyer_id, buyer_name, buyer_email, has_fba_exception,
has_platform_exception, has_cancle, area_id, bailun_category_id, bailun_category_name, has_platform_exception, has_cancle, area_id, bailun_category_id, bailun_category_name,
gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics, gmt_create, gmt_modified, ratio_weight, ratio_price, bailun_picking_status, bailun_require_logistics,
has_delete, has_scalp, has_buyer_remark, has_platsku_remark, logistics_method_code, has_delete, has_scalp, has_buyer_remark, has_platsku_remark, logistics_method_code,
logistics_method_name, has_innersale, company_id, bailun_refund_status, refund_obj, logistics_method_name, has_innersale, company_id, bailun_refund_status, refund_obj,
refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo, refund_type, refund_reference_id, has_fba_s, bailun_sku_quantity_pushed, amount_general_cargo,
has_transfer_order, warning_type, warning_type_name, total_fee, shipping, opf, has_transfer_order, warning_type, warning_type_name, total_fee, shipping, opf,
fsc, dt, rsf, otf, whf, currency_code, wms_to_cny_exchange_rate, wms_to_usd_exchange_rate, fsc, dt, rsf, otf, whf, currency_code, wms_to_cny_exchange_rate, wms_to_usd_exchange_rate,
shipping_deadline_real) shipping_deadline_real)
values values
(#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR}, (#{id,jdbcType=INTEGER}, #{originOrderId,jdbcType=VARCHAR}, #{platformType,jdbcType=VARCHAR},
#{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR}, #{transactionId,jdbcType=VARCHAR}, #{payTime,jdbcType=TIMESTAMP}, #{payMethod,jdbcType=VARCHAR},
#{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR}, #{payAccount,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{collectionAccount,jdbcType=VARCHAR},
#{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{platformOrderType,jdbcType=VARCHAR}, #{website,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{purchaseCreateTime,jdbcType=TIMESTAMP}, #{hasPaytime,jdbcType=BIT}, #{paidTime,jdbcType=TIMESTAMP}, #{purchaseCreateTime,jdbcType=TIMESTAMP}, #{hasPaytime,jdbcType=BIT}, #{paidTime,jdbcType=TIMESTAMP},
#{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER}, #{refundTime,jdbcType=TIMESTAMP}, #{sellerId,jdbcType=VARCHAR}, #{bailunAccountId,jdbcType=INTEGER},
#{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{sellerOrderId,jdbcType=VARCHAR}, #{hqAccount,jdbcType=VARCHAR}, #{sellerAccount,jdbcType=VARCHAR}, #{sellerOrderId,jdbcType=VARCHAR},
#{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{sellerOrderExchangeRate,jdbcType=DECIMAL}, #{sellerEmail,jdbcType=VARCHAR}, #{orderUpdateTime,jdbcType=TIMESTAMP}, #{sellerOrderExchangeRate,jdbcType=DECIMAL},
#{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{financeOrderExchangeRate,jdbcType=DECIMAL}, #{sellerOtherExchangeRate,jdbcType=DECIMAL}, #{financeOrderExchangeRate,jdbcType=DECIMAL},
#{financeOtherExchangeRate,jdbcType=DECIMAL}, #{cnyToUsdExchangeRate,jdbcType=DECIMAL}, #{financeOtherExchangeRate,jdbcType=DECIMAL}, #{cnyToUsdExchangeRate,jdbcType=DECIMAL},
#{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{otherToUsdExchangeRate,jdbcType=DECIMAL}, #{orderToUsdExchangeRate,jdbcType=DECIMAL}, #{otherToUsdExchangeRate,jdbcType=DECIMAL},
#{orderCurrency,jdbcType=VARCHAR}, #{otherCurrency,jdbcType=VARCHAR}, #{sellerName,jdbcType=VARCHAR}, #{orderCurrency,jdbcType=VARCHAR}, #{otherCurrency,jdbcType=VARCHAR}, #{sellerName,jdbcType=VARCHAR},
#{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR}, #{bailunOrderId,jdbcType=VARCHAR}, #{platformOrderStatus,jdbcType=VARCHAR}, #{bailunOrderStatus,jdbcType=VARCHAR},
#{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR}, #{bailunPaymentStatus,jdbcType=VARCHAR}, #{bailunInterceptionStatus,jdbcType=VARCHAR},
#{shippingStatus,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitleEn,jdbcType=VARCHAR}, #{shippingStatus,jdbcType=VARCHAR}, #{bailunSku,jdbcType=VARCHAR}, #{bailunSkuTitleEn,jdbcType=VARCHAR},
#{bailunSkuTitleCn,jdbcType=VARCHAR}, #{bailunSkuQuantityOrdered,jdbcType=INTEGER}, #{bailunSkuTitleCn,jdbcType=VARCHAR}, #{bailunSkuQuantityOrdered,jdbcType=INTEGER},
#{bailunSkuQuantityShipped,jdbcType=INTEGER}, #{bailunSkuQuantityRefund,jdbcType=INTEGER}, #{bailunSkuQuantityShipped,jdbcType=INTEGER}, #{bailunSkuQuantityRefund,jdbcType=INTEGER},
#{bailunSkuQuantityPicked,jdbcType=INTEGER}, #{warehouseName,jdbcType=VARCHAR}, #{bailunSkuQuantityPicked,jdbcType=INTEGER}, #{warehouseName,jdbcType=VARCHAR},
#{warehouseCodeFba,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{bailunSkuUnitPrice,jdbcType=DECIMAL}, #{warehouseCodeFba,jdbcType=VARCHAR}, #{warehouseCode,jdbcType=VARCHAR}, #{bailunSkuUnitPrice,jdbcType=DECIMAL},
#{bailunSkuWeight,jdbcType=DECIMAL}, #{bailunSkuSize,jdbcType=VARCHAR}, #{amountSales,jdbcType=DECIMAL}, #{bailunSkuWeight,jdbcType=DECIMAL}, #{bailunSkuSize,jdbcType=VARCHAR}, #{amountSales,jdbcType=DECIMAL},
#{amountTotal,jdbcType=DECIMAL}, #{amountShipping,jdbcType=DECIMAL}, #{amountProduct,jdbcType=DECIMAL}, #{amountTotal,jdbcType=DECIMAL}, #{amountShipping,jdbcType=DECIMAL}, #{amountProduct,jdbcType=DECIMAL},
#{amountTax,jdbcType=DECIMAL}, #{amountAdjustment,jdbcType=DECIMAL}, #{amountGiftWrap,jdbcType=DECIMAL}, #{amountTax,jdbcType=DECIMAL}, #{amountAdjustment,jdbcType=DECIMAL}, #{amountGiftWrap,jdbcType=DECIMAL},
#{amountRefund,jdbcType=DECIMAL}, #{amountPrepaid,jdbcType=DECIMAL}, #{costTotal,jdbcType=DECIMAL}, #{amountRefund,jdbcType=DECIMAL}, #{amountPrepaid,jdbcType=DECIMAL}, #{costTotal,jdbcType=DECIMAL},
#{costPromotion,jdbcType=DECIMAL}, #{costPlatformFee,jdbcType=DECIMAL}, #{costProduct,jdbcType=DECIMAL}, #{costPromotion,jdbcType=DECIMAL}, #{costPlatformFee,jdbcType=DECIMAL}, #{costProduct,jdbcType=DECIMAL},
#{costShipping,jdbcType=DECIMAL}, #{costPackage,jdbcType=DECIMAL}, #{costFbaFee,jdbcType=DECIMAL}, #{costShipping,jdbcType=DECIMAL}, #{costPackage,jdbcType=DECIMAL}, #{costFbaFee,jdbcType=DECIMAL},
#{costPaypalFee,jdbcType=DECIMAL}, #{costRefundCommisson,jdbcType=DECIMAL}, #{costHandleBailun,jdbcType=DECIMAL}, #{costPaypalFee,jdbcType=DECIMAL}, #{costRefundCommisson,jdbcType=DECIMAL}, #{costHandleBailun,jdbcType=DECIMAL},
#{costHandlePlatform,jdbcType=DECIMAL}, #{costTail,jdbcType=DECIMAL}, #{costFirst,jdbcType=DECIMAL}, #{costHandlePlatform,jdbcType=DECIMAL}, #{costTail,jdbcType=DECIMAL}, #{costFirst,jdbcType=DECIMAL},
#{costLogistics,jdbcType=DECIMAL}, #{profitTotal,jdbcType=DECIMAL}, #{profitRate,jdbcType=DECIMAL}, #{costLogistics,jdbcType=DECIMAL}, #{profitTotal,jdbcType=DECIMAL}, #{profitRate,jdbcType=DECIMAL},
#{receiptCountry,jdbcType=VARCHAR}, #{receiptCity,jdbcType=VARCHAR}, #{receiptArea,jdbcType=VARCHAR}, #{receiptCountry,jdbcType=VARCHAR}, #{receiptCity,jdbcType=VARCHAR}, #{receiptArea,jdbcType=VARCHAR},
#{receiptAddress,jdbcType=VARCHAR}, #{receiptAddress2,jdbcType=VARCHAR}, #{receiptPostalCode,jdbcType=VARCHAR}, #{receiptAddress,jdbcType=VARCHAR}, #{receiptAddress2,jdbcType=VARCHAR}, #{receiptPostalCode,jdbcType=VARCHAR},
#{receiver,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{buyerId,jdbcType=VARCHAR}, #{receiver,jdbcType=VARCHAR}, #{receiverPhone,jdbcType=VARCHAR}, #{buyerId,jdbcType=VARCHAR},
#{buyerName,jdbcType=VARCHAR}, #{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT}, #{buyerName,jdbcType=VARCHAR}, #{buyerEmail,jdbcType=VARCHAR}, #{hasFbaException,jdbcType=BIT},
#{hasPlatformException,jdbcType=BIT}, #{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER}, #{hasPlatformException,jdbcType=BIT}, #{hasCancle,jdbcType=BIT}, #{areaId,jdbcType=INTEGER},
#{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP}, #{bailunCategoryId,jdbcType=INTEGER}, #{bailunCategoryName,jdbcType=VARCHAR}, #{gmtCreate,jdbcType=TIMESTAMP},
#{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL}, #{gmtModified,jdbcType=TIMESTAMP}, #{ratioWeight,jdbcType=DECIMAL}, #{ratioPrice,jdbcType=DECIMAL},
#{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR}, #{bailunPickingStatus,jdbcType=VARCHAR}, #{bailunRequireLogistics,jdbcType=VARCHAR},
#{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{hasBuyerRemark,jdbcType=BIT}, #{hasDelete,jdbcType=BIT}, #{hasScalp,jdbcType=BIT}, #{hasBuyerRemark,jdbcType=BIT},
#{hasPlatskuRemark,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR}, #{hasPlatskuRemark,jdbcType=BIT}, #{logisticsMethodCode,jdbcType=VARCHAR}, #{logisticsMethodName,jdbcType=VARCHAR},
#{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{bailunRefundStatus,jdbcType=VARCHAR}, #{hasInnersale,jdbcType=BIT}, #{companyId,jdbcType=INTEGER}, #{bailunRefundStatus,jdbcType=VARCHAR},
#{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR}, #{refundObj,jdbcType=VARCHAR}, #{refundType,jdbcType=VARCHAR}, #{refundReferenceId,jdbcType=VARCHAR},
#{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{amountGeneralCargo,jdbcType=DECIMAL}, #{hasFbaS,jdbcType=BIT}, #{bailunSkuQuantityPushed,jdbcType=INTEGER}, #{amountGeneralCargo,jdbcType=DECIMAL},
#{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, #{warningTypeName,jdbcType=VARCHAR}, #{hasTransferOrder,jdbcType=BIT}, #{warningType,jdbcType=VARCHAR}, #{warningTypeName,jdbcType=VARCHAR},
#{totalFee,jdbcType=DECIMAL}, #{shipping,jdbcType=DECIMAL}, #{opf,jdbcType=DECIMAL}, #{totalFee,jdbcType=DECIMAL}, #{shipping,jdbcType=DECIMAL}, #{opf,jdbcType=DECIMAL},
#{fsc,jdbcType=DECIMAL}, #{dt,jdbcType=DECIMAL}, #{rsf,jdbcType=DECIMAL}, #{otf,jdbcType=DECIMAL}, #{fsc,jdbcType=DECIMAL}, #{dt,jdbcType=DECIMAL}, #{rsf,jdbcType=DECIMAL}, #{otf,jdbcType=DECIMAL},
#{whf,jdbcType=DECIMAL}, #{currencyCode,jdbcType=VARCHAR}, #{wmsToCnyExchangeRate,jdbcType=DECIMAL}, #{whf,jdbcType=DECIMAL}, #{currencyCode,jdbcType=VARCHAR}, #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
#{wmsToUsdExchangeRate,jdbcType=DECIMAL}, #{shippingDeadlineReal,jdbcType=TIMESTAMP} #{wmsToUsdExchangeRate,jdbcType=DECIMAL}, #{shippingDeadlineReal,jdbcType=TIMESTAMP}
) )
on duplicate key update on duplicate key update
id = #{id,jdbcType=INTEGER}, id = #{id,jdbcType=INTEGER},
origin_order_id = #{originOrderId,jdbcType=VARCHAR}, origin_order_id = #{originOrderId,jdbcType=VARCHAR},
platform_type = #{platformType,jdbcType=VARCHAR}, platform_type = #{platformType,jdbcType=VARCHAR},
transaction_id = #{transactionId,jdbcType=VARCHAR}, transaction_id = #{transactionId,jdbcType=VARCHAR},
pay_time = #{payTime,jdbcType=TIMESTAMP}, pay_time = #{payTime,jdbcType=TIMESTAMP},
pay_method = #{payMethod,jdbcType=VARCHAR}, pay_method = #{payMethod,jdbcType=VARCHAR},
pay_account = #{payAccount,jdbcType=VARCHAR}, pay_account = #{payAccount,jdbcType=VARCHAR},
pay_status = #{payStatus,jdbcType=VARCHAR}, pay_status = #{payStatus,jdbcType=VARCHAR},
collection_account = #{collectionAccount,jdbcType=VARCHAR}, collection_account = #{collectionAccount,jdbcType=VARCHAR},
platform_order_type = #{platformOrderType,jdbcType=VARCHAR}, platform_order_type = #{platformOrderType,jdbcType=VARCHAR},
website = #{website,jdbcType=VARCHAR}, website = #{website,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}, create_time = #{createTime,jdbcType=TIMESTAMP},
purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP}, purchase_create_time = #{purchaseCreateTime,jdbcType=TIMESTAMP},
has_paytime = #{hasPaytime,jdbcType=BIT}, has_paytime = #{hasPaytime,jdbcType=BIT},
paid_time = #{paidTime,jdbcType=TIMESTAMP}, paid_time = #{paidTime,jdbcType=TIMESTAMP},
refund_time = #{refundTime,jdbcType=TIMESTAMP}, refund_time = #{refundTime,jdbcType=TIMESTAMP},
seller_id = #{sellerId,jdbcType=VARCHAR}, seller_id = #{sellerId,jdbcType=VARCHAR},
bailun_account_id = #{bailunAccountId,jdbcType=INTEGER}, bailun_account_id = #{bailunAccountId,jdbcType=INTEGER},
hq_account = #{hqAccount,jdbcType=VARCHAR}, hq_account = #{hqAccount,jdbcType=VARCHAR},
seller_account = #{sellerAccount,jdbcType=VARCHAR}, seller_account = #{sellerAccount,jdbcType=VARCHAR},
seller_order_id = #{sellerOrderId,jdbcType=VARCHAR}, seller_order_id = #{sellerOrderId,jdbcType=VARCHAR},
seller_email = #{sellerEmail,jdbcType=VARCHAR}, seller_email = #{sellerEmail,jdbcType=VARCHAR},
order_update_time = #{orderUpdateTime,jdbcType=TIMESTAMP}, order_update_time = #{orderUpdateTime,jdbcType=TIMESTAMP},
seller_order_exchange_rate = #{sellerOrderExchangeRate,jdbcType=DECIMAL}, seller_order_exchange_rate = #{sellerOrderExchangeRate,jdbcType=DECIMAL},
seller_other_exchange_rate = #{sellerOtherExchangeRate,jdbcType=DECIMAL}, seller_other_exchange_rate = #{sellerOtherExchangeRate,jdbcType=DECIMAL},
finance_order_exchange_rate = #{financeOrderExchangeRate,jdbcType=DECIMAL}, finance_order_exchange_rate = #{financeOrderExchangeRate,jdbcType=DECIMAL},
finance_other_exchange_rate = #{financeOtherExchangeRate,jdbcType=DECIMAL}, finance_other_exchange_rate = #{financeOtherExchangeRate,jdbcType=DECIMAL},
cny_to_usd_exchange_rate = #{cnyToUsdExchangeRate,jdbcType=DECIMAL}, cny_to_usd_exchange_rate = #{cnyToUsdExchangeRate,jdbcType=DECIMAL},
order_to_usd_exchange_rate = #{orderToUsdExchangeRate,jdbcType=DECIMAL}, order_to_usd_exchange_rate = #{orderToUsdExchangeRate,jdbcType=DECIMAL},
other_to_usd_exchange_rate = #{otherToUsdExchangeRate,jdbcType=DECIMAL}, other_to_usd_exchange_rate = #{otherToUsdExchangeRate,jdbcType=DECIMAL},
order_currency = #{orderCurrency,jdbcType=VARCHAR}, order_currency = #{orderCurrency,jdbcType=VARCHAR},
other_currency = #{otherCurrency,jdbcType=VARCHAR}, other_currency = #{otherCurrency,jdbcType=VARCHAR},
seller_name = #{sellerName,jdbcType=VARCHAR}, seller_name = #{sellerName,jdbcType=VARCHAR},
bailun_order_id = #{bailunOrderId,jdbcType=VARCHAR}, bailun_order_id = #{bailunOrderId,jdbcType=VARCHAR},
platform_order_status = #{platformOrderStatus,jdbcType=VARCHAR}, platform_order_status = #{platformOrderStatus,jdbcType=VARCHAR},
bailun_order_status = #{bailunOrderStatus,jdbcType=VARCHAR}, bailun_order_status = #{bailunOrderStatus,jdbcType=VARCHAR},
bailun_payment_status = #{bailunPaymentStatus,jdbcType=VARCHAR}, bailun_payment_status = #{bailunPaymentStatus,jdbcType=VARCHAR},
bailun_interception_status = #{bailunInterceptionStatus,jdbcType=VARCHAR}, bailun_interception_status = #{bailunInterceptionStatus,jdbcType=VARCHAR},
shipping_status = #{shippingStatus,jdbcType=VARCHAR}, shipping_status = #{shippingStatus,jdbcType=VARCHAR},
bailun_sku = #{bailunSku,jdbcType=VARCHAR}, bailun_sku = #{bailunSku,jdbcType=VARCHAR},
bailun_sku_title_en = #{bailunSkuTitleEn,jdbcType=VARCHAR}, bailun_sku_title_en = #{bailunSkuTitleEn,jdbcType=VARCHAR},
bailun_sku_title_cn = #{bailunSkuTitleCn,jdbcType=VARCHAR}, bailun_sku_title_cn = #{bailunSkuTitleCn,jdbcType=VARCHAR},
bailun_sku_quantity_ordered = #{bailunSkuQuantityOrdered,jdbcType=INTEGER}, bailun_sku_quantity_ordered = #{bailunSkuQuantityOrdered,jdbcType=INTEGER},
bailun_sku_quantity_shipped = #{bailunSkuQuantityShipped,jdbcType=INTEGER}, bailun_sku_quantity_shipped = #{bailunSkuQuantityShipped,jdbcType=INTEGER},
bailun_sku_quantity_refund = #{bailunSkuQuantityRefund,jdbcType=INTEGER}, bailun_sku_quantity_refund = #{bailunSkuQuantityRefund,jdbcType=INTEGER},
bailun_sku_quantity_picked = #{bailunSkuQuantityPicked,jdbcType=INTEGER}, bailun_sku_quantity_picked = #{bailunSkuQuantityPicked,jdbcType=INTEGER},
warehouse_name = #{warehouseName,jdbcType=VARCHAR}, warehouse_name = #{warehouseName,jdbcType=VARCHAR},
warehouse_code_fba = #{warehouseCodeFba,jdbcType=VARCHAR}, warehouse_code_fba = #{warehouseCodeFba,jdbcType=VARCHAR},
warehouse_code = #{warehouseCode,jdbcType=VARCHAR}, warehouse_code = #{warehouseCode,jdbcType=VARCHAR},
bailun_sku_unit_price = #{bailunSkuUnitPrice,jdbcType=DECIMAL}, bailun_sku_unit_price = #{bailunSkuUnitPrice,jdbcType=DECIMAL},
bailun_sku_weight = #{bailunSkuWeight,jdbcType=DECIMAL}, bailun_sku_weight = #{bailunSkuWeight,jdbcType=DECIMAL},
bailun_sku_size = #{bailunSkuSize,jdbcType=VARCHAR}, bailun_sku_size = #{bailunSkuSize,jdbcType=VARCHAR},
amount_sales = #{amountSales,jdbcType=DECIMAL}, amount_sales = #{amountSales,jdbcType=DECIMAL},
amount_total = #{amountTotal,jdbcType=DECIMAL}, amount_total = #{amountTotal,jdbcType=DECIMAL},
amount_shipping = #{amountShipping,jdbcType=DECIMAL}, amount_shipping = #{amountShipping,jdbcType=DECIMAL},
amount_product = #{amountProduct,jdbcType=DECIMAL}, amount_product = #{amountProduct,jdbcType=DECIMAL},
amount_tax = #{amountTax,jdbcType=DECIMAL}, amount_tax = #{amountTax,jdbcType=DECIMAL},
amount_adjustment = #{amountAdjustment,jdbcType=DECIMAL}, amount_adjustment = #{amountAdjustment,jdbcType=DECIMAL},
amount_gift_wrap = #{amountGiftWrap,jdbcType=DECIMAL}, amount_gift_wrap = #{amountGiftWrap,jdbcType=DECIMAL},
amount_refund = #{amountRefund,jdbcType=DECIMAL}, amount_refund = #{amountRefund,jdbcType=DECIMAL},
amount_prepaid = #{amountPrepaid,jdbcType=DECIMAL}, amount_prepaid = #{amountPrepaid,jdbcType=DECIMAL},
cost_total = #{costTotal,jdbcType=DECIMAL}, cost_total = #{costTotal,jdbcType=DECIMAL},
cost_promotion = #{costPromotion,jdbcType=DECIMAL}, cost_promotion = #{costPromotion,jdbcType=DECIMAL},
cost_platform_fee = #{costPlatformFee,jdbcType=DECIMAL}, cost_platform_fee = #{costPlatformFee,jdbcType=DECIMAL},
cost_product = #{costProduct,jdbcType=DECIMAL}, cost_product = #{costProduct,jdbcType=DECIMAL},
cost_shipping = #{costShipping,jdbcType=DECIMAL}, cost_shipping = #{costShipping,jdbcType=DECIMAL},
cost_package = #{costPackage,jdbcType=DECIMAL}, cost_package = #{costPackage,jdbcType=DECIMAL},
cost_fba_fee = #{costFbaFee,jdbcType=DECIMAL}, cost_fba_fee = #{costFbaFee,jdbcType=DECIMAL},
cost_paypal_fee = #{costPaypalFee,jdbcType=DECIMAL}, cost_paypal_fee = #{costPaypalFee,jdbcType=DECIMAL},
cost_refund_commisson = #{costRefundCommisson,jdbcType=DECIMAL}, cost_refund_commisson = #{costRefundCommisson,jdbcType=DECIMAL},
cost_handle_bailun = #{costHandleBailun,jdbcType=DECIMAL}, cost_handle_bailun = #{costHandleBailun,jdbcType=DECIMAL},
cost_handle_platform = #{costHandlePlatform,jdbcType=DECIMAL}, cost_handle_platform = #{costHandlePlatform,jdbcType=DECIMAL},
cost_tail = #{costTail,jdbcType=DECIMAL}, cost_tail = #{costTail,jdbcType=DECIMAL},
cost_first = #{costFirst,jdbcType=DECIMAL}, cost_first = #{costFirst,jdbcType=DECIMAL},
cost_logistics = #{costLogistics,jdbcType=DECIMAL}, cost_logistics = #{costLogistics,jdbcType=DECIMAL},
profit_total = #{profitTotal,jdbcType=DECIMAL}, profit_total = #{profitTotal,jdbcType=DECIMAL},
profit_rate = #{profitRate,jdbcType=DECIMAL}, profit_rate = #{profitRate,jdbcType=DECIMAL},
receipt_country = #{receiptCountry,jdbcType=VARCHAR}, receipt_country = #{receiptCountry,jdbcType=VARCHAR},
receipt_city = #{receiptCity,jdbcType=VARCHAR}, receipt_city = #{receiptCity,jdbcType=VARCHAR},
receipt_area = #{receiptArea,jdbcType=VARCHAR}, receipt_area = #{receiptArea,jdbcType=VARCHAR},
receipt_address = #{receiptAddress,jdbcType=VARCHAR}, receipt_address = #{receiptAddress,jdbcType=VARCHAR},
receipt_address_2 = #{receiptAddress2,jdbcType=VARCHAR}, receipt_address_2 = #{receiptAddress2,jdbcType=VARCHAR},
receipt_postal_code = #{receiptPostalCode,jdbcType=VARCHAR}, receipt_postal_code = #{receiptPostalCode,jdbcType=VARCHAR},
receiver = #{receiver,jdbcType=VARCHAR}, receiver = #{receiver,jdbcType=VARCHAR},
receiver_phone = #{receiverPhone,jdbcType=VARCHAR}, receiver_phone = #{receiverPhone,jdbcType=VARCHAR},
buyer_id = #{buyerId,jdbcType=VARCHAR}, buyer_id = #{buyerId,jdbcType=VARCHAR},
buyer_name = #{buyerName,jdbcType=VARCHAR}, buyer_name = #{buyerName,jdbcType=VARCHAR},
buyer_email = #{buyerEmail,jdbcType=VARCHAR}, buyer_email = #{buyerEmail,jdbcType=VARCHAR},
has_fba_exception = #{hasFbaException,jdbcType=BIT}, has_fba_exception = #{hasFbaException,jdbcType=BIT},
has_platform_exception = #{hasPlatformException,jdbcType=BIT}, has_platform_exception = #{hasPlatformException,jdbcType=BIT},
has_cancle = #{hasCancle,jdbcType=BIT}, has_cancle = #{hasCancle,jdbcType=BIT},
area_id = #{areaId,jdbcType=INTEGER}, area_id = #{areaId,jdbcType=INTEGER},
bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER}, bailun_category_id = #{bailunCategoryId,jdbcType=INTEGER},
bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR}, bailun_category_name = #{bailunCategoryName,jdbcType=VARCHAR},
gmt_create = #{gmtCreate,jdbcType=TIMESTAMP}, gmt_create = #{gmtCreate,jdbcType=TIMESTAMP},
gmt_modified = #{gmtModified,jdbcType=TIMESTAMP}, gmt_modified = #{gmtModified,jdbcType=TIMESTAMP},
ratio_weight = #{ratioWeight,jdbcType=DECIMAL}, ratio_weight = #{ratioWeight,jdbcType=DECIMAL},
ratio_price = #{ratioPrice,jdbcType=DECIMAL}, ratio_price = #{ratioPrice,jdbcType=DECIMAL},
bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR}, bailun_picking_status = #{bailunPickingStatus,jdbcType=VARCHAR},
bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR}, bailun_require_logistics = #{bailunRequireLogistics,jdbcType=VARCHAR},
has_delete = #{hasDelete,jdbcType=BIT}, has_delete = #{hasDelete,jdbcType=BIT},
has_scalp = #{hasScalp,jdbcType=BIT}, has_scalp = #{hasScalp,jdbcType=BIT},
has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT}, has_buyer_remark = #{hasBuyerRemark,jdbcType=BIT},
has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT}, has_platsku_remark = #{hasPlatskuRemark,jdbcType=BIT},
logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR}, logistics_method_code = #{logisticsMethodCode,jdbcType=VARCHAR},
logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR}, logistics_method_name = #{logisticsMethodName,jdbcType=VARCHAR},
has_innersale = #{hasInnersale,jdbcType=BIT}, has_innersale = #{hasInnersale,jdbcType=BIT},
company_id = #{companyId,jdbcType=INTEGER}, company_id = #{companyId,jdbcType=INTEGER},
bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR}, bailun_refund_status = #{bailunRefundStatus,jdbcType=VARCHAR},
refund_obj = #{refundObj,jdbcType=VARCHAR}, refund_obj = #{refundObj,jdbcType=VARCHAR},
refund_type = #{refundType,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}, has_fba_s = #{hasFbaS,jdbcType=BIT},
bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER}, bailun_sku_quantity_pushed = #{bailunSkuQuantityPushed,jdbcType=INTEGER},
amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL}, amount_general_cargo = #{amountGeneralCargo,jdbcType=DECIMAL},
has_transfer_order = #{hasTransferOrder,jdbcType=BIT}, has_transfer_order = #{hasTransferOrder,jdbcType=BIT},
warning_type = #{warningType,jdbcType=VARCHAR}, warning_type = #{warningType,jdbcType=VARCHAR},
warning_type_name = #{warningTypeName,jdbcType=VARCHAR}, warning_type_name = #{warningTypeName,jdbcType=VARCHAR},
total_fee = #{totalFee,jdbcType=DECIMAL}, total_fee = #{totalFee,jdbcType=DECIMAL},
shipping = #{shipping,jdbcType=DECIMAL}, shipping = #{shipping,jdbcType=DECIMAL},
opf = #{opf,jdbcType=DECIMAL}, opf = #{opf,jdbcType=DECIMAL},
fsc = #{fsc,jdbcType=DECIMAL}, fsc = #{fsc,jdbcType=DECIMAL},
dt = #{dt,jdbcType=DECIMAL}, dt = #{dt,jdbcType=DECIMAL},
rsf = #{rsf,jdbcType=DECIMAL}, rsf = #{rsf,jdbcType=DECIMAL},
otf = #{otf,jdbcType=DECIMAL}, otf = #{otf,jdbcType=DECIMAL},
whf = #{whf,jdbcType=DECIMAL}, whf = #{whf,jdbcType=DECIMAL},
currency_code = #{currencyCode,jdbcType=VARCHAR}, currency_code = #{currencyCode,jdbcType=VARCHAR},
wms_to_cny_exchange_rate = #{wmsToCnyExchangeRate,jdbcType=DECIMAL}, wms_to_cny_exchange_rate = #{wmsToCnyExchangeRate,jdbcType=DECIMAL},
wms_to_usd_exchange_rate = #{wmsToUsdExchangeRate,jdbcType=DECIMAL}, wms_to_usd_exchange_rate = #{wmsToUsdExchangeRate,jdbcType=DECIMAL},
shipping_deadline_real = #{shippingDeadlineReal,jdbcType=TIMESTAMP} shipping_deadline_real = #{shippingDeadlineReal,jdbcType=TIMESTAMP}
</insert> </insert>
<select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap"> <select id="selectOneByExample" parameterType="com.bailuntec.domain.example.DcBaseOmsSkuExample" resultMap="BaseResultMap">
...@@ -3738,8 +3738,11 @@ ...@@ -3738,8 +3738,11 @@
and has_buyer_remark = 0 and has_buyer_remark = 0
and has_platsku_remark = 0 and has_platsku_remark = 0
and has_innersale = 0 and has_innersale = 0
and !(paid_time &gt;= '2020-11-23 00:00:00' and paid_time &lt;= '2020-12-06 00:00:00' and
platform_type = 'FBA')
and platform_order_type != '手工单'
) / #{days} ) / #{days}
</select> </select>
</mapper> </mapper>
\ No newline at end of file
data-common/src/main/resources/mybatis-config.xml
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<configuration> <configuration>
<!--<properties resource="db-tj.properties"/>--> <!--<properties resource="db-tj.properties"/>-->
<properties resource="db-dev.properties"/> <!-- <properties resource="db-dev.properties"/>-->
<!-- <properties resource="db-prod.properties"/>--> <properties resource="db-prod.properties"/>
<settings> <settings>
<setting name="mapUnderscoreToCamelCase" value="true"/> <setting name="mapUnderscoreToCamelCase" value="true"/>
</settings> </settings>
......
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