Skip to content

B
bailuntec-datacenter
Commit dd99f46f by huluobin
Options

update

parent 8f72b738
Showing with 552 additions and 17 deletions
datacenter-base/base-sync-amazon-ad/pom.xml
......@@ -16,6 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<skipTests>true</skipTests>
</properties>
<artifactId>base-sync-amazon-ad</artifactId>
......
datacenter-base/base-sync-amazon-ad/src/main/java/com.bailuntec.job/AmazonAdJob.java → datacenter-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdJob.java
......@@ -2,13 +2,12 @@ package com.bailuntec.job;
import com.bailuntec.application.IDcBaseFinanceAmazonAdProductService;
import com.bailuntec.application.IJobAmazonAdLogService;
import com.bailuntec.job.service.AmazonJobService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.LocalDateTime;
/**
* <p>
......@@ -27,15 +26,19 @@ public class AmazonAdJob {
@Resource
private IDcBaseFinanceAmazonAdProductService dcBaseFinanceAmazonAdProductService;
@Resource
AmazonJobService amazonJobService;
/**
* <p>
* 每天下午1点生成昨天的亚马逊广告报告
* </p>
*/
@Scheduled(cron = "0 0 13 * * ?")
// @Scheduled(cron = "0 0 13 * * ?")
@Scheduled(cron = "0/1 * * * * ?")
public void generateAmazonAdReport() {
log.info("每天下午1点生成昨天的亚马逊广告报告 任务开始");
jobAmazonAdLogService.generateAmazonAdReport();
amazonJobService.generateAmazonAdReport();
log.info("每天下午1点生成昨天的亚马逊广告报告 任务结束");
}
......@@ -44,10 +47,11 @@ public class AmazonAdJob {
* 每小时下载未下载的报告
* </p>
*/
@Scheduled(cron = "0 1 0/1 * * ?")
@Scheduled(cron = "0/1 * * * * ?")
// @Scheduled(cron = "0 1 0/1 * * ?")
public void downloadAmazonAdReport() {
log.info("每小时下载未下载的报告 任务开始");
dcBaseFinanceAmazonAdProductService.downloadAmazonAdReport();
amazonJobService.downloadAmazonAdReport();
log.info("每小时下载未下载的报告 任务结束");
}
......
datacenter-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdProduct.java 0 → 100644
package com.bailuntec.job;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class AmazonAdProduct {
@JSONField(name = "campaignName")
private String campaignName;
@JSONField(name = "campaignId")
private String campaignId;
@JSONField(name = "adGroupName")
private String adGroupName;
@JSONField(name = "adGroupId")
private String adGroupId;
@JSONField(name = "impressions")
private Integer impressions;
@JSONField(name = "clicks")
private Integer clicks;
@JSONField(name = "cost")
private BigDecimal cost;
@JSONField(name = "currency")
private String currency;
@JSONField(name = "asin")
private String asin;
@JSONField(name = "sku")
private String sku;
@JSONField(name = "attributedConversions1d")
private Integer attributedConversionsOneday;
@JSONField(name = "attributedConversions7d")
private Integer attributedConversionsSevenday;
@JSONField(name = "attributedConversions14d")
private Integer attributedConversionsFourteenday;
@JSONField(name = "attributedConversions30d")
private Integer attributedConversionsThirtyday;
@JSONField(name = "attributedConversions1dSameSKU")
private String attributedConversionsOnedaySameSku;
@JSONField(name = "attributedConversions7dSameSKU")
private String attributedConversionsSevendaySameSku;
@JSONField(name = "attributedConversions14dSameSKU")
private String attributedConversionsFourteendaySameSku;
@JSONField(name = "attributedConversions30dSameSKU")
private String attributedConversionsThirtydaySameSku;
@JSONField(name = "attributedUnitsOrdered1d")
private Integer attributedUnitsOrderedOneday;
@JSONField(name = "attributedUnitsOrdered7d")
private Integer attributedUnitsOrderedSevenday;
@JSONField(name = "attributedUnitsOrdered14d")
private String attributedUnitsOrderedFourteenday;
@JSONField(name = "attributedUnitsOrdered30d")
private String attributedUnitsOrderedThirtyday;
@JSONField(name = "attributedSales1d")
private Integer attributedSalesOneday;
@JSONField(name = "attributedSales7d")
private Integer attributedSalesSevenday;
@JSONField(name = "attributedSales14d")
private Integer attributedSalesFourteenday;
@JSONField(name = "attributedSales30d")
private Integer attributedSalesThirtyday;
@JSONField(name = "attributedSales1dSameSKU")
private String attributedSalesOnedaySameSku;
@JSONField(name = "attributedSales7dSameSKU")
private String attributedSalesSevendaySameSku;
@JSONField(name = "attributedSales14dSameSKU")
private String attributedSalesFourteendaySameSku;
@JSONField(name = "attributedSales30dSameSKU")
private String attributedSalesThirtydaySameSku;
@JSONField(name = "attributedUnitsOrdered1dSameSKU")
private String attributedUnitsOrderedOnedaySameSku;
@JSONField(name = "attributedUnitsOrdered7dSameSKU")
private String attributedUnitsOrderedSevendaySameSku;
@JSONField(name = "attributedUnitsOrdered14dSameSKU")
private String attributedUnitsOrderedFourteendaySameSku;
@JSONField(name = "attributedUnitsOrdered30dSameSKU")
private String attributedUnitsOrderedThirtydaySameSku;
}
datacenter-base/base-sync-amazon-ad/src/main/resources/application-prod.yml
......@@ -25,7 +25,7 @@ metrics:
feign:
hystrix:
enabled: true
enabled: false
client:
config:
default:
......
datacenter-base/base-sync-amazon-ad/src/main/resources/application-test.yml
......@@ -24,7 +24,7 @@ metrics:
feign:
hystrix:
enabled: true
enabled: false
client:
config:
default:
......
datacenter-base/base-sync-amazon-ad/src/test/java/com/bailuntec/job/service/AmazonJobServiceTest.java 0 → 100644
package com.bailuntec.job.service;
import com.bailuntec.job.AmazonApp;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.netflix.hystrix.EnableHystrix;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
import static org.junit.jupiter.api.Assertions.*;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/11/12 3:24 下午
*/
@ActiveProfiles(value = "test")
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest(classes = AmazonApp.class)
class AmazonJobServiceTest {
@Resource
AmazonJobService amazonJobService;
@Test
void generateAmazonAdReport() {
amazonJobService.generateAmazonAdReport();
}
@Test
void downloadAmazonAdReport(){
amazonJobService.downloadAmazonAdReport();
}
}
datacenter-base/base-sync-oms-order/src/main/java/com/bailuntec/job/SyncOmsJob.java
......@@ -19,7 +19,7 @@ public class SyncOmsJob {
public void baseSyncFinanceFee() {
try {
log.info("每分钟同步费用单 开始");
syncOmsOrder.sync();
syncOmsOrder.syncOrder();
log.info("每分钟同步费用单 结束");
} catch (Exception ex) {
log.error("每分钟同步费用单 异常:", ex);
......
datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/job/service/BalanceSheetService.java
......@@ -110,7 +110,7 @@ public class BalanceSheetService {
LocalDate date = dcJobConfig.getStartTime().toLocalDate();
LambdaQueryWrapper<DcWithdrawOnWay> wrapper = new LambdaQueryWrapper<DcWithdrawOnWay>()
.eq(DcWithdrawOnWay::getStatisticalTime, date));
.eq(DcWithdrawOnWay::getStatisticalTime, date);
//如果指定日期在途金额 快照已经存在 跳过
if (dcWithdrawOnWayService.count(wrapper) > 0) {
......@@ -264,6 +264,60 @@ public class BalanceSheetService {
@Resource
IDcPlatformBalanceService dcPlatformBalanceService;
// @Transactional(rollbackFor = Exception.class)
// public void syncSemiInventoryBalance() {
// boolean isOk = true;
// String param = "?btime=" + DateTimeUtil.dateToString(date, DateTimeUtil.DATE_FORMAT) + "&etime=" + DateTimeUtil.dateToString(datePlusOne, DateTimeUtil.DATE_FORMAT);
//
// try {
// SemiResultDTO<JSONArray> responseDTO = JSONObject.parseObject(HttpUtil.httpGet(getSemiSupOfferLogUrl + param), SemiResultDTO.class);
// if (responseDTO.getSuccess() && responseDTO.getData().size() > 0) {
// List<SemiSupOfferLogDTO> semiSupOfferLogDTOList = JSONObject.parseArray(responseDTO.getData().toJSONString(), SemiSupOfferLogDTO.class);
// dcSemiSupplierOfferLogMapper.insertOrUpdateSemiSupplierOfferLog(semiSupOfferLogDTOList);
// }
// } catch (Exception e) {
// e.printStackTrace();
// logger.error(">>>>>获取半成品供应商报价流水出错" + e.getMessage());
// isOk = false;
// }
// int rows = 5000;
// int page = 1;
// try {
// param = "?btime=" + DateTimeUtil.dateToString(DateTimeUtil.addDays(datePlusOne, -3), DateTimeUtil.DATE_FORMAT) + "&etime=" + DateTimeUtil.dateToString(datePlusOne, DateTimeUtil.DATE_FORMAT);
// SemiPageResultDTO responseDTO = JSONObject.parseObject(HttpUtil.httpGet(getSemiStockLogUrl + param +
// "&page=" + page + "&rows=" + rows), SemiPageResultDTO.class);
// if (responseDTO.getSuccess() && responseDTO.getData().getTotalItems() > 0) {
// dcSemiStockLogMapper.insertOrUpdateSemiStockLog(responseDTO.getData().getItems());
// int totalPages = responseDTO.getData().getTotalPages();
// responseDTO = null;
// while (page < totalPages) {
// page += 1;
// try {
// responseDTO = JSONObject.parseObject(HttpUtil.httpGet(getSemiStockLogUrl + param + "&page=" + page + "&rows=" + rows), SemiPageResultDTO.class);
// if (responseDTO.getData() != null && responseDTO.getData().getItems() != null) {
// dcSemiStockLogMapper.insertOrUpdateSemiStockLog(responseDTO.getData().getItems());
// }
// responseDTO = null;
// } catch (Exception e) {
// e.printStackTrace();
// logger.error(">>>>>获取半成品库存流水出错，请求分页数：" + page + "\n" + e.getMessage());
// isOk = false;
// continue;
// }
// }
// }
// } catch (Exception e) {
// e.printStackTrace();
// logger.error(">>>>>获取半成品库存流水出错，请求分页数：" + page + "\n" + e.getMessage());
// isOk = false;
// }
// // 生成半成品每日存货
// if (isOk) {
//// if (dcSem/**/ iDailyStockMapper.query(date) != null){
// dcSemiDailyStockMapper.insertSemiDailyStock(date);
// }
// }
@Transactional(rollbackFor = Exception.class)
public void syncPayPal() {
DcJobConfig dcJobConfig = dcJobConfigMapper.selectByName(financeSyncPayPal);
......@@ -317,6 +371,15 @@ public class BalanceSheetService {
@Resource
IDcBalanceSheetService dcBalanceSheetService;
@Resource
DcInventoryBalanceMapper dcInventoryBalanceMapper;
@Resource
DcSemiDailyStockMapper dcSemiDailyStockMapper;
@Resource
DcSemiDailyTransferMapper dcSemiDailyTransferMapper;
@Resource
DcExchangeRateMapper dcExchangeRateMapper;
/**
* 每天生成资产负债表
* companyValue 0
......@@ -375,6 +438,7 @@ public class BalanceSheetService {
Integer companyValue = 0;
String companyName = "百伦供应链";
LocalDate date = dcJobConfig.getStartTime().toLocalDate();
DcBalanceSheet dcBalanceSheet = dcBalanceSheetMapper.selectOne(new LambdaQueryWrapper<DcBalanceSheet>()
......@@ -416,12 +480,100 @@ public class BalanceSheetService {
BigDecimal otherAccountsReceivableImport = dcBalanceSheetMapper.getOtherAccountsReceivableImport(date);
dcBalanceSheet.setOtherAccountsReceivable(amountBorrowedSum.add(otherAccountsReceivableImport));
//固定资产
BigDecimal fixedAssetsSum = dcFixedAssetsDetailMapper.getFixedAssetsSum(date);
BigDecimal fixedAssetsImport = dcBalanceSheetMapper.getFixedAssetsImport(date);
dcBalanceSheet.setFixedAssets(fixedAssetsSum.add(fixedAssetsImport));
// // 货品库存
// dcInventoryBalanceMapper.deleteInventoryBalance(date);
// dcInventoryBalanceMapper.insertInventoryBalance(date);
//
// // 货品调拨在途
// dcInventoryBalanceMapper.insertTransferInventoryBalance(date);
// FBA在库金额
BigDecimal fbaInventoryAmountSum = dcInventoryBalanceMapper.getFbaInventoryAmountSum(date);
dcBalanceSheet.setFbaInventoryAmount(fbaInventoryAmountSum);
// 非FBA在库金额(不包含耗材仓)
BigDecimal notFbaInventoryAmountSum = dcInventoryBalanceMapper.getNotFbaInventoryAmountSum(date);
dcBalanceSheet.setNotFbaInventoryAmount(notFbaInventoryAmountSum);
// 非FBA在库金额(耗材仓)
BigDecimal notFbaHcInventoryAmountSum = dcInventoryBalanceMapper.getNotFbaHcInventoryAmountSum(date);
dcBalanceSheet.setNotFbaHcInventoryAmount(notFbaHcInventoryAmountSum);
// FBA在途
BigDecimal fbaTransferAmountSum = dcInventoryBalanceMapper.getFbaTransferAmountSum(date);
dcBalanceSheet.setFbaTransferAmount(fbaTransferAmountSum);
// 非FBA在途金额(调拨+采购)
BigDecimal notFbaTransferAmountSum = dcInventoryBalanceMapper.getNotFbaTransferAmountSum(date);
dcBalanceSheet.setNotFbaTransferAmount(notFbaTransferAmountSum);
// FBA调拨在途金额(调拨不包含计划)
BigDecimal fbaTransferAllotAmountSum = dcInventoryBalanceMapper.getFbaTransferAllotAmountSum(date);
dcBalanceSheet.setFbaTransferAllotAmount(fbaTransferAllotAmountSum);
// 非FBA调拨在途金额(调拨不包含计划)
BigDecimal notFbaTransferAllotAmountSum = dcInventoryBalanceMapper.getNotFbaTransferAllotAmountSum(date);
dcBalanceSheet.setNotFbaTransferAllotAmount(notFbaTransferAllotAmountSum);
// FBA调拨计划在途金额
BigDecimal fbaTransferPlanAmountSum = dcInventoryBalanceMapper.getFbaTransferPlanAmountSum(date);
dcBalanceSheet.setFbaTransferPlanAmount(fbaTransferPlanAmountSum);
// 非FBA调拨计划在途金额
BigDecimal notFbaTransferPlanAmountSum = dcInventoryBalanceMapper.getNotFbaTransferPlanAmountSum(date);
dcBalanceSheet.setNotFbaTransferPlanAmount(notFbaTransferPlanAmountSum);
// FBA采购在途金额
BigDecimal fbaPurchaseAmountSum = dcInventoryBalanceMapper.getFbaPurchaseAmountSum(date);
if (fbaPurchaseAmountSum == null) fbaPurchaseAmountSum = BigDecimal.ZERO;
dcBalanceSheet.setFbaPurchaseAmount(fbaPurchaseAmountSum);
// 非FBA采购在途金额
BigDecimal notFbaPurchaseAmountSum = dcInventoryBalanceMapper.getNotFbaPurchaseAmountSum(date);
dcBalanceSheet.setNotFbaPurchaseAmount(notFbaPurchaseAmountSum);
// 自产采购在途金额
BigDecimal purchaseProAmountSum = dcInventoryBalanceMapper.getPurchaseProAmount(date);
dcBalanceSheet.setPurchaseProAmount(purchaseProAmountSum);
// 半成品在库金额
BigDecimal semiInventoryAmountSum = dcSemiDailyStockMapper.getSemiDailyStockSum(date);
dcBalanceSheet.setSemiInventoryAmount(semiInventoryAmountSum);
//半成品在库金额=百伦
BigDecimal semiBailunInventoryAmountSum = dcSemiDailyStockMapper.getSemiBailunDailyStockSum(date);
dcBalanceSheet.setSemiBailunInventoryAmount(semiBailunInventoryAmountSum);
//半成品在库金额-哈尼曼
BigDecimal semiHaNiInventoryAmountSum = dcSemiDailyStockMapper.getSemiHaNiDailyStockSum(date);
dcBalanceSheet.setSemiHaniInventoryAmount(semiHaNiInventoryAmountSum);
//半成品生产在库金额
BigDecimal semiProdInventoryAmountSum = dcSemiDailyStockMapper.getSemiProdInventoryAmountSum(date);
dcBalanceSheet.setSemiProdInventoryAmount(semiProdInventoryAmountSum);
// 半成品在途金额 恢复,不汇总进去存货里面
BigDecimal semiTransferAmountSum = dcSemiDailyTransferMapper.getSemiDailyTransferSum(date);
dcBalanceSheet.setSemiTransferAmount(semiTransferAmountSum);
//半成品在途金额=百伦
BigDecimal semiBailunTransferAmountSum = dcSemiDailyTransferMapper.getSemiBailunDailyTransferSum(date);
dcBalanceSheet.setSemiBailunTransferAmount(semiBailunTransferAmountSum);
//半成品在途金额=哈尼曼
BigDecimal semiHaNiTransferAmountSum = dcSemiDailyTransferMapper.getSemiHaNiDailyTransferSum(date);
dcBalanceSheet.setSemiHaniTransferAmount(semiHaNiTransferAmountSum);
// 存货 金额 FBA在库金额+非FBA在库金额(不包含耗材仓)+FBA调拨在途金额(不包含调拨计划)+非FBA调拨在途金额(不包含调拨计划)+半成品在库金额+半成品生产在库金额+自产采购在途
BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiBailunInventoryAmountSum).add(semiProdInventoryAmountSum).add(purchaseProAmountSum);
dcBalanceSheet.setInventoryAmount(inventoryBalanceSum);
dcBalanceSheetService.saveOrUpdate(dcBalanceSheet);
//更新任务时间
......
datacenter-show/show-auto-turnover/pom.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.bailuntec</groupId>
<artifactId>datacenter-show</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<skipTests>true</skipTests>
</properties>
<artifactId>show-auto-turnover</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.3.RELEASE</version>
<configuration>
<mainClass>com.bailuntec.job.AmazonApp</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.0.0</version>
<configuration>
<skipDockerBuild>false</skipDockerBuild>
<imageName>ccr.ccs.tencentyun.com/blt.data.job/show-auto-turnover:${maven.build.timestamp}
</imageName>
<dockerDirectory>src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
<serverId>bailuntec-docker</serverId>
</configuration>
</plugin>
</plugins>
</build>
</project>
datacenter-show/show-auto-turnover/src/main/docker/Dockerfile 0 → 100644
FROM openjdk:8-jdk-alpine
VOLUME /tmp
ADD base-sync-amazon-ad-1.0-SNAPSHOT.jar app.jar
RUN echo "Asia/Shanghai" > /etc/timezone
ENTRYPOINT ["java","-Xms300m","-Xmx600m","-jar","-Dspring.profiles.active=prod","/app.jar"]
EXPOSE 8080
datacenter-show/show-auto-turnover/src/main/java/com/bailuntec/job/service/DaySales.java 0 → 100644
package com.bailuntec.job.service;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/11/25 3:01 下午
*/
@Data
public class DaySales {
@ApiModelProperty("日期")
private LocalDate day;
@ApiModelProperty("销量")
private BigDecimal sales;
@ApiModelProperty("突增销量")
private BigDecimal uprushSales;
}
datacenter-show/show-auto-turnover/src/main/java/com/bailuntec/job/service/ShowAutoTurnover.java 0 → 100644
package com.bailuntec.job.service;
import com.bailuntec.domain.DcAutoUprushConfig;
import com.bailuntec.domain.DcBaseOmsSku30;
import com.bailuntec.domain.DcBaseStock;
import com.bailuntec.domain.DcBaseWarehouse;
import com.bailuntec.infrastructure.mapper.DcAutoSalesMapper;
import com.bailuntec.infrastructure.mapper.DcAutoUprushConfigMapper;
import com.bailuntec.infrastructure.mapper.DcBaseOmsSku30Mapper;
import com.bailuntec.infrastructure.mapper.DcBaseWarehouseMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/11/25 2:53 下午
*/
@Service
public class ShowAutoTurnover {
@Resource
DcBaseWarehouseMapper dcBaseWarehouseMapper;
@Resource
DcAutoSalesMapper dcAutoSalesMapper;
@Resource
DcAutoUprushConfigMapper dcAutoUprushConfigMapper;
@Resource
DcBaseOmsSku30Mapper dcBaseOmsSku30Mapper;
public static ThreadLocal<ShowAutoTurnoverParam> threadLocal = new ThreadLocal<>();
public void syncAutoTurnover(DcBaseStock dcBaseStock) {
LambdaQueryWrapper<DcBaseOmsSku30> wrapper = new LambdaQueryWrapper<>();
wrapper.lt(DcBaseOmsSku30::getPaidTime, threadLocal.get().getQueryTime())
.ne(DcBaseOmsSku30::getBailunOrderStatus, "Canceled")
.eq(DcBaseOmsSku30::getHasFbaS, 0)
.eq(DcBaseOmsSku30::getHasDelete, 0)
.eq(DcBaseOmsSku30::getHasScalp, 0)
.eq(DcBaseOmsSku30::getHasBuyerRemark, 0)
.eq(DcBaseOmsSku30::getHasPlatskuRemark, 0)
.eq(DcBaseOmsSku30::getHasInnersale, 0)
.eq(DcBaseOmsSku30::getBailunSku, dcBaseStock.getBailunSku())
.eq(DcBaseOmsSku30::getWarehouseCode, dcBaseStock.getWarehouseCode())
.ne(DcBaseOmsSku30::getPlatformOrderType, "手工单")
;
}
BigDecimal uprushSales() {
String bailunSku = threadLocal.get().getBailunSku();
String warehouseCode = threadLocal.get().getWarehouseCode();
DcBaseWarehouse dcBaseWarehouse = dcBaseWarehouseMapper.selectByWarehouseCode(warehouseCode);
// 获取7、14日均销量
BigDecimal agvSales = dcAutoSalesMapper.getSalesAvg(threadLocal.get().getQueryTime(), bailunSku, warehouseCode);
//如果仓库不为空
if (dcBaseWarehouse != null) {
//销量突增检测
DcAutoUprushConfig dcAutoUprushConfig = dcAutoUprushConfigMapper.selectByWarehouse(dcBaseWarehouse);
if (dcAutoUprushConfig != null && agvSales != null) {
// 突增销量 = (7+14日均销量)/2 * 突增率
BigDecimal incrementalRatio = BigDecimal.ONE.add(dcAutoUprushConfig.getPercentage());
return agvSales.multiply(incrementalRatio).setScale(0, RoundingMode.UP);
}
}
return BigDecimal.ZERO;
}
}
datacenter-show/show-auto-turnover/src/main/java/com/bailuntec/job/service/ShowAutoTurnoverParam.java 0 → 100644
package com.bailuntec.job.service;
import com.bailuntec.domain.DcBaseWarehouse;
import lombok.Data;
import java.time.LocalDateTime;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/11/25 3:19 下午
*/
@Data
public class ShowAutoTurnoverParam {
private LocalDateTime queryTime;
private String bailunSku;
private String warehouseCode;
private DcBaseWarehouse dcBaseWarehouse;
}
datacenter-base/base-sync-oms-order/target/classes/application-prod.yml → datacenter-show/show-auto-turnover/src/main/resources/application-prod.yml
spring:
# 服务名称
application:
name: base-sync-sample
name: base-sync-amazon-ad
# 数据配置
datasource:
url: jdbc:mysql://10.0.8.15:3306/bailun_datacenter?serverTimezone=GMT%2B8&characterEncoding=utf-8
......@@ -20,6 +20,9 @@ mybatis-plus:
metrics:
campaignName,campaignId,impressions,clicks,cost,currency,attributedConversions1d,attributedConversions7d,attributedConversions14d,attributedConversions30d,attributedConversions1dSameSKU,attributedConversions7dSameSKU,attributedConversions14dSameSKU,attributedConversions30dSameSKU,attributedUnitsOrdered1d,attributedUnitsOrdered7d,attributedUnitsOrdered14d,attributedUnitsOrdered30d,attributedSales1d,attributedSales7d,attributedSales14d,attributedSales30d,attributedSales1dSameSKU,attributedSales7dSameSKU,attributedSales14dSameSKU,attributedSales30dSameSKU,attributedUnitsOrdered1dSameSKU,attributedUnitsOrdered7dSameSKU,attributedUnitsOrdered14dSameSKU,attributedUnitsOrdered30dSameSKU
feign:
hystrix:
enabled: false
......
datacenter-base/base-sync-oms-order/target/classes/application-test.yml → datacenter-show/show-auto-turnover/src/main/resources/application-test.yml
spring:
# 服务名称
application:
name: base-sync-sample
name: base-sync-amazon-ad
# 数据配置
datasource:
url: jdbc:mysql://gz-cdb-kp7s5i79.sql.tencentcdb.com:61691/bailun_datacenter?serverTimezone=GMT%2B8&characterEncoding=utf-8
......@@ -19,6 +19,9 @@ mybatis-plus:
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
metrics:
campaignName,campaignId,impressions,clicks,cost,currency,attributedConversions1d,attributedConversions7d,attributedConversions14d,attributedConversions30d,attributedConversions1dSameSKU,attributedConversions7dSameSKU,attributedConversions14dSameSKU,attributedConversions30dSameSKU,attributedUnitsOrdered1d,attributedUnitsOrdered7d,attributedUnitsOrdered14d,attributedUnitsOrdered30d,attributedSales1d,attributedSales7d,attributedSales14d,attributedSales30d,attributedSales1dSameSKU,attributedSales7dSameSKU,attributedSales14dSameSKU,attributedSales30dSameSKU,attributedUnitsOrdered1dSameSKU,attributedUnitsOrdered7dSameSKU,attributedUnitsOrdered14dSameSKU,attributedUnitsOrdered30dSameSKU
feign:
hystrix:
enabled: false
......@@ -28,4 +31,4 @@ feign:
connectTimeout: 30000
readTimeout: 30000
server:
port: 1224
port: 1223
datacenter-base/base-sync-purchase-details/target/classes/application-prod.yml → datacenter-show/show-auto-turnover/target/classes/application-prod.yml
spring:
# 服务名称
application:
name: base-sync-sample
name: base-sync-amazon-ad
# 数据配置
datasource:
url: jdbc:mysql://10.0.8.15:3306/bailun_datacenter?serverTimezone=GMT%2B8&characterEncoding=utf-8
......@@ -20,6 +20,9 @@ mybatis-plus:
metrics:
campaignName,campaignId,impressions,clicks,cost,currency,attributedConversions1d,attributedConversions7d,attributedConversions14d,attributedConversions30d,attributedConversions1dSameSKU,attributedConversions7dSameSKU,attributedConversions14dSameSKU,attributedConversions30dSameSKU,attributedUnitsOrdered1d,attributedUnitsOrdered7d,attributedUnitsOrdered14d,attributedUnitsOrdered30d,attributedSales1d,attributedSales7d,attributedSales14d,attributedSales30d,attributedSales1dSameSKU,attributedSales7dSameSKU,attributedSales14dSameSKU,attributedSales30dSameSKU,attributedUnitsOrdered1dSameSKU,attributedUnitsOrdered7dSameSKU,attributedUnitsOrdered14dSameSKU,attributedUnitsOrdered30dSameSKU
feign:
hystrix:
enabled: false
......
datacenter-base/base-sync-purchase-details/target/classes/application-test.yml → datacenter-show/show-auto-turnover/target/classes/application-test.yml
spring:
# 服务名称
application:
name: base-sync-sample
name: base-sync-amazon-ad
# 数据配置
datasource:
url: jdbc:mysql://gz-cdb-kp7s5i79.sql.tencentcdb.com:61691/bailun_datacenter?serverTimezone=GMT%2B8&characterEncoding=utf-8
......@@ -19,6 +19,9 @@ mybatis-plus:
# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
metrics:
campaignName,campaignId,impressions,clicks,cost,currency,attributedConversions1d,attributedConversions7d,attributedConversions14d,attributedConversions30d,attributedConversions1dSameSKU,attributedConversions7dSameSKU,attributedConversions14dSameSKU,attributedConversions30dSameSKU,attributedUnitsOrdered1d,attributedUnitsOrdered7d,attributedUnitsOrdered14d,attributedUnitsOrdered30d,attributedSales1d,attributedSales7d,attributedSales14d,attributedSales30d,attributedSales1dSameSKU,attributedSales7dSameSKU,attributedSales14dSameSKU,attributedSales30dSameSKU,attributedUnitsOrdered1dSameSKU,attributedUnitsOrdered7dSameSKU,attributedUnitsOrdered14dSameSKU,attributedUnitsOrdered30dSameSKU
feign:
hystrix:
enabled: false
......@@ -28,4 +31,4 @@ feign:
connectTimeout: 30000
readTimeout: 30000
server:
port: 1230
port: 1223
datacenter-show/show-auto-turnover/target/maven-archiver/pom.properties 0 → 100644
#Generated by Maven
#Wed Nov 25 14:52:01 CST 2020
version=1.0-SNAPSHOT
groupId=com.bailuntec
artifactId=show-auto-turnover
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