Skip to content

D
dc-java
Commit 251b9d30 by huluobin
Options

# 更新

parent 63e42dc7
Showing with 105 additions and 19 deletions
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnover.java
......@@ -405,15 +405,6 @@ public class DcAutoTurnover {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.transfer_sail_days
*
* @mbg.generated
*/
private Integer transferSailDays;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.supplementary_sales
*
* @mbg.generated
......@@ -801,6 +792,15 @@ public class DcAutoTurnover {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.transfer_sail_days
*
* @mbg.generated
*/
private Integer transferSailDays;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.transfer_order_days
*
* @mbg.generated
......@@ -808,6 +808,51 @@ public class DcAutoTurnover {
private Integer transferOrderDays;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.is_mother_sku
*
* @mbg.generated
*/
private Integer isMotherSku;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.bailun_sku_warehouse_code
*
* @mbg.generated
*/
private String bailunSkuWarehouseCode;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_sevenday_sales_walmart
*
* @mbg.generated
*/
private BigDecimal historySevendaySalesWalmart;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_fourteenday_sales_walmart
*
* @mbg.generated
*/
private BigDecimal historyFourteendaySalesWalmart;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dc_auto_turnover.history_thirtyday_sales_walmart
*
* @mbg.generated
*/
private BigDecimal historyThirtydaySalesWalmart;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dc_auto_turnover
*
......@@ -863,7 +908,6 @@ public class DcAutoTurnover {
sb.append(", transferBaleDeliverySource=").append(transferBaleDeliverySource);
sb.append(", abroadInboundDelivery=").append(abroadInboundDelivery);
sb.append(", abroadInboundDeliverySource=").append(abroadInboundDeliverySource);
sb.append(", transferSailDays=").append(transferSailDays);
sb.append(", supplementarySales=").append(supplementarySales);
sb.append(", turnoverSales=").append(turnoverSales);
sb.append(", turnoverInbound=").append(turnoverInbound);
......@@ -907,7 +951,13 @@ public class DcAutoTurnover {
sb.append(", ordersAvg=").append(ordersAvg);
sb.append(", advUid=").append(advUid);
sb.append(", purchaseCreateOrderDays=").append(purchaseCreateOrderDays);
sb.append(", transferSailDays=").append(transferSailDays);
sb.append(", transferOrderDays=").append(transferOrderDays);
sb.append(", isMotherSku=").append(isMotherSku);
sb.append(", bailunSkuWarehouseCode=").append(bailunSkuWarehouseCode);
sb.append(", historySevendaySalesWalmart=").append(historySevendaySalesWalmart);
sb.append(", historyFourteendaySalesWalmart=").append(historyFourteendaySalesWalmart);
sb.append(", historyThirtydaySalesWalmart=").append(historyThirtydaySalesWalmart);
sb.append("]");
return sb.toString();
}
......@@ -974,7 +1024,6 @@ public class DcAutoTurnover {
&& (this.getTransferBaleDeliverySource() == null ? other.getTransferBaleDeliverySource() == null : this.getTransferBaleDeliverySource().equals(other.getTransferBaleDeliverySource()))
&& (this.getAbroadInboundDelivery() == null ? other.getAbroadInboundDelivery() == null : this.getAbroadInboundDelivery().equals(other.getAbroadInboundDelivery()))
&& (this.getAbroadInboundDeliverySource() == null ? other.getAbroadInboundDeliverySource() == null : this.getAbroadInboundDeliverySource().equals(other.getAbroadInboundDeliverySource()))
&& (this.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
&& (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()))
......@@ -1018,7 +1067,13 @@ public class DcAutoTurnover {
&& (this.getOrdersAvg() == null ? other.getOrdersAvg() == null : this.getOrdersAvg().equals(other.getOrdersAvg()))
&& (this.getAdvUid() == null ? other.getAdvUid() == null : this.getAdvUid().equals(other.getAdvUid()))
&& (this.getPurchaseCreateOrderDays() == null ? other.getPurchaseCreateOrderDays() == null : this.getPurchaseCreateOrderDays().equals(other.getPurchaseCreateOrderDays()))
&& (this.getTransferOrderDays() == null ? other.getTransferOrderDays() == null : this.getTransferOrderDays().equals(other.getTransferOrderDays()));
&& (this.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
&& (this.getTransferOrderDays() == null ? other.getTransferOrderDays() == null : this.getTransferOrderDays().equals(other.getTransferOrderDays()))
&& (this.getIsMotherSku() == null ? other.getIsMotherSku() == null : this.getIsMotherSku().equals(other.getIsMotherSku()))
&& (this.getBailunSkuWarehouseCode() == null ? other.getBailunSkuWarehouseCode() == null : this.getBailunSkuWarehouseCode().equals(other.getBailunSkuWarehouseCode()))
&& (this.getHistorySevendaySalesWalmart() == null ? other.getHistorySevendaySalesWalmart() == null : this.getHistorySevendaySalesWalmart().equals(other.getHistorySevendaySalesWalmart()))
&& (this.getHistoryFourteendaySalesWalmart() == null ? other.getHistoryFourteendaySalesWalmart() == null : this.getHistoryFourteendaySalesWalmart().equals(other.getHistoryFourteendaySalesWalmart()))
&& (this.getHistoryThirtydaySalesWalmart() == null ? other.getHistoryThirtydaySalesWalmart() == null : this.getHistoryThirtydaySalesWalmart().equals(other.getHistoryThirtydaySalesWalmart()));
}
/**
......@@ -1075,7 +1130,6 @@ public class DcAutoTurnover {
result = prime * result + ((getTransferBaleDeliverySource() == null) ? 0 : getTransferBaleDeliverySource().hashCode());
result = prime * result + ((getAbroadInboundDelivery() == null) ? 0 : getAbroadInboundDelivery().hashCode());
result = prime * result + ((getAbroadInboundDeliverySource() == null) ? 0 : getAbroadInboundDeliverySource().hashCode());
result = prime * result + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().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());
......@@ -1119,7 +1173,13 @@ public class DcAutoTurnover {
result = prime * result + ((getOrdersAvg() == null) ? 0 : getOrdersAvg().hashCode());
result = prime * result + ((getAdvUid() == null) ? 0 : getAdvUid().hashCode());
result = prime * result + ((getPurchaseCreateOrderDays() == null) ? 0 : getPurchaseCreateOrderDays().hashCode());
result = prime * result + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().hashCode());
result = prime * result + ((getTransferOrderDays() == null) ? 0 : getTransferOrderDays().hashCode());
result = prime * result + ((getIsMotherSku() == null) ? 0 : getIsMotherSku().hashCode());
result = prime * result + ((getBailunSkuWarehouseCode() == null) ? 0 : getBailunSkuWarehouseCode().hashCode());
result = prime * result + ((getHistorySevendaySalesWalmart() == null) ? 0 : getHistorySevendaySalesWalmart().hashCode());
result = prime * result + ((getHistoryFourteendaySalesWalmart() == null) ? 0 : getHistoryFourteendaySalesWalmart().hashCode());
result = prime * result + ((getHistoryThirtydaySalesWalmart() == null) ? 0 : getHistoryThirtydaySalesWalmart().hashCode());
return result;
}
}
\ No newline at end of file
data-common/src/main/java/com/bailuntec/domain/entity/DcAutoTurnoverWithBLOBs.java
......@@ -116,7 +116,6 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
&& (this.getTransferBaleDeliverySource() == null ? other.getTransferBaleDeliverySource() == null : this.getTransferBaleDeliverySource().equals(other.getTransferBaleDeliverySource()))
&& (this.getAbroadInboundDelivery() == null ? other.getAbroadInboundDelivery() == null : this.getAbroadInboundDelivery().equals(other.getAbroadInboundDelivery()))
&& (this.getAbroadInboundDeliverySource() == null ? other.getAbroadInboundDeliverySource() == null : this.getAbroadInboundDeliverySource().equals(other.getAbroadInboundDeliverySource()))
&& (this.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
&& (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()))
......@@ -160,7 +159,13 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
&& (this.getOrdersAvg() == null ? other.getOrdersAvg() == null : this.getOrdersAvg().equals(other.getOrdersAvg()))
&& (this.getAdvUid() == null ? other.getAdvUid() == null : this.getAdvUid().equals(other.getAdvUid()))
&& (this.getPurchaseCreateOrderDays() == null ? other.getPurchaseCreateOrderDays() == null : this.getPurchaseCreateOrderDays().equals(other.getPurchaseCreateOrderDays()))
&& (this.getTransferSailDays() == null ? other.getTransferSailDays() == null : this.getTransferSailDays().equals(other.getTransferSailDays()))
&& (this.getTransferOrderDays() == null ? other.getTransferOrderDays() == null : this.getTransferOrderDays().equals(other.getTransferOrderDays()))
&& (this.getIsMotherSku() == null ? other.getIsMotherSku() == null : this.getIsMotherSku().equals(other.getIsMotherSku()))
&& (this.getBailunSkuWarehouseCode() == null ? other.getBailunSkuWarehouseCode() == null : this.getBailunSkuWarehouseCode().equals(other.getBailunSkuWarehouseCode()))
&& (this.getHistorySevendaySalesWalmart() == null ? other.getHistorySevendaySalesWalmart() == null : this.getHistorySevendaySalesWalmart().equals(other.getHistorySevendaySalesWalmart()))
&& (this.getHistoryFourteendaySalesWalmart() == null ? other.getHistoryFourteendaySalesWalmart() == null : this.getHistoryFourteendaySalesWalmart().equals(other.getHistoryFourteendaySalesWalmart()))
&& (this.getHistoryThirtydaySalesWalmart() == null ? other.getHistoryThirtydaySalesWalmart() == null : this.getHistoryThirtydaySalesWalmart().equals(other.getHistoryThirtydaySalesWalmart()))
&& (this.getSalesDetails() == null ? other.getSalesDetails() == null : this.getSalesDetails().equals(other.getSalesDetails()))
&& (this.getShortSupplyDetails() == null ? other.getShortSupplyDetails() == null : this.getShortSupplyDetails().equals(other.getShortSupplyDetails()))
&& (this.getSalesDetailsFormula() == null ? other.getSalesDetailsFormula() == null : this.getSalesDetailsFormula().equals(other.getSalesDetailsFormula()));
......@@ -220,7 +225,6 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
result = prime * result + ((getTransferBaleDeliverySource() == null) ? 0 : getTransferBaleDeliverySource().hashCode());
result = prime * result + ((getAbroadInboundDelivery() == null) ? 0 : getAbroadInboundDelivery().hashCode());
result = prime * result + ((getAbroadInboundDeliverySource() == null) ? 0 : getAbroadInboundDeliverySource().hashCode());
result = prime * result + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().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());
......@@ -264,7 +268,13 @@ public class DcAutoTurnoverWithBLOBs extends DcAutoTurnover {
result = prime * result + ((getOrdersAvg() == null) ? 0 : getOrdersAvg().hashCode());
result = prime * result + ((getAdvUid() == null) ? 0 : getAdvUid().hashCode());
result = prime * result + ((getPurchaseCreateOrderDays() == null) ? 0 : getPurchaseCreateOrderDays().hashCode());
result = prime * result + ((getTransferSailDays() == null) ? 0 : getTransferSailDays().hashCode());
result = prime * result + ((getTransferOrderDays() == null) ? 0 : getTransferOrderDays().hashCode());
result = prime * result + ((getIsMotherSku() == null) ? 0 : getIsMotherSku().hashCode());
result = prime * result + ((getBailunSkuWarehouseCode() == null) ? 0 : getBailunSkuWarehouseCode().hashCode());
result = prime * result + ((getHistorySevendaySalesWalmart() == null) ? 0 : getHistorySevendaySalesWalmart().hashCode());
result = prime * result + ((getHistoryFourteendaySalesWalmart() == null) ? 0 : getHistoryFourteendaySalesWalmart().hashCode());
result = prime * result + ((getHistoryThirtydaySalesWalmart() == null) ? 0 : getHistoryThirtydaySalesWalmart().hashCode());
result = prime * result + ((getSalesDetails() == null) ? 0 : getSalesDetails().hashCode());
result = prime * result + ((getShortSupplyDetails() == null) ? 0 : getShortSupplyDetails().hashCode());
result = prime * result + ((getSalesDetailsFormula() == null) ? 0 : getSalesDetailsFormula().hashCode());
......
data-common/src/main/resources/init.properties
table-name=dc_report_profit_analysis
table-name=dc_auto_turnover
data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java
......@@ -208,7 +208,7 @@ public class AutoTurnoverJob extends PointJob {
if (!"国内仓".equals(dcBaseWarehouse.getHqType())) {
transferStrategy.set(Constant.OCEAN_HEAD);
this.autoTurnoverFromStock(queryTime, dcBaseStock);
transferStrategy.remove();
......@@ -326,6 +326,7 @@ public class AutoTurnoverJob extends PointJob {
}
dcAutoTurnover.setBailunSku(bailunSku);
dcAutoTurnover.setWarehouseCode(warehouseCode);
dcAutoTurnover.setBailunSkuWarehouseCode(bailunSku + "_" + warehouseCode);
//写入仓库名
if (dcBaseWarehouse != null) {
dcAutoTurnover.setWarehouseName(dcBaseWarehouse.getWarehouseName());
......@@ -905,6 +906,8 @@ public class AutoTurnoverJob extends PointJob {
private void calculatePlatformAvgSales(DcAutoTurnoverWithBLOBs dcAutoTurnover) {
try {
DcAutoSalesMapper mapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
//ebay
SalesVolumeAvgDTO ebayAvgSales = mapper.getPlatformHistorySales(dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode(), PlatformType.Ebay.value());
dcAutoTurnover.setHistorySevendaySalesEbay(BigDecimal.ZERO);
dcAutoTurnover.setHistoryFourteendaySalesEbay(BigDecimal.ZERO);
......@@ -915,7 +918,7 @@ public class AutoTurnoverJob extends PointJob {
dcAutoTurnover.setHistoryThirtydaySalesEbay(BigDecimal.valueOf(ebayAvgSales.getThirtydaySales()).divide(Constant.BIGDECIMAL_THIRTY, 3, RoundingMode.HALF_EVEN));
}
mapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
//aliexpress
SalesVolumeAvgDTO aliexpressAvgSales = mapper.getPlatformHistorySales(dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode(), PlatformType.Aliexpress.value());
dcAutoTurnover.setHistorySevendaySalesAliexpress(BigDecimal.ZERO);
dcAutoTurnover.setHistoryFourteendaySalesAliexpress(BigDecimal.ZERO);
......@@ -926,7 +929,7 @@ public class AutoTurnoverJob extends PointJob {
dcAutoTurnover.setHistoryThirtydaySalesAliexpress(BigDecimal.valueOf(aliexpressAvgSales.getThirtydaySales()).divide(Constant.BIGDECIMAL_THIRTY, 3, RoundingMode.HALF_EVEN));
}
mapper = SessionUtil.getSession().getMapper(DcAutoSalesMapper.class);
//amazon
SalesVolumeAvgDTO amazonAvgSales = mapper.getPlatformHistorySales(dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode(), PlatformType.Amazon.value());
dcAutoTurnover.setHistorySevendaySalesAmazon(BigDecimal.ZERO);
dcAutoTurnover.setHistoryFourteendaySalesAmazon(BigDecimal.ZERO);
......@@ -936,6 +939,18 @@ public class AutoTurnoverJob extends PointJob {
dcAutoTurnover.setHistoryFourteendaySalesAmazon(BigDecimal.valueOf(amazonAvgSales.getFourteendaySales()).divide(Constant.BIGDECIMAL_FOURTEEN, 3, RoundingMode.HALF_EVEN));
dcAutoTurnover.setHistoryThirtydaySalesAmazon(BigDecimal.valueOf(amazonAvgSales.getThirtydaySales()).divide(Constant.BIGDECIMAL_THIRTY, 3, RoundingMode.HALF_EVEN));
}
//Walmart
SalesVolumeAvgDTO walmartAvgSales = mapper.getPlatformHistorySales(dcAutoTurnover.getBailunSku(), dcAutoTurnover.getWarehouseCode(), PlatformType.Walmart.value());
dcAutoTurnover.setHistorySevendaySalesWalmart(BigDecimal.ZERO);
dcAutoTurnover.setHistoryFourteendaySalesWalmart(BigDecimal.ZERO);
dcAutoTurnover.setHistoryThirtydaySalesWalmart(BigDecimal.ZERO);
if (walmartAvgSales != null) {
dcAutoTurnover.setHistorySevendaySalesAmazon(BigDecimal.valueOf(walmartAvgSales.getSevendaySales()).divide(Constant.BIGDECIMAL_SEVEN, 3, RoundingMode.HALF_EVEN));
dcAutoTurnover.setHistoryFourteendaySalesAmazon(BigDecimal.valueOf(walmartAvgSales.getFourteendaySales()).divide(Constant.BIGDECIMAL_FOURTEEN, 3, RoundingMode.HALF_EVEN));
dcAutoTurnover.setHistoryThirtydaySalesAmazon(BigDecimal.valueOf(walmartAvgSales.getThirtydaySales()).divide(Constant.BIGDECIMAL_THIRTY, 3, RoundingMode.HALF_EVEN));
}
} catch (Exception e) {
throw new RuntimeException("计算平台的平均销量失败", e);
} finally {
......
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