Skip to content

D
dc-java
Commit a831086f by huluobin
Options

update

parent 4816c5c4
Showing with 198 additions and 386 deletions
data-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdDownloadReportJob.java
......@@ -107,6 +107,16 @@ public class AmazonAdDownloadReportJob implements SimpleJob {
dcBaseFinanceAmazonAdProduct = new DcBaseFinanceAmazonAdProduct();
}
BeanUtils.copyProperties(dcBaseFinanceAmazonAdProduct, amazonAdProduct);
dcBaseFinanceAmazonAdProduct.setAccountId(jobAmazonAdLog.getAccountId());
dcBaseFinanceAmazonAdProduct.setCompanyId(jobAmazonAdLog.getCompanyId());
dcBaseFinanceAmazonAdProduct.setReportDate(jobAmazonAdLog.getReportDate());
dcBaseFinanceAmazonAdProduct.setExchangeRate(CallBailunSystem.getExchangeRate(dcBaseFinanceAmazonAdProduct.getCurrency(), CurrencyType.CNY.value(), jobAmazonAdLog.getReportDate().atStartOfDay()));
dcBaseFinanceAmazonAdProduct.setExchangeRateUsd(CallBailunSystem.getExchangeRate(dcBaseFinanceAmazonAdProduct.getCurrency(), CurrencyType.USD.value(), jobAmazonAdLog.getReportDate().atStartOfDay()));
dcBaseFinanceAmazonAdProduct.setBjModifyTime(LocalDateTime.now());
dcBaseFinanceAmazonAdProduct.setType(jobAmazonAdLog.getType());
dcBaseFinanceAmazonAdProductMapper.upsertSelective(dcBaseFinanceAmazonAdProduct);
}
}
......
data-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdGenerateReportIdJob.java
......@@ -44,13 +44,13 @@ public class AmazonAdGenerateReportIdJob implements SimpleJob {
.andAmazonAdAuthJsonNotEqualTo("")
.example());
for (int i = 2; i <= 6; i++) {
int finalI = i;
dcBaseCompanyAccountList
// .stream()
// .filter(dcBaseCompanyAccount -> dcBaseCompanyAccount.getAccountId().equals(671))
.forEach(dcBaseCompanyAccount -> {
LocalDateTime reportDate = LocalDateTime.of(2020, 10, finalI, 0, 0);
LocalDateTime reportDate = LocalDateTime.now().minusHours(36);
// LocalDateTime reportDate = LocalDateTime.of(2020, 10, 2, 0, 0);
//productAds
try {
// LocalDateTime reportDate = LocalDateTime.of(2020, 9, 1, 0, 0);
......@@ -188,11 +188,8 @@ public class AmazonAdGenerateReportIdJob implements SimpleJob {
} catch (Exception ex) {
log.error("下载展示报告异常 帐号id :{} 日期:{} 异常信息:{} ", dcBaseCompanyAccount.getAccountId(), reportDate, ex.getMessage(), ex);
}
});
}
}
}
......
data-base/base-sync-amazon-ad/src/test/java/com/bailuntec/job/AmazonAdDownloadReportJobTest.java
......@@ -3,7 +3,6 @@ package com.bailuntec.job;
import com.bailuntec.domain.pojo.AmazonAdProduct;
import com.dangdang.ddframe.job.api.ShardingContext;
import com.dangdang.ddframe.job.executor.ShardingContexts;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import lombok.extern.slf4j.Slf4j;
import okhttp3.OkHttpClient;
......@@ -11,7 +10,7 @@ import okhttp3.Request;
import okhttp3.Response;
import org.junit.jupiter.api.Test;
import java.io.*;
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.HashMap;
import java.util.List;
......@@ -55,8 +54,7 @@ class AmazonAdDownloadReportJobTest {
}.getType();
StringBuilder html= new StringBuilder();
StringBuilder html = new StringBuilder();
Scanner sc = new Scanner(inputStream);
while (sc.hasNextLine()) {
......
data-base/base-sync-cost-first/src/test/java/com/bailuntec/job/SyncCostFirstFinishJobTest.java
......@@ -25,7 +25,7 @@ public class SyncCostFirstFinishJobTest {
SyncCostFirstFinishJob syncCostFirstFinishJob = new SyncCostFirstFinishJob();
JobPointLog jobPointLog = new JobPointLog("base-sync-cost-first-finish", 1, 1000, 1, 1,
LocalDateTime.of(2020, 8, 1, 0, 0, 0),
LocalDateTime.of(2020, 10, 9, 0, 0, 0));
LocalDateTime.of(2020, 10, 10, 0, 0, 0));
syncCostFirstFinishJob.executeJob(null, jobPointLog);
}
......
data-base/base-sync-finance-ebay/src/main/java/com/bailuntec/job/EbayFinanceAdSyncJob.java
......@@ -57,11 +57,15 @@ public class EbayFinanceAdSyncJob extends PointJob {
for (JobAccountLog jobAccountLog : listByPage) {
try {
//先删除再更新
dcBaseFinanceEbayMapper.deleteByExample(DcBaseFinanceEbayExample.newAndCreateCriteria()
.andBjDateBetween(startTime, endTime)
.andAccountIdEqualTo(jobAccountLog.getAccountId())
.example());
}catch (Exception ex){
}
jobAccountLog.setStartTime(startTime.plusHours(15));
jobAccountLog.setEndTime(endTime.plusHours(15));
......@@ -73,7 +77,6 @@ public class EbayFinanceAdSyncJob extends PointJob {
jobPointLog.setStartTime(startTime.plusDays(1));
jobPointLog.setEndTime(endTime.plusDays(1));
jobPointLogMapper.updateByPrimaryKey(jobPointLog);
}
} catch (Exception e) {
......
data-base/base-sync-finance-ebay/src/test/java/com/bailuntec/job/EbayFinanceAdSyncJobTest.java
......@@ -7,6 +7,7 @@ import com.bailuntec.domain.example.DcBaseCompanyAccountExample;
import com.bailuntec.domain.example.DcBaseFinanceEbayExample;
import com.bailuntec.mapper.DcBaseCompanyAccountMapper;
import com.bailuntec.mapper.DcBaseFinanceEbayMapper;
import com.bailuntec.support.PointJob;
import com.bailuntec.utils.SessionUtil;
import com.dangdang.ddframe.job.api.ShardingContext;
import com.dangdang.ddframe.job.executor.ShardingContexts;
......@@ -33,12 +34,12 @@ public class EbayFinanceAdSyncJobTest {
@Test
public void executeJob() {
EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
PointJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
ShardingContext shardingContext = new ShardingContext(
new ShardingContexts("x", "base-sync-finance-ebay-ad", 1, null, new HashMap<>()), 0
);
ebayFinanceAdSyncJob.executeJob(shardingContext, null);
ebayFinanceAdSyncJob.execute(shardingContext);
}
......
data-base/base-sync-oms-order/src/main/java/com/bailuntec/Application.java
......@@ -3,6 +3,7 @@ package com.bailuntec;
import com.alibaba.druid.pool.DruidDataSource;
import com.bailuntec.job.OrderSyncJob;
import com.bailuntec.job.OrderSyncJob30;
import com.bailuntec.job.OrderSyncTask;
import com.bailuntec.listener.OrderSyncJobListener;
import com.bailuntec.utils.PropertiesUtil;
import com.dangdang.ddframe.job.config.JobCoreConfiguration;
......@@ -29,7 +30,7 @@ public class Application {
public static void main(String[] args) {
new JobScheduler(createRegistryCenter(), createJobConfiguration(), createJobEventConfiguration(), new OrderSyncJobListener()).init();
new JobScheduler(createRegistryCenter(), createJobConfiguration1(), createJobEventConfiguration(), new OrderSyncJobListener()).init();
// new JobScheduler(createRegistryCenter(), createJobConfiguration2(), createJobEventConfiguration(), new OrderSyncJobListener()).init();
new JobScheduler(createRegistryCenter(), createJobConfiguration2(), createJobEventConfiguration(), new OrderSyncJobListener()).init();
}
......@@ -60,14 +61,14 @@ public class Application {
return LiteJobConfiguration.newBuilder(simpleJobConfig).build();
}
// private static LiteJobConfiguration createJobConfiguration2() {
// JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(
// propertiesUtil.getPropertyAsString("JOB_COROUTINE_NAME"),
// propertiesUtil.getPropertyAsString("JOB_COROUTINE_CRON"),
// propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
// SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, OrderSyncTask.class.getCanonicalName());
// return LiteJobConfiguration.newBuilder(simpleJobConfig).build();
// }
private static LiteJobConfiguration createJobConfiguration2() {
JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(
propertiesUtil.getPropertyAsString("JOB_COROUTINE_NAME"),
propertiesUtil.getPropertyAsString("JOB_COROUTINE_CRON"),
propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, OrderSyncTask.class.getCanonicalName());
return LiteJobConfiguration.newBuilder(simpleJobConfig).build();
}
private static JobEventConfiguration createJobEventConfiguration() {
return new JobEventRdbConfiguration(setUpEventTraceDataSource());
......
data-base/base-sync-oms-order/src/main/resources/job.properties
......@@ -19,7 +19,7 @@ JOB_NAME30=base-sync-oms-skus30
#JOB_NAME=base-sync-oms-order
JOB_CRON30=0 0 22,23,00 * * ? *
JOB_COROUTINE_NAME=base-sync-oms-order-task2
JOB_COROUTINE_NAME=base-sync-oms-order-task3
JOB_COROUTINE_CRON=0/1 * * * * ?
SHARDING_TOTAL_COUNT=1
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnover.java
package com.bailuntec.domain.entity;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class DcAutoTurnover {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.id
*
......@@ -18,7 +17,6 @@ public class DcAutoTurnover {
private Integer id;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.purchase_advice_id
*
......@@ -27,7 +25,6 @@ public class DcAutoTurnover {
private String purchaseAdviceId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.bailun_sku
*
......@@ -37,7 +34,6 @@ public class DcAutoTurnover {
private String bailunSku;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.warehouse_code
*
......@@ -47,7 +43,6 @@ public class DcAutoTurnover {
private String warehouseCode;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_init_advise
*
......@@ -56,7 +51,6 @@ public class DcAutoTurnover {
private BigDecimal quantityInitAdvise;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_minimum_order
*
......@@ -65,7 +59,6 @@ public class DcAutoTurnover {
private Integer quantityMinimumOrder;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_final_advise
*
......@@ -74,7 +67,6 @@ public class DcAutoTurnover {
private BigDecimal quantityFinalAdvise;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.warehouse_name
*
......@@ -83,7 +75,6 @@ public class DcAutoTurnover {
private String warehouseName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_promotion
*
......@@ -92,7 +83,6 @@ public class DcAutoTurnover {
private Integer quantityPromotion;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_inventory
*
......@@ -101,7 +91,6 @@ public class DcAutoTurnover {
private Integer quantityInventory;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_transfer
*
......@@ -110,7 +99,6 @@ public class DcAutoTurnover {
private Integer quantityTransfer;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_purchase
*
......@@ -119,7 +107,6 @@ public class DcAutoTurnover {
private Integer quantityPurchase;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.turnover_days
*
......@@ -128,7 +115,6 @@ public class DcAutoTurnover {
private Integer turnoverDays;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_safe_inventory
*
......@@ -137,7 +123,6 @@ public class DcAutoTurnover {
private BigDecimal quantitySafeInventory;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.remark
*
......@@ -146,7 +131,6 @@ public class DcAutoTurnover {
private String remark;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.gmt_create
*
......@@ -155,7 +139,6 @@ public class DcAutoTurnover {
private LocalDateTime gmtCreate;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.gmt_modified
*
......@@ -164,7 +147,6 @@ public class DcAutoTurnover {
private LocalDateTime gmtModified;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.status
*
......@@ -173,7 +155,6 @@ public class DcAutoTurnover {
private Integer status;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_out_stock
*
......@@ -182,7 +163,6 @@ public class DcAutoTurnover {
private Integer quantityOutStock;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.sku_title
*
......@@ -191,7 +171,6 @@ public class DcAutoTurnover {
private String skuTitle;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.promotions
*
......@@ -200,7 +179,6 @@ public class DcAutoTurnover {
private String promotions;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.supplier_delivery
*
......@@ -209,7 +187,6 @@ public class DcAutoTurnover {
private Integer supplierDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.inventory_available_days
*
......@@ -218,7 +195,6 @@ public class DcAutoTurnover {
private Integer inventoryAvailableDays;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_inbound
*
......@@ -227,7 +203,6 @@ public class DcAutoTurnover {
private Integer quantityInbound;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.forecast_oneday_sales
*
......@@ -236,7 +211,6 @@ public class DcAutoTurnover {
private BigDecimal forecastOnedaySales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.forecast_sevenday_sales
*
......@@ -245,7 +219,6 @@ public class DcAutoTurnover {
private BigDecimal forecastSevendaySales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.forecast_fourteenday_sales
*
......@@ -254,7 +227,6 @@ public class DcAutoTurnover {
private BigDecimal forecastFourteendaySales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.sales_details
*
......@@ -263,7 +235,6 @@ public class DcAutoTurnover {
private String salesDetails;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.inbound_details
*
......@@ -272,7 +243,6 @@ public class DcAutoTurnover {
private String inboundDetails;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.inventory_details
*
......@@ -281,7 +251,6 @@ public class DcAutoTurnover {
private String inventoryDetails;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.short_supply_details
*
......@@ -290,7 +259,6 @@ public class DcAutoTurnover {
private String shortSupplyDetails;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.advised_details
*
......@@ -299,7 +267,6 @@ public class DcAutoTurnover {
private String advisedDetails;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.sales_upper_limit
*
......@@ -308,7 +275,6 @@ public class DcAutoTurnover {
private BigDecimal salesUpperLimit;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.average_overdue
*
......@@ -317,7 +283,6 @@ public class DcAutoTurnover {
private BigDecimal averageOverdue;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.average_supplier_delivery
*
......@@ -326,7 +291,6 @@ public class DcAutoTurnover {
private Integer averageSupplierDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.transfer_config_delivery
*
......@@ -335,7 +299,6 @@ public class DcAutoTurnover {
private Integer transferConfigDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.transfer_bale_config_delivery
*
......@@ -344,7 +307,6 @@ public class DcAutoTurnover {
private Integer transferBaleConfigDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.abroad_inbound_config_delivery
*
......@@ -353,7 +315,6 @@ public class DcAutoTurnover {
private Integer abroadInboundConfigDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.inspection_config_delivery
*
......@@ -362,7 +323,6 @@ public class DcAutoTurnover {
private Integer inspectionConfigDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.inspection_delivery
*
......@@ -371,7 +331,6 @@ public class DcAutoTurnover {
private Integer inspectionDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.transfer_delivery
*
......@@ -380,7 +339,6 @@ public class DcAutoTurnover {
private Integer transferDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.transfer_bale_delivery
*
......@@ -389,7 +347,6 @@ public class DcAutoTurnover {
private Integer transferBaleDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.abroad_inbound_delivery
*
......@@ -398,7 +355,6 @@ public class DcAutoTurnover {
private Integer abroadInboundDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.supplementary_sales
*
......@@ -407,7 +363,6 @@ public class DcAutoTurnover {
private BigDecimal supplementarySales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.turnover_sales
*
......@@ -416,7 +371,6 @@ public class DcAutoTurnover {
private BigDecimal turnoverSales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.turnover_inbound
*
......@@ -425,7 +379,6 @@ public class DcAutoTurnover {
private BigDecimal turnoverInbound;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_sevenday_sales
*
......@@ -434,7 +387,6 @@ public class DcAutoTurnover {
private BigDecimal historySevendaySales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_fourteenday_sales
*
......@@ -443,7 +395,6 @@ public class DcAutoTurnover {
private BigDecimal historyFourteendaySales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_thirtyday_sales
*
......@@ -452,7 +403,6 @@ public class DcAutoTurnover {
private BigDecimal historyThirtydaySales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.sales_explain_details
*
......@@ -461,7 +411,6 @@ public class DcAutoTurnover {
private String salesExplainDetails;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.forecast_turnoverday_sales
*
......@@ -470,7 +419,6 @@ public class DcAutoTurnover {
private BigDecimal forecastTurnoverdaySales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.stock_up_sales
*
......@@ -479,7 +427,6 @@ public class DcAutoTurnover {
private BigDecimal stockUpSales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.quantity_begin_advise
*
......@@ -488,7 +435,6 @@ public class DcAutoTurnover {
private BigDecimal quantityBeginAdvise;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.stock_up_days
*
......@@ -497,7 +443,6 @@ public class DcAutoTurnover {
private Integer stockUpDays;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.payment_before_delivery
*
......@@ -506,7 +451,6 @@ public class DcAutoTurnover {
private Integer paymentBeforeDelivery;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.product_code
*
......@@ -515,7 +459,6 @@ public class DcAutoTurnover {
private String productCode;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.product_inner_code
*
......@@ -524,7 +467,6 @@ public class DcAutoTurnover {
private String productInnerCode;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.bailun_category_id
*
......@@ -533,7 +475,6 @@ public class DcAutoTurnover {
private Integer bailunCategoryId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.buyer_name
*
......@@ -542,7 +483,6 @@ public class DcAutoTurnover {
private String buyerName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.suppliers_name
*
......@@ -551,7 +491,6 @@ public class DcAutoTurnover {
private String suppliersName;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_sevenday_sales_ebay
*
......@@ -560,7 +499,6 @@ public class DcAutoTurnover {
private BigDecimal historySevendaySalesEbay;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_fourteenday_sales_ebay
*
......@@ -569,7 +507,6 @@ public class DcAutoTurnover {
private BigDecimal historyFourteendaySalesEbay;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_thirtyday_sales_ebay
*
......@@ -578,7 +515,6 @@ public class DcAutoTurnover {
private BigDecimal historyThirtydaySalesEbay;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_sevenday_sales_aliexpress
*
......@@ -587,7 +523,6 @@ public class DcAutoTurnover {
private BigDecimal historySevendaySalesAliexpress;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_fourteenday_sales_aliexpress
*
......@@ -596,7 +531,6 @@ public class DcAutoTurnover {
private BigDecimal historyFourteendaySalesAliexpress;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_thirtyday_sales_aliexpress
*
......@@ -605,7 +539,6 @@ public class DcAutoTurnover {
private BigDecimal historyThirtydaySalesAliexpress;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.daily_weighted_sales
*
......@@ -614,7 +547,6 @@ public class DcAutoTurnover {
private BigDecimal dailyWeightedSales;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.original_quantity_init_advise
*
......@@ -623,7 +555,6 @@ public class DcAutoTurnover {
private Integer originalQuantityInitAdvise;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.is_modify_quantity_init_advise
*
......@@ -632,7 +563,6 @@ public class DcAutoTurnover {
private Integer isModifyQuantityInitAdvise;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.tag_id
*
......@@ -641,7 +571,6 @@ public class DcAutoTurnover {
private Integer tagId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.hq_type
*
......@@ -650,7 +579,6 @@ public class DcAutoTurnover {
private String hqType;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_sevenday_sales_amazon
*
......@@ -659,7 +587,6 @@ public class DcAutoTurnover {
private BigDecimal historySevendaySalesAmazon;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_fourteenday_sales_amazon
*
......@@ -668,7 +595,6 @@ public class DcAutoTurnover {
private BigDecimal historyFourteendaySalesAmazon;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_thirtyday_sales_amazon
*
......@@ -677,7 +603,6 @@ public class DcAutoTurnover {
private BigDecimal historyThirtydaySalesAmazon;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.dc_auto_sales_forecast_config_id
*
......@@ -686,7 +611,6 @@ public class DcAutoTurnover {
private Integer dcAutoSalesForecastConfigId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.is_out_stock
*
......@@ -695,7 +619,6 @@ public class DcAutoTurnover {
private Integer isOutStock;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.sales_details_formula
*
......@@ -703,283 +626,5 @@ public class DcAutoTurnover {
*/
private String salesDetailsFormula;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
*
* @mbg.generated
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", purchaseAdviceId=").append(purchaseAdviceId);
sb.append(", bailunSku=").append(bailunSku);
sb.append(", warehouseCode=").append(warehouseCode);
sb.append(", quantityInitAdvise=").append(quantityInitAdvise);
sb.append(", quantityMinimumOrder=").append(quantityMinimumOrder);
sb.append(", quantityFinalAdvise=").append(quantityFinalAdvise);
sb.append(", warehouseName=").append(warehouseName);
sb.append(", quantityPromotion=").append(quantityPromotion);
sb.append(", quantityInventory=").append(quantityInventory);
sb.append(", quantityTransfer=").append(quantityTransfer);
sb.append(", quantityPurchase=").append(quantityPurchase);
sb.append(", turnoverDays=").append(turnoverDays);
sb.append(", quantitySafeInventory=").append(quantitySafeInventory);
sb.append(", remark=").append(remark);
sb.append(", gmtCreate=").append(gmtCreate);
sb.append(", gmtModified=").append(gmtModified);
sb.append(", status=").append(status);
sb.append(", quantityOutStock=").append(quantityOutStock);
sb.append(", skuTitle=").append(skuTitle);
sb.append(", promotions=").append(promotions);
sb.append(", supplierDelivery=").append(supplierDelivery);
sb.append(", inventoryAvailableDays=").append(inventoryAvailableDays);
sb.append(", quantityInbound=").append(quantityInbound);
sb.append(", forecastOnedaySales=").append(forecastOnedaySales);
sb.append(", forecastSevendaySales=").append(forecastSevendaySales);
sb.append(", forecastFourteendaySales=").append(forecastFourteendaySales);
sb.append(", salesDetails=").append(salesDetails);
sb.append(", inboundDetails=").append(inboundDetails);
sb.append(", inventoryDetails=").append(inventoryDetails);
sb.append(", shortSupplyDetails=").append(shortSupplyDetails);
sb.append(", advisedDetails=").append(advisedDetails);
sb.append(", salesUpperLimit=").append(salesUpperLimit);
sb.append(", averageOverdue=").append(averageOverdue);
sb.append(", averageSupplierDelivery=").append(averageSupplierDelivery);
sb.append(", transferConfigDelivery=").append(transferConfigDelivery);
sb.append(", transferBaleConfigDelivery=").append(transferBaleConfigDelivery);
sb.append(", abroadInboundConfigDelivery=").append(abroadInboundConfigDelivery);
sb.append(", inspectionConfigDelivery=").append(inspectionConfigDelivery);
sb.append(", inspectionDelivery=").append(inspectionDelivery);
sb.append(", transferDelivery=").append(transferDelivery);
sb.append(", transferBaleDelivery=").append(transferBaleDelivery);
sb.append(", abroadInboundDelivery=").append(abroadInboundDelivery);
sb.append(", supplementarySales=").append(supplementarySales);
sb.append(", turnoverSales=").append(turnoverSales);
sb.append(", turnoverInbound=").append(turnoverInbound);
sb.append(", historySevendaySales=").append(historySevendaySales);
sb.append(", historyFourteendaySales=").append(historyFourteendaySales);
sb.append(", historyThirtydaySales=").append(historyThirtydaySales);
sb.append(", salesExplainDetails=").append(salesExplainDetails);
sb.append(", forecastTurnoverdaySales=").append(forecastTurnoverdaySales);
sb.append(", stockUpSales=").append(stockUpSales);
sb.append(", quantityBeginAdvise=").append(quantityBeginAdvise);
sb.append(", stockUpDays=").append(stockUpDays);
sb.append(", paymentBeforeDelivery=").append(paymentBeforeDelivery);
sb.append(", productCode=").append(productCode);
sb.append(", productInnerCode=").append(productInnerCode);
sb.append(", bailunCategoryId=").append(bailunCategoryId);
sb.append(", buyerName=").append(buyerName);
sb.append(", suppliersName=").append(suppliersName);
sb.append(", historySevendaySalesEbay=").append(historySevendaySalesEbay);
sb.append(", historyFourteendaySalesEbay=").append(historyFourteendaySalesEbay);
sb.append(", historyThirtydaySalesEbay=").append(historyThirtydaySalesEbay);
sb.append(", historySevendaySalesAliexpress=").append(historySevendaySalesAliexpress);
sb.append(", historyFourteendaySalesAliexpress=").append(historyFourteendaySalesAliexpress);
sb.append(", historyThirtydaySalesAliexpress=").append(historyThirtydaySalesAliexpress);
sb.append(", dailyWeightedSales=").append(dailyWeightedSales);
sb.append(", originalQuantityInitAdvise=").append(originalQuantityInitAdvise);
sb.append(", isModifyQuantityInitAdvise=").append(isModifyQuantityInitAdvise);
sb.append(", tagId=").append(tagId);
sb.append(", hqType=").append(hqType);
sb.append(", historySevendaySalesAmazon=").append(historySevendaySalesAmazon);
sb.append(", historyFourteendaySalesAmazon=").append(historyFourteendaySalesAmazon);
sb.append(", historyThirtydaySalesAmazon=").append(historyThirtydaySalesAmazon);
sb.append(", dcAutoSalesForecastConfigId=").append(dcAutoSalesForecastConfigId);
sb.append(", isOutStock=").append(isOutStock);
sb.append(", salesDetailsFormula=").append(salesDetailsFormula);
sb.append("]");
return sb.toString();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
*
* @mbg.generated
*/
@Override
public boolean equals(Object that) {
if (this == that) {
return true;
}
if (that == null) {
return false;
}
if (getClass() != that.getClass()) {
return false;
}
DcAutoTurnover other = (DcAutoTurnover) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getPurchaseAdviceId() == null ? other.getPurchaseAdviceId() == null : this.getPurchaseAdviceId().equals(other.getPurchaseAdviceId()))
&& (this.getBailunSku() == null ? other.getBailunSku() == null : this.getBailunSku().equals(other.getBailunSku()))
&& (this.getWarehouseCode() == null ? other.getWarehouseCode() == null : this.getWarehouseCode().equals(other.getWarehouseCode()))
&& (this.getQuantityInitAdvise() == null ? other.getQuantityInitAdvise() == null : this.getQuantityInitAdvise().equals(other.getQuantityInitAdvise()))
&& (this.getQuantityMinimumOrder() == null ? other.getQuantityMinimumOrder() == null : this.getQuantityMinimumOrder().equals(other.getQuantityMinimumOrder()))
&& (this.getQuantityFinalAdvise() == null ? other.getQuantityFinalAdvise() == null : this.getQuantityFinalAdvise().equals(other.getQuantityFinalAdvise()))
&& (this.getWarehouseName() == null ? other.getWarehouseName() == null : this.getWarehouseName().equals(other.getWarehouseName()))
&& (this.getQuantityPromotion() == null ? other.getQuantityPromotion() == null : this.getQuantityPromotion().equals(other.getQuantityPromotion()))
&& (this.getQuantityInventory() == null ? other.getQuantityInventory() == null : this.getQuantityInventory().equals(other.getQuantityInventory()))
&& (this.getQuantityTransfer() == null ? other.getQuantityTransfer() == null : this.getQuantityTransfer().equals(other.getQuantityTransfer()))
&& (this.getQuantityPurchase() == null ? other.getQuantityPurchase() == null : this.getQuantityPurchase().equals(other.getQuantityPurchase()))
&& (this.getTurnoverDays() == null ? other.getTurnoverDays() == null : this.getTurnoverDays().equals(other.getTurnoverDays()))
&& (this.getQuantitySafeInventory() == null ? other.getQuantitySafeInventory() == null : this.getQuantitySafeInventory().equals(other.getQuantitySafeInventory()))
&& (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()))
&& (this.getGmtCreate() == null ? other.getGmtCreate() == null : this.getGmtCreate().equals(other.getGmtCreate()))
&& (this.getGmtModified() == null ? other.getGmtModified() == null : this.getGmtModified().equals(other.getGmtModified()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getQuantityOutStock() == null ? other.getQuantityOutStock() == null : this.getQuantityOutStock().equals(other.getQuantityOutStock()))
&& (this.getSkuTitle() == null ? other.getSkuTitle() == null : this.getSkuTitle().equals(other.getSkuTitle()))
&& (this.getPromotions() == null ? other.getPromotions() == null : this.getPromotions().equals(other.getPromotions()))
&& (this.getSupplierDelivery() == null ? other.getSupplierDelivery() == null : this.getSupplierDelivery().equals(other.getSupplierDelivery()))
&& (this.getInventoryAvailableDays() == null ? other.getInventoryAvailableDays() == null : this.getInventoryAvailableDays().equals(other.getInventoryAvailableDays()))
&& (this.getQuantityInbound() == null ? other.getQuantityInbound() == null : this.getQuantityInbound().equals(other.getQuantityInbound()))
&& (this.getForecastOnedaySales() == null ? other.getForecastOnedaySales() == null : this.getForecastOnedaySales().equals(other.getForecastOnedaySales()))
&& (this.getForecastSevendaySales() == null ? other.getForecastSevendaySales() == null : this.getForecastSevendaySales().equals(other.getForecastSevendaySales()))
&& (this.getForecastFourteendaySales() == null ? other.getForecastFourteendaySales() == null : this.getForecastFourteendaySales().equals(other.getForecastFourteendaySales()))
&& (this.getSalesDetails() == null ? other.getSalesDetails() == null : this.getSalesDetails().equals(other.getSalesDetails()))
&& (this.getInboundDetails() == null ? other.getInboundDetails() == null : this.getInboundDetails().equals(other.getInboundDetails()))
&& (this.getInventoryDetails() == null ? other.getInventoryDetails() == null : this.getInventoryDetails().equals(other.getInventoryDetails()))
&& (this.getShortSupplyDetails() == null ? other.getShortSupplyDetails() == null : this.getShortSupplyDetails().equals(other.getShortSupplyDetails()))
&& (this.getAdvisedDetails() == null ? other.getAdvisedDetails() == null : this.getAdvisedDetails().equals(other.getAdvisedDetails()))
&& (this.getSalesUpperLimit() == null ? other.getSalesUpperLimit() == null : this.getSalesUpperLimit().equals(other.getSalesUpperLimit()))
&& (this.getAverageOverdue() == null ? other.getAverageOverdue() == null : this.getAverageOverdue().equals(other.getAverageOverdue()))
&& (this.getAverageSupplierDelivery() == null ? other.getAverageSupplierDelivery() == null : this.getAverageSupplierDelivery().equals(other.getAverageSupplierDelivery()))
&& (this.getTransferConfigDelivery() == null ? other.getTransferConfigDelivery() == null : this.getTransferConfigDelivery().equals(other.getTransferConfigDelivery()))
&& (this.getTransferBaleConfigDelivery() == null ? other.getTransferBaleConfigDelivery() == null : this.getTransferBaleConfigDelivery().equals(other.getTransferBaleConfigDelivery()))
&& (this.getAbroadInboundConfigDelivery() == null ? other.getAbroadInboundConfigDelivery() == null : this.getAbroadInboundConfigDelivery().equals(other.getAbroadInboundConfigDelivery()))
&& (this.getInspectionConfigDelivery() == null ? other.getInspectionConfigDelivery() == null : this.getInspectionConfigDelivery().equals(other.getInspectionConfigDelivery()))
&& (this.getInspectionDelivery() == null ? other.getInspectionDelivery() == null : this.getInspectionDelivery().equals(other.getInspectionDelivery()))
&& (this.getTransferDelivery() == null ? other.getTransferDelivery() == null : this.getTransferDelivery().equals(other.getTransferDelivery()))
&& (this.getTransferBaleDelivery() == null ? other.getTransferBaleDelivery() == null : this.getTransferBaleDelivery().equals(other.getTransferBaleDelivery()))
&& (this.getAbroadInboundDelivery() == null ? other.getAbroadInboundDelivery() == null : this.getAbroadInboundDelivery().equals(other.getAbroadInboundDelivery()))
&& (this.getSupplementarySales() == null ? other.getSupplementarySales() == null : this.getSupplementarySales().equals(other.getSupplementarySales()))
&& (this.getTurnoverSales() == null ? other.getTurnoverSales() == null : this.getTurnoverSales().equals(other.getTurnoverSales()))
&& (this.getTurnoverInbound() == null ? other.getTurnoverInbound() == null : this.getTurnoverInbound().equals(other.getTurnoverInbound()))
&& (this.getHistorySevendaySales() == null ? other.getHistorySevendaySales() == null : this.getHistorySevendaySales().equals(other.getHistorySevendaySales()))
&& (this.getHistoryFourteendaySales() == null ? other.getHistoryFourteendaySales() == null : this.getHistoryFourteendaySales().equals(other.getHistoryFourteendaySales()))
&& (this.getHistoryThirtydaySales() == null ? other.getHistoryThirtydaySales() == null : this.getHistoryThirtydaySales().equals(other.getHistoryThirtydaySales()))
&& (this.getSalesExplainDetails() == null ? other.getSalesExplainDetails() == null : this.getSalesExplainDetails().equals(other.getSalesExplainDetails()))
&& (this.getForecastTurnoverdaySales() == null ? other.getForecastTurnoverdaySales() == null : this.getForecastTurnoverdaySales().equals(other.getForecastTurnoverdaySales()))
&& (this.getStockUpSales() == null ? other.getStockUpSales() == null : this.getStockUpSales().equals(other.getStockUpSales()))
&& (this.getQuantityBeginAdvise() == null ? other.getQuantityBeginAdvise() == null : this.getQuantityBeginAdvise().equals(other.getQuantityBeginAdvise()))
&& (this.getStockUpDays() == null ? other.getStockUpDays() == null : this.getStockUpDays().equals(other.getStockUpDays()))
&& (this.getPaymentBeforeDelivery() == null ? other.getPaymentBeforeDelivery() == null : this.getPaymentBeforeDelivery().equals(other.getPaymentBeforeDelivery()))
&& (this.getProductCode() == null ? other.getProductCode() == null : this.getProductCode().equals(other.getProductCode()))
&& (this.getProductInnerCode() == null ? other.getProductInnerCode() == null : this.getProductInnerCode().equals(other.getProductInnerCode()))
&& (this.getBailunCategoryId() == null ? other.getBailunCategoryId() == null : this.getBailunCategoryId().equals(other.getBailunCategoryId()))
&& (this.getBuyerName() == null ? other.getBuyerName() == null : this.getBuyerName().equals(other.getBuyerName()))
&& (this.getSuppliersName() == null ? other.getSuppliersName() == null : this.getSuppliersName().equals(other.getSuppliersName()))
&& (this.getHistorySevendaySalesEbay() == null ? other.getHistorySevendaySalesEbay() == null : this.getHistorySevendaySalesEbay().equals(other.getHistorySevendaySalesEbay()))
&& (this.getHistoryFourteendaySalesEbay() == null ? other.getHistoryFourteendaySalesEbay() == null : this.getHistoryFourteendaySalesEbay().equals(other.getHistoryFourteendaySalesEbay()))
&& (this.getHistoryThirtydaySalesEbay() == null ? other.getHistoryThirtydaySalesEbay() == null : this.getHistoryThirtydaySalesEbay().equals(other.getHistoryThirtydaySalesEbay()))
&& (this.getHistorySevendaySalesAliexpress() == null ? other.getHistorySevendaySalesAliexpress() == null : this.getHistorySevendaySalesAliexpress().equals(other.getHistorySevendaySalesAliexpress()))
&& (this.getHistoryFourteendaySalesAliexpress() == null ? other.getHistoryFourteendaySalesAliexpress() == null : this.getHistoryFourteendaySalesAliexpress().equals(other.getHistoryFourteendaySalesAliexpress()))
&& (this.getHistoryThirtydaySalesAliexpress() == null ? other.getHistoryThirtydaySalesAliexpress() == null : this.getHistoryThirtydaySalesAliexpress().equals(other.getHistoryThirtydaySalesAliexpress()))
&& (this.getDailyWeightedSales() == null ? other.getDailyWeightedSales() == null : this.getDailyWeightedSales().equals(other.getDailyWeightedSales()))
&& (this.getOriginalQuantityInitAdvise() == null ? other.getOriginalQuantityInitAdvise() == null : this.getOriginalQuantityInitAdvise().equals(other.getOriginalQuantityInitAdvise()))
&& (this.getIsModifyQuantityInitAdvise() == null ? other.getIsModifyQuantityInitAdvise() == null : this.getIsModifyQuantityInitAdvise().equals(other.getIsModifyQuantityInitAdvise()))
&& (this.getTagId() == null ? other.getTagId() == null : this.getTagId().equals(other.getTagId()))
&& (this.getHqType() == null ? other.getHqType() == null : this.getHqType().equals(other.getHqType()))
&& (this.getHistorySevendaySalesAmazon() == null ? other.getHistorySevendaySalesAmazon() == null : this.getHistorySevendaySalesAmazon().equals(other.getHistorySevendaySalesAmazon()))
&& (this.getHistoryFourteendaySalesAmazon() == null ? other.getHistoryFourteendaySalesAmazon() == null : this.getHistoryFourteendaySalesAmazon().equals(other.getHistoryFourteendaySalesAmazon()))
&& (this.getHistoryThirtydaySalesAmazon() == null ? other.getHistoryThirtydaySalesAmazon() == null : this.getHistoryThirtydaySalesAmazon().equals(other.getHistoryThirtydaySalesAmazon()))
&& (this.getDcAutoSalesForecastConfigId() == null ? other.getDcAutoSalesForecastConfigId() == null : this.getDcAutoSalesForecastConfigId().equals(other.getDcAutoSalesForecastConfigId()))
&& (this.getIsOutStock() == null ? other.getIsOutStock() == null : this.getIsOutStock().equals(other.getIsOutStock()))
&& (this.getSalesDetailsFormula() == null ? other.getSalesDetailsFormula() == null : this.getSalesDetailsFormula().equals(other.getSalesDetailsFormula()));
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
*
* @mbg.generated
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getPurchaseAdviceId() == null) ? 0 : getPurchaseAdviceId().hashCode());
result = prime * result + ((getBailunSku() == null) ? 0 : getBailunSku().hashCode());
result = prime * result + ((getWarehouseCode() == null) ? 0 : getWarehouseCode().hashCode());
result = prime * result + ((getQuantityInitAdvise() == null) ? 0 : getQuantityInitAdvise().hashCode());
result = prime * result + ((getQuantityMinimumOrder() == null) ? 0 : getQuantityMinimumOrder().hashCode());
result = prime * result + ((getQuantityFinalAdvise() == null) ? 0 : getQuantityFinalAdvise().hashCode());
result = prime * result + ((getWarehouseName() == null) ? 0 : getWarehouseName().hashCode());
result = prime * result + ((getQuantityPromotion() == null) ? 0 : getQuantityPromotion().hashCode());
result = prime * result + ((getQuantityInventory() == null) ? 0 : getQuantityInventory().hashCode());
result = prime * result + ((getQuantityTransfer() == null) ? 0 : getQuantityTransfer().hashCode());
result = prime * result + ((getQuantityPurchase() == null) ? 0 : getQuantityPurchase().hashCode());
result = prime * result + ((getTurnoverDays() == null) ? 0 : getTurnoverDays().hashCode());
result = prime * result + ((getQuantitySafeInventory() == null) ? 0 : getQuantitySafeInventory().hashCode());
result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
result = prime * result + ((getGmtCreate() == null) ? 0 : getGmtCreate().hashCode());
result = prime * result + ((getGmtModified() == null) ? 0 : getGmtModified().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getQuantityOutStock() == null) ? 0 : getQuantityOutStock().hashCode());
result = prime * result + ((getSkuTitle() == null) ? 0 : getSkuTitle().hashCode());
result = prime * result + ((getPromotions() == null) ? 0 : getPromotions().hashCode());
result = prime * result + ((getSupplierDelivery() == null) ? 0 : getSupplierDelivery().hashCode());
result = prime * result + ((getInventoryAvailableDays() == null) ? 0 : getInventoryAvailableDays().hashCode());
result = prime * result + ((getQuantityInbound() == null) ? 0 : getQuantityInbound().hashCode());
result = prime * result + ((getForecastOnedaySales() == null) ? 0 : getForecastOnedaySales().hashCode());
result = prime * result + ((getForecastSevendaySales() == null) ? 0 : getForecastSevendaySales().hashCode());
result = prime * result + ((getForecastFourteendaySales() == null) ? 0 : getForecastFourteendaySales().hashCode());
result = prime * result + ((getSalesDetails() == null) ? 0 : getSalesDetails().hashCode());
result = prime * result + ((getInboundDetails() == null) ? 0 : getInboundDetails().hashCode());
result = prime * result + ((getInventoryDetails() == null) ? 0 : getInventoryDetails().hashCode());
result = prime * result + ((getShortSupplyDetails() == null) ? 0 : getShortSupplyDetails().hashCode());
result = prime * result + ((getAdvisedDetails() == null) ? 0 : getAdvisedDetails().hashCode());
result = prime * result + ((getSalesUpperLimit() == null) ? 0 : getSalesUpperLimit().hashCode());
result = prime * result + ((getAverageOverdue() == null) ? 0 : getAverageOverdue().hashCode());
result = prime * result + ((getAverageSupplierDelivery() == null) ? 0 : getAverageSupplierDelivery().hashCode());
result = prime * result + ((getTransferConfigDelivery() == null) ? 0 : getTransferConfigDelivery().hashCode());
result = prime * result + ((getTransferBaleConfigDelivery() == null) ? 0 : getTransferBaleConfigDelivery().hashCode());
result = prime * result + ((getAbroadInboundConfigDelivery() == null) ? 0 : getAbroadInboundConfigDelivery().hashCode());
result = prime * result + ((getInspectionConfigDelivery() == null) ? 0 : getInspectionConfigDelivery().hashCode());
result = prime * result + ((getInspectionDelivery() == null) ? 0 : getInspectionDelivery().hashCode());
result = prime * result + ((getTransferDelivery() == null) ? 0 : getTransferDelivery().hashCode());
result = prime * result + ((getTransferBaleDelivery() == null) ? 0 : getTransferBaleDelivery().hashCode());
result = prime * result + ((getAbroadInboundDelivery() == null) ? 0 : getAbroadInboundDelivery().hashCode());
result = prime * result + ((getSupplementarySales() == null) ? 0 : getSupplementarySales().hashCode());
result = prime * result + ((getTurnoverSales() == null) ? 0 : getTurnoverSales().hashCode());
result = prime * result + ((getTurnoverInbound() == null) ? 0 : getTurnoverInbound().hashCode());
result = prime * result + ((getHistorySevendaySales() == null) ? 0 : getHistorySevendaySales().hashCode());
result = prime * result + ((getHistoryFourteendaySales() == null) ? 0 : getHistoryFourteendaySales().hashCode());
result = prime * result + ((getHistoryThirtydaySales() == null) ? 0 : getHistoryThirtydaySales().hashCode());
result = prime * result + ((getSalesExplainDetails() == null) ? 0 : getSalesExplainDetails().hashCode());
result = prime * result + ((getForecastTurnoverdaySales() == null) ? 0 : getForecastTurnoverdaySales().hashCode());
result = prime * result + ((getStockUpSales() == null) ? 0 : getStockUpSales().hashCode());
result = prime * result + ((getQuantityBeginAdvise() == null) ? 0 : getQuantityBeginAdvise().hashCode());
result = prime * result + ((getStockUpDays() == null) ? 0 : getStockUpDays().hashCode());
result = prime * result + ((getPaymentBeforeDelivery() == null) ? 0 : getPaymentBeforeDelivery().hashCode());
result = prime * result + ((getProductCode() == null) ? 0 : getProductCode().hashCode());
result = prime * result + ((getProductInnerCode() == null) ? 0 : getProductInnerCode().hashCode());
result = prime * result + ((getBailunCategoryId() == null) ? 0 : getBailunCategoryId().hashCode());
result = prime * result + ((getBuyerName() == null) ? 0 : getBuyerName().hashCode());
result = prime * result + ((getSuppliersName() == null) ? 0 : getSuppliersName().hashCode());
result = prime * result + ((getHistorySevendaySalesEbay() == null) ? 0 : getHistorySevendaySalesEbay().hashCode());
result = prime * result + ((getHistoryFourteendaySalesEbay() == null) ? 0 : getHistoryFourteendaySalesEbay().hashCode());
result = prime * result + ((getHistoryThirtydaySalesEbay() == null) ? 0 : getHistoryThirtydaySalesEbay().hashCode());
result = prime * result + ((getHistorySevendaySalesAliexpress() == null) ? 0 : getHistorySevendaySalesAliexpress().hashCode());
result = prime * result + ((getHistoryFourteendaySalesAliexpress() == null) ? 0 : getHistoryFourteendaySalesAliexpress().hashCode());
result = prime * result + ((getHistoryThirtydaySalesAliexpress() == null) ? 0 : getHistoryThirtydaySalesAliexpress().hashCode());
result = prime * result + ((getDailyWeightedSales() == null) ? 0 : getDailyWeightedSales().hashCode());
result = prime * result + ((getOriginalQuantityInitAdvise() == null) ? 0 : getOriginalQuantityInitAdvise().hashCode());
result = prime * result + ((getIsModifyQuantityInitAdvise() == null) ? 0 : getIsModifyQuantityInitAdvise().hashCode());
result = prime * result + ((getTagId() == null) ? 0 : getTagId().hashCode());
result = prime * result + ((getHqType() == null) ? 0 : getHqType().hashCode());
result = prime * result + ((getHistorySevendaySalesAmazon() == null) ? 0 : getHistorySevendaySalesAmazon().hashCode());
result = prime * result + ((getHistoryFourteendaySalesAmazon() == null) ? 0 : getHistoryFourteendaySalesAmazon().hashCode());
result = prime * result + ((getHistoryThirtydaySalesAmazon() == null) ? 0 : getHistoryThirtydaySalesAmazon().hashCode());
result = prime * result + ((getDcAutoSalesForecastConfigId() == null) ? 0 : getDcAutoSalesForecastConfigId().hashCode());
result = prime * result + ((getIsOutStock() == null) ? 0 : getIsOutStock().hashCode());
result = prime * result + ((getSalesDetailsFormula() == null) ? 0 : getSalesDetailsFormula().hashCode());
return result;
}
}
data-common/src/main/java/com/bailuntec/mapper/JobAmazonAdLogMapper.xml
......@@ -518,6 +518,6 @@
where status = 0
and bj_create &lt; #{localDateTime}
and id % #{shardingContext.shardingTotalCount} = #{shardingContext.shardingItem}
order by bj_modified desc
order by report_date
</select>
</mapper>
data-common/src/main/java/com/bailuntec/utils/ReadSessionUtil.java 0 → 100644
package com.bailuntec.utils;
import com.bailuntec.domain.constant.CommonConstant;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.apache.ibatis.session.SqlSessionFactoryBuilder;
import java.io.Reader;
public class ReadSessionUtil {
//当前线程里面存放session
private static final ThreadLocal<SqlSession> threadLocal = new ThreadLocal<>();
private static final ThreadLocal<SqlSession> threadLocalTransction = new ThreadLocal<>();
private static Reader reader = null;
private static SqlSessionFactoryBuilder builder = null;
private static SqlSessionFactory factory = null;
//不允许对该类进行new操作
private ReadSessionUtil() {
}
static {
try {
//1.加载配置文件
reader = Resources.getResourceAsReader("mybatis-readonly-config.xml");
//2.得到工厂的创建对象
builder = new SqlSessionFactoryBuilder();
//3.得到工厂对象
factory = builder.build(reader);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("SqlSessionFactory初始化失败, 请检查配置文件路径和内容");
}
}
//获取自动提交session
public static SqlSession getSession() {
SqlSession session = threadLocal.get();
if (session == null) {
SqlSessionFactory factory = getFactory();
session = factory.openSession(true);
threadLocal.set(session);
}
return session;
}
//获取手动提交session
public static SqlSession getTranstionSession() {
SqlSession session = threadLocalTransction.get();
if (session == null) {
SqlSessionFactory factory = getFactory();
session = factory.openSession();
threadLocalTransction.set(session);
}
return session;
}
//关闭session
public static void closeTranstionSession() {
try {
SqlSession session = threadLocalTransction.get();
if (session != null) {
session.close();
}
threadLocalTransction.set(null);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("MYSQL关闭Session异常",e);
}
}
//关闭session
public static void closeSession() {
try {
SqlSession session = threadLocal.get();
if (session != null) {
session.close();
}
threadLocal.set(null);
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("MYSQL关闭Session异常",e);
}
}
//获得工厂对象
public static SqlSessionFactory getFactory() {
if (factory == null) {
factory = builder.build(reader);
}
return factory;
}
}
data-common/src/main/resources/db-dev.properties
......@@ -2,3 +2,7 @@ driver=com.mysql.jdbc.Driver
url=jdbc:mysql://gz-cdb-kp7s5i79.sql.tencentcdb.com:61691/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username=root
password=#7kfnymAM$Y9-Ntf
readonly-url=jdbc:mysql://gz-cdbrg-qdyec2j3.sql.tencentcdb.com:59667/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
readonly-username=root
readonly-password=#7kfnymAM$Y9-Ntf
data-common/src/main/resources/db-prod.properties
......@@ -2,3 +2,9 @@ driver=com.mysql.jdbc.Driver
url=jdbc:mysql://10.0.8.15:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username=root
password=#7kfnymAM$Y9-Ntf
readonly-url=jdbc:mysql://10.0.8.21:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
readonly-username=root
readonly-password=#7kfnymAM$Y9-Ntf
data-common/src/main/resources/logback.xml
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="true">
<configuration scan="false" scanPeriod="60 seconds" debug="true">
<!-- 彩色日志格式 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
<conversionRule conversionWord="wex"
......
data-common/src/main/resources/mybatis-readonly-config.xml 0 → 100644
<!--<?xml version="1.0" encoding="UTF-8" ?>-->
<!--<!DOCTYPE configuration-->
<!-- PUBLIC "-//mybatis.org//DTD Config 3.0//EN"-->
<!-- "http://mybatis.org/dtd/mybatis-3-config.dtd">-->
<!--<configuration>-->
<!-- &lt;!&ndash;<properties resource="db-tj.properties"/>&ndash;&gt;-->
<!-- <properties resource="readonly-db-dev.properties"/>-->
<!-- &lt;!&ndash; <properties resource="readonly-db-prod.properties"/>&ndash;&gt;-->
<!-- <settings>-->
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/>-->
<!-- </settings>-->
<!-- <typeAliases>-->
<!-- <typeAlias type="com.bailuntec.support.DruidDataSourceFactory" alias="DRUID"/>-->
<!-- <package name="com.bailuntec.domain"/>-->
<!-- </typeAliases>-->
<!-- &lt;!&ndash; <plugins>&ndash;&gt;-->
<!-- &lt;!&ndash; <plugin interceptor="com.bailuntec.support.SqlCostInterceptor"/>&ndash;&gt;-->
<!-- &lt;!&ndash; </plugins>&ndash;&gt;-->
<!-- <environments default="work">-->
<!-- <environment id="work">-->
<!-- <transactionManager type="JDBC"/>-->
<!-- <dataSource type="DRUID">-->
<!-- <property name="driver" value="${driver}"/>-->
<!-- <property name="url" value="${url}"/>-->
<!-- <property name="username" value="${username}"/>-->
<!-- <property name="password" value="${password}"/>-->
<!-- </dataSource>-->
<!-- </environment>-->
<!-- </environments>-->
<!-- <mappers>-->
<!-- <package name="com.bailuntec.mapper"/>-->
<!-- </mappers>-->
<!--</configuration>-->
data-common/src/main/resources/readonly-db-dev.properties 0 → 100644
driver=com.mysql.jdbc.Driver
url=jdbc:mysql://gz-cdbrg-qdyec2j3.sql.tencentcdb.com:59667/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username=root
password=#7kfnymAM$Y9-Ntf
data-common/src/main/resources/readonly-db-prod.properties 0 → 100644
driver=com.mysql.jdbc.Driver
url=jdbc:mysql://10.0.8.21:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull
username=root
password=#7kfnymAM$Y9-Ntf
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
......@@ -217,6 +217,7 @@ public class AutoTurnoverJob extends PointJob {
//库存对应的仓库
dcBaseWarehouse = baseWarehouseMapper.selectOneByExample(DcBaseWarehouseExample.newAndCreateCriteria().andWarehouseCodeEqualTo(warehouseCode).example());
BigDecimal incrementalRatio = BigDecimal.ONE;
int compareSales = 0;
//销量
DcAutoSalesMapper autoSalesMapper;
......
data-show/show-auto-turnover/src/main/java/com/bailuntec/service/impl/AutoTurnoverServiceImpl.java
......@@ -5,6 +5,7 @@ import com.bailuntec.domain.entity.DcAutoTurnover;
import com.bailuntec.mapper.DcAutoSalesForecastStageConfigMapper;
import com.bailuntec.mapper.DcBaseOmsSkuMapper;
import com.bailuntec.service.AutoTurnoverService;
import com.bailuntec.utils.ReadSessionUtil;
import com.bailuntec.utils.SessionUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.SqlSession;
......@@ -29,7 +30,8 @@ public class AutoTurnoverServiceImpl implements AutoTurnoverService {
@Override
public List<BigDecimal> getAutoTurnoverSaleDetails(DcAutoTurnover dcAutoTurnover, int turnoverDays, int autoForecastDay) {
SqlSession session = SessionUtil.getFactory().openSession(true);
SqlSession session = ReadSessionUtil.getFactory().openSession(true);
// SqlSession readOnlySession = ReadSessionUtil.getFactory().openSession(true);
try {
Queue<BigDecimal> forecastSalesDetails = new LinkedList<>();
......
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