Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-java
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bltdc
dc-java
Commits
bd39692c
Commit
bd39692c
authored
Oct 26, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
a831086f
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
65 additions
and
205 deletions
+65
-205
pom.xml
data-base/base-sync-amazon-ad/pom.xml
+1
-5
pom.xml
data-base/base-sync-cashier/pom.xml
+0
-7
pom.xml
data-base/base-sync-company/pom.xml
+0
-6
pom.xml
data-base/base-sync-cost-first/pom.xml
+1
-6
pom.xml
data-base/base-sync-crm-refund/pom.xml
+2
-8
pom.xml
data-base/base-sync-finance-ebay/pom.xml
+1
-5
EbayFinanceSyncJobTest.java
...nc-finance-ebay/src/test/java/EbayFinanceSyncJobTest.java
+3
-3
EbayFinanceAdSyncJobTest.java
...test/java/com/bailuntec/job/EbayFinanceAdSyncJobTest.java
+3
-3
pom.xml
data-base/base-sync-finance-fee/pom.xml
+0
-6
Application.java
...-finance-fee/src/main/java/com/bailuntec/Application.java
+5
-10
DailyFeeJob.java
...ance-fee/src/main/java/com/bailuntec/job/DailyFeeJob.java
+5
-7
FeeJob.java
...c-finance-fee/src/main/java/com/bailuntec/job/FeeJob.java
+2
-1
job.properties
...e/base-sync-finance-fee/src/main/resources/job.properties
+2
-2
MainTest.java
data-base/base-sync-finance-fee/src/test/java/MainTest.java
+1
-4
pom.xml
data-base/base-sync-finance-wish/pom.xml
+1
-6
pom.xml
data-base/base-sync-oms-order/pom.xml
+1
-6
pom.xml
data-base/base-sync-paypal/pom.xml
+1
-6
pom.xml
data-base/base-sync-purchase-details/pom.xml
+2
-8
pom.xml
data-base/base-sync-purchase/pom.xml
+2
-8
pom.xml
data-base/base-sync-semi-order/pom.xml
+1
-6
pom.xml
data-base/base-sync-shopify/pom.xml
+1
-6
pom.xml
data-base/base-sync-sku/pom.xml
+1
-6
pom.xml
data-base/base-sync-stock-wms/pom.xml
+2
-8
WmsLogisticsJob.java
...-wms/src/main/java/com/bailuntec/job/WmsLogisticsJob.java
+4
-8
pom.xml
data-base/base-sync-transfer/pom.xml
+2
-8
pom.xml
data-base/base-sync-warehouse/pom.xml
+2
-8
pom.xml
data-mid/mid-auto-turnover-prepare/pom.xml
+1
-6
pom.xml
data-mid/mid-calculate-cost-first/pom.xml
+2
-8
pom.xml
data-mid/mid-calculate-item/pom.xml
+1
-6
pom.xml
data-mid/mid-calculate-sales/pom.xml
+1
-6
pom.xml
data-mid/mid-calculate-transit/pom.xml
+2
-8
pom.xml
data-mid/mid-daily-stock/pom.xml
+2
-8
pom.xml
data-mid/mid-duration-stock/pom.xml
+1
-6
pom.xml
data-parent/pom.xml
+9
-0
No files found.
data-base/base-sync-amazon-ad/pom.xml
View file @
bd39692c
...
@@ -32,11 +32,7 @@
...
@@ -32,11 +32,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<scope>
test
</scope>
</dependency>
<dependency>
<dependency>
...
...
data-base/base-sync-cashier/pom.xml
View file @
bd39692c
...
@@ -22,13 +22,6 @@
...
@@ -22,13 +22,6 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
data-base/base-sync-company/pom.xml
View file @
bd39692c
...
@@ -21,12 +21,6 @@
...
@@ -21,12 +21,6 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
data-base/base-sync-cost-first/pom.xml
View file @
bd39692c
...
@@ -27,12 +27,7 @@
...
@@ -27,12 +27,7 @@
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
...
...
data-base/base-sync-crm-refund/pom.xml
View file @
bd39692c
...
@@ -21,12 +21,7 @@
...
@@ -21,12 +21,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
@@ -80,4 +75,4 @@
...
@@ -80,4 +75,4 @@
</resource>
</resource>
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-base/base-sync-finance-ebay/pom.xml
View file @
bd39692c
...
@@ -26,11 +26,7 @@
...
@@ -26,11 +26,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<scope>
test
</scope>
</dependency>
<dependency>
<dependency>
<groupId>
io.github.linus87
</groupId>
<groupId>
io.github.linus87
</groupId>
...
...
data-base/base-sync-finance-ebay/src/test/java/EbayFinanceSyncJobTest.java
View file @
bd39692c
...
@@ -37,9 +37,9 @@ public class EbayFinanceSyncJobTest {
...
@@ -37,9 +37,9 @@ public class EbayFinanceSyncJobTest {
ExecutorService
threadPool
=
Executors
.
newFixedThreadPool
(
300
);
ExecutorService
threadPool
=
Executors
.
newFixedThreadPool
(
300
);
//获取时间区间reportDate列表
//获取时间区间reportDate列表
List
<
LocalDateTime
>
localDateList
=
Stream
.
iterate
(
LocalDateTime
.
of
(
2020
,
7
,
31
,
0
,
0
),
localDate
->
localDate
.
plusDays
(
1
))
List
<
LocalDateTime
>
localDateList
=
Stream
.
iterate
(
LocalDateTime
.
of
(
2020
,
8
,
31
,
0
,
0
),
localDate
->
localDate
.
plusDays
(
1
))
.
limit
(
ChronoUnit
.
DAYS
.
between
(
LocalDateTime
.
of
(
2020
,
7
,
31
,
0
,
0
),
.
limit
(
ChronoUnit
.
DAYS
.
between
(
LocalDateTime
.
of
(
2020
,
8
,
31
,
0
,
0
),
LocalDateTime
.
of
(
2020
,
9
,
2
,
0
,
0
))
+
1
)
LocalDateTime
.
of
(
2020
,
10
,
2
,
0
,
0
))
+
1
)
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
localDateList
.
forEach
(
localDateTime
->
{
localDateList
.
forEach
(
localDateTime
->
{
...
...
data-base/base-sync-finance-ebay/src/test/java/com/bailuntec/job/EbayFinanceAdSyncJobTest.java
View file @
bd39692c
...
@@ -56,8 +56,8 @@ public class EbayFinanceAdSyncJobTest {
...
@@ -56,8 +56,8 @@ public class EbayFinanceAdSyncJobTest {
List
<
DcBaseFinanceEbay
>
dcBaseFinanceEbayList
=
dcBaseFinanceEbayMapper
.
selectByExample
(
DcBaseFinanceEbayExample
.
newAndCreateCriteria
()
List
<
DcBaseFinanceEbay
>
dcBaseFinanceEbayList
=
dcBaseFinanceEbayMapper
.
selectByExample
(
DcBaseFinanceEbayExample
.
newAndCreateCriteria
()
// .andAccountIdEqualTo(314)
// .andAccountIdEqualTo(314)
.
andBjDateBetween
(
LocalDateTime
.
of
(
2020
,
8
,
1
,
0
,
0
),
.
andBjDateBetween
(
LocalDateTime
.
of
(
2020
,
9
,
1
,
0
,
0
),
LocalDateTime
.
of
(
2020
,
9
,
1
,
0
,
0
))
LocalDateTime
.
of
(
2020
,
10
,
1
,
0
,
0
))
.
example
());
.
example
());
List
<
EbayFinanceExport
>
ebayFinanceExportList
=
dcBaseFinanceEbayList
.
stream
()
List
<
EbayFinanceExport
>
ebayFinanceExportList
=
dcBaseFinanceEbayList
.
stream
()
...
@@ -75,7 +75,7 @@ public class EbayFinanceAdSyncJobTest {
...
@@ -75,7 +75,7 @@ public class EbayFinanceAdSyncJobTest {
return
ebayFinanceExport
;
return
ebayFinanceExport
;
})
})
.
collect
(
Collectors
.
toList
());
.
collect
(
Collectors
.
toList
());
EasyExcel
.
write
(
"/Users/huluobin/exportEbay
All
.xlsx"
,
EbayFinanceExport
.
class
).
sheet
().
doWrite
(
ebayFinanceExportList
);
EasyExcel
.
write
(
"/Users/huluobin/exportEbay
202009-2020-10-26
.xlsx"
,
EbayFinanceExport
.
class
).
sheet
().
doWrite
(
ebayFinanceExportList
);
}
}
@Test
@Test
...
...
data-base/base-sync-finance-fee/pom.xml
View file @
bd39692c
...
@@ -26,12 +26,6 @@
...
@@ -26,12 +26,6 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
data-base/base-sync-finance-fee/src/main/java/com/bailuntec/Application.java
View file @
bd39692c
...
@@ -42,15 +42,13 @@ public class Application {
...
@@ -42,15 +42,13 @@ public class Application {
private
static
LiteJobConfiguration
createJobConfiguration
()
{
private
static
LiteJobConfiguration
createJobConfiguration
()
{
JobCoreConfiguration
simpleCoreConfig
=
JobCoreConfiguration
.
newBuilder
(
propertiesUtil
.
getPropertyAsString
(
"JOB_NAME"
),
propertiesUtil
.
getPropertyAsString
(
"JOB_CRON"
),
propertiesUtil
.
getPropertyAsInt
(
"SHARDING_TOTAL_COUNT"
)).
build
();
JobCoreConfiguration
simpleCoreConfig
=
JobCoreConfiguration
.
newBuilder
(
propertiesUtil
.
getPropertyAsString
(
"JOB_NAME"
),
propertiesUtil
.
getPropertyAsString
(
"JOB_CRON"
),
propertiesUtil
.
getPropertyAsInt
(
"SHARDING_TOTAL_COUNT"
)).
build
();
SimpleJobConfiguration
simpleJobConfig
=
new
SimpleJobConfiguration
(
simpleCoreConfig
,
FeeJob
.
class
.
getCanonicalName
());
SimpleJobConfiguration
simpleJobConfig
=
new
SimpleJobConfiguration
(
simpleCoreConfig
,
FeeJob
.
class
.
getCanonicalName
());
LiteJobConfiguration
simpleJobRootConfig
=
LiteJobConfiguration
.
newBuilder
(
simpleJobConfig
).
build
();
return
LiteJobConfiguration
.
newBuilder
(
simpleJobConfig
).
build
();
return
simpleJobRootConfig
;
}
}
private
static
LiteJobConfiguration
createJobConfiguration1
()
{
private
static
LiteJobConfiguration
createJobConfiguration1
()
{
JobCoreConfiguration
simpleCoreConfig
=
JobCoreConfiguration
.
newBuilder
(
propertiesUtil
.
getPropertyAsString
(
"LOGISTICS_JOB_NAME"
),
propertiesUtil
.
getPropertyAsString
(
"LOGISTICS_JOB_CRON"
),
propertiesUtil
.
getPropertyAsInt
(
"SHARDING_TOTAL_COUNT"
)).
build
();
JobCoreConfiguration
simpleCoreConfig
=
JobCoreConfiguration
.
newBuilder
(
propertiesUtil
.
getPropertyAsString
(
"LOGISTICS_JOB_NAME"
),
propertiesUtil
.
getPropertyAsString
(
"LOGISTICS_JOB_CRON"
),
propertiesUtil
.
getPropertyAsInt
(
"SHARDING_TOTAL_COUNT"
)).
build
();
SimpleJobConfiguration
simpleJobConfig
=
new
SimpleJobConfiguration
(
simpleCoreConfig
,
LogisticsJob
.
class
.
getCanonicalName
());
SimpleJobConfiguration
simpleJobConfig
=
new
SimpleJobConfiguration
(
simpleCoreConfig
,
LogisticsJob
.
class
.
getCanonicalName
());
LiteJobConfiguration
simpleJobRootConfig
=
LiteJobConfiguration
.
newBuilder
(
simpleJobConfig
).
build
();
return
LiteJobConfiguration
.
newBuilder
(
simpleJobConfig
).
build
();
return
simpleJobRootConfig
;
}
}
private
static
LiteJobConfiguration
createJobConfiguration2
()
{
private
static
LiteJobConfiguration
createJobConfiguration2
()
{
...
@@ -61,20 +59,17 @@ public class Application {
...
@@ -61,20 +59,17 @@ public class Application {
.
build
();
.
build
();
SimpleJobConfiguration
simpleJobConfig
=
new
SimpleJobConfiguration
(
simpleCoreConfig
,
ManageCostJob
.
class
.
getCanonicalName
());
SimpleJobConfiguration
simpleJobConfig
=
new
SimpleJobConfiguration
(
simpleCoreConfig
,
ManageCostJob
.
class
.
getCanonicalName
());
LiteJobConfiguration
simpleJobRootConfig
=
LiteJobConfiguration
.
newBuilder
(
simpleJobConfig
).
build
();
return
LiteJobConfiguration
.
newBuilder
(
simpleJobConfig
).
build
();
return
simpleJobRootConfig
;
}
}
private
static
LiteJobConfiguration
createJobConfiguration3
()
{
private
static
LiteJobConfiguration
createJobConfiguration3
()
{
JobCoreConfiguration
simpleCoreConfig
=
JobCoreConfiguration
.
newBuilder
(
propertiesUtil
.
getPropertyAsString
(
"DAILY_FEE_JOB_NAME"
),
propertiesUtil
.
getPropertyAsString
(
"DAILY_FEE_JOB_CRON"
),
propertiesUtil
.
getPropertyAsInt
(
"SHARDING_TOTAL_COUNT"
)).
build
();
JobCoreConfiguration
simpleCoreConfig
=
JobCoreConfiguration
.
newBuilder
(
propertiesUtil
.
getPropertyAsString
(
"DAILY_FEE_JOB_NAME"
),
propertiesUtil
.
getPropertyAsString
(
"DAILY_FEE_JOB_CRON"
),
propertiesUtil
.
getPropertyAsInt
(
"SHARDING_TOTAL_COUNT"
)).
build
();
SimpleJobConfiguration
simpleJobConfig
=
new
SimpleJobConfiguration
(
simpleCoreConfig
,
DailyFeeJob
.
class
.
getCanonicalName
());
SimpleJobConfiguration
simpleJobConfig
=
new
SimpleJobConfiguration
(
simpleCoreConfig
,
DailyFeeJob
.
class
.
getCanonicalName
());
LiteJobConfiguration
simpleJobRootConfig
=
LiteJobConfiguration
.
newBuilder
(
simpleJobConfig
).
build
();
return
LiteJobConfiguration
.
newBuilder
(
simpleJobConfig
).
build
();
return
simpleJobRootConfig
;
}
}
private
static
JobEventConfiguration
createJobEventConfiguration
()
{
private
static
JobEventConfiguration
createJobEventConfiguration
()
{
JobEventConfiguration
jobEventRdbConfig
=
new
JobEventRdbConfiguration
(
setUpEventTraceDataSource
());
return
new
JobEventRdbConfiguration
(
setUpEventTraceDataSource
());
return
jobEventRdbConfig
;
}
}
private
static
DataSource
setUpEventTraceDataSource
()
{
private
static
DataSource
setUpEventTraceDataSource
()
{
...
...
data-base/base-sync-finance-fee/src/main/java/com/bailuntec/job/DailyFeeJob.java
View file @
bd39692c
...
@@ -13,13 +13,11 @@ public class DailyFeeJob extends PointJob {
...
@@ -13,13 +13,11 @@ public class DailyFeeJob extends PointJob {
@Override
@Override
public
void
executeJob
(
ShardingContext
shardingContext
,
JobPointLog
jobPointLog
)
{
public
void
executeJob
(
ShardingContext
shardingContext
,
JobPointLog
jobPointLog
)
{
DcBaseFinanceFeeMapper
dcBaseFinanceFeeMapper
=
SessionUtil
.
getSession
().
getMapper
(
DcBaseFinanceFeeMapper
.
class
);
DcBaseFinanceFeeMapper
dcBaseFinanceFeeMapper
=
SessionUtil
.
getSession
().
getMapper
(
DcBaseFinanceFeeMapper
.
class
);
try
LocalDate
time
=
LocalDate
.
of
(
2020
,
9
,
29
);
{
try
{
dcBaseFinanceFeeMapper
.
deleteDailyFee
(
LocalDate
.
now
().
minusDays
(
1L
));
dcBaseFinanceFeeMapper
.
deleteDailyFee
(
time
.
minusDays
(
1L
));
dcBaseFinanceFeeMapper
.
insertDailyFee
(
LocalDate
.
now
().
minusDays
(
1L
));
dcBaseFinanceFeeMapper
.
insertDailyFee
(
time
.
minusDays
(
1L
));
}
}
catch
(
Exception
ex
)
{
catch
(
Exception
ex
)
{
}
}
...
...
data-base/base-sync-finance-fee/src/main/java/com/bailuntec/job/FeeJob.java
View file @
bd39692c
...
@@ -38,7 +38,7 @@ public class FeeJob extends PointJob {
...
@@ -38,7 +38,7 @@ public class FeeJob extends PointJob {
public
void
executeJob
(
ShardingContext
shardingContext
,
JobPointLog
jobPointLog
)
{
public
void
executeJob
(
ShardingContext
shardingContext
,
JobPointLog
jobPointLog
)
{
LinkedHashMap
<
String
,
String
>
map
=
new
LinkedHashMap
<>(
4
);
LinkedHashMap
<
String
,
String
>
map
=
new
LinkedHashMap
<>(
4
);
map
.
put
(
"pageSize"
,
jobPointLog
.
getPageSize
().
toString
());
map
.
put
(
"pageSize"
,
jobPointLog
.
getPageSize
().
toString
());
map
.
put
(
"
@R
e"
,
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
TIME_FORMAT
).
format
(
jobPointLog
.
getStartTime
().
minusHours
(
3L
)));
map
.
put
(
"
startDat
e"
,
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
TIME_FORMAT
).
format
(
jobPointLog
.
getStartTime
().
minusHours
(
3L
)));
map
.
put
(
"endDate"
,
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
TIME_FORMAT
).
format
(
jobPointLog
.
getEndTime
()));
map
.
put
(
"endDate"
,
DateTimeFormatter
.
ofPattern
(
CommonConstant
.
TIME_FORMAT
).
format
(
jobPointLog
.
getEndTime
()));
do
{
do
{
map
.
put
(
"pageIndex"
,
jobPointLog
.
getPageIndex
().
equals
(
0
)
?
"1"
:
jobPointLog
.
getPageIndex
().
toString
());
map
.
put
(
"pageIndex"
,
jobPointLog
.
getPageIndex
().
equals
(
0
)
?
"1"
:
jobPointLog
.
getPageIndex
().
toString
());
...
@@ -82,6 +82,7 @@ public class FeeJob extends PointJob {
...
@@ -82,6 +82,7 @@ public class FeeJob extends PointJob {
}
}
}
}
}
}
log
.
info
(
"sync finance_fee success"
);
}
else
{
}
else
{
throw
new
RuntimeException
(
"调用费用接口同步百伦流水失败, 响应为null, 请求参数"
+
map
.
toString
());
throw
new
RuntimeException
(
"调用费用接口同步百伦流水失败, 响应为null, 请求参数"
+
map
.
toString
());
}
}
...
...
data-base/base-sync-finance-fee/src/main/resources/job.properties
View file @
bd39692c
...
@@ -11,7 +11,7 @@ ZOOKEEPER_SERVER=172.31.255.120:2181
...
@@ -11,7 +11,7 @@ ZOOKEEPER_SERVER=172.31.255.120:2181
NAME_SPACE
=
data-center
NAME_SPACE
=
data-center
JOB_NAME
=
base-sync-finance-fee
JOB_NAME
=
base-sync-finance-fee
JOB_CRON
=
0
/1 * * * * ? *
JOB_CRON
=
0
0 0/1 * * ?
LOGISTICS_JOB_NAME
=
base-sync-logistics
LOGISTICS_JOB_NAME
=
base-sync-logistics
LOGISTICS_JOB_CRON
=
0 01 7 * * ? *
LOGISTICS_JOB_CRON
=
0 01 7 * * ? *
...
@@ -23,4 +23,4 @@ DAILY_FEE_JOB_NAME=base-daily-fee
...
@@ -23,4 +23,4 @@ DAILY_FEE_JOB_NAME=base-daily-fee
DAILY_FEE_JOB_CRON
=
0 1 0 * * ? *
DAILY_FEE_JOB_CRON
=
0 1 0 * * ? *
SHARDING_TOTAL_COUNT
=
1
SHARDING_TOTAL_COUNT
=
1
DailyFeeJob
data-base/base-sync-finance-fee/src/test/java/MainTest.java
View file @
bd39692c
...
@@ -19,9 +19,6 @@ public class MainTest {
...
@@ -19,9 +19,6 @@ public class MainTest {
public
void
testDailyFee
()
{
public
void
testDailyFee
()
{
DailyFeeJob
syncDailyFeeJob
=
new
DailyFeeJob
();
DailyFeeJob
syncDailyFeeJob
=
new
DailyFeeJob
();
JobPointLog
jobPointLog
=
new
JobPointLog
(
"base-daily-fee"
,
1
,
1
,
1
,
1
,
syncDailyFeeJob
.
executeJob
(
null
,
null
);
LocalDateTime
.
of
(
2020
,
6
,
12
,
23
,
35
,
40
),
LocalDateTime
.
of
(
2020
,
6
,
16
,
23
,
35
,
40
));
syncDailyFeeJob
.
executeJob
(
null
,
jobPointLog
);
}
}
}
}
data-base/base-sync-finance-wish/pom.xml
View file @
bd39692c
...
@@ -30,12 +30,7 @@
...
@@ -30,12 +30,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
data-base/base-sync-oms-order/pom.xml
View file @
bd39692c
...
@@ -26,12 +26,7 @@
...
@@ -26,12 +26,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
...
data-base/base-sync-paypal/pom.xml
View file @
bd39692c
...
@@ -22,12 +22,7 @@
...
@@ -22,12 +22,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
...
...
data-base/base-sync-purchase-details/pom.xml
View file @
bd39692c
...
@@ -21,12 +21,7 @@
...
@@ -21,12 +21,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
@@ -79,4 +74,4 @@
...
@@ -79,4 +74,4 @@
</resource>
</resource>
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-base/base-sync-purchase/pom.xml
View file @
bd39692c
...
@@ -21,12 +21,7 @@
...
@@ -21,12 +21,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
@@ -79,4 +74,4 @@
...
@@ -79,4 +74,4 @@
</resource>
</resource>
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-base/base-sync-semi-order/pom.xml
View file @
bd39692c
...
@@ -26,12 +26,7 @@
...
@@ -26,12 +26,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
...
...
data-base/base-sync-shopify/pom.xml
View file @
bd39692c
...
@@ -31,12 +31,7 @@
...
@@ -31,12 +31,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
data-base/base-sync-sku/pom.xml
View file @
bd39692c
...
@@ -28,12 +28,7 @@
...
@@ -28,12 +28,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
data-base/base-sync-stock-wms/pom.xml
View file @
bd39692c
...
@@ -22,12 +22,7 @@
...
@@ -22,12 +22,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
@@ -80,4 +75,4 @@
...
@@ -80,4 +75,4 @@
</resource>
</resource>
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-base/base-sync-stock-wms/src/main/java/com/bailuntec/job/WmsLogisticsJob.java
View file @
bd39692c
package
com
.
bailuntec
.
job
;
package
com
.
bailuntec
.
job
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.bailuntec.domain.entity.DcBaseLogistics
;
import
com.bailuntec.domain.entity.DcBaseLogistics
;
import
com.bailuntec.domain.entity.DcBaseStock
;
import
com.bailuntec.domain.entity.JobPointLog
;
import
com.bailuntec.domain.entity.JobPointLog
;
import
com.bailuntec.domain.example.DcBaseLogisticsExample
;
import
com.bailuntec.domain.example.DcBaseLogisticsExample
;
import
com.bailuntec.domain.
example.DcBaseStockExample
;
import
com.bailuntec.domain.
pojo.Logistics
;
import
com.bailuntec.domain.pojo.
*
;
import
com.bailuntec.domain.pojo.
WmsLogisticsInfo
;
import
com.bailuntec.mapper.DcBaseLogisticsMapper
;
import
com.bailuntec.mapper.DcBaseLogisticsMapper
;
import
com.bailuntec.mapper.DcBaseStockMapper
;
import
com.bailuntec.mapper.DcBaseWarehouseMapper
;
import
com.bailuntec.mapper.JobPointLogMapper
;
import
com.bailuntec.mapper.JobPointLogMapper
;
import
com.bailuntec.support.PointJob
;
import
com.bailuntec.support.PointJob
;
import
com.bailuntec.utils.OkHttpUtil
;
import
com.bailuntec.utils.OkHttpUtil
;
...
@@ -41,7 +37,7 @@ public class WmsLogisticsJob extends PointJob {
...
@@ -41,7 +37,7 @@ public class WmsLogisticsJob extends PointJob {
do
{
do
{
OkHttpClient
client
=
OkHttpUtil
.
getInstance
();
OkHttpClient
client
=
OkHttpUtil
.
getInstance
();
MediaType
mediaType
=
MediaType
.
parse
(
"application/json"
);
MediaType
mediaType
=
MediaType
.
parse
(
"application/json"
);
wmsLogistic
.
setPageIndex
(
jobPointLog
.
getPageIndex
()
>
0
?
jobPointLog
.
getPageIndex
()
:
1
);
wmsLogistic
.
setPageIndex
(
jobPointLog
.
getPageIndex
()
>
0
?
jobPointLog
.
getPageIndex
()
:
1
);
RequestBody
body
=
RequestBody
.
create
(
mediaType
,
JSON
.
toJSONString
(
wmsLogistic
));
RequestBody
body
=
RequestBody
.
create
(
mediaType
,
JSON
.
toJSONString
(
wmsLogistic
));
Request
request
=
new
Request
.
Builder
()
Request
request
=
new
Request
.
Builder
()
.
url
(
propertiesUtil
.
getPropertyAsString
(
"LOGISTICS_WMS_URL"
))
.
url
(
propertiesUtil
.
getPropertyAsString
(
"LOGISTICS_WMS_URL"
))
...
@@ -62,7 +58,7 @@ public class WmsLogisticsJob extends PointJob {
...
@@ -62,7 +58,7 @@ public class WmsLogisticsJob extends PointJob {
}
}
if
(
StringUtils
.
isNotBlank
(
resultStr
))
{
if
(
StringUtils
.
isNotBlank
(
resultStr
))
{
WmsLogisticsInfo
wmsLogisticsInfo
=
JSON
.
parseObject
(
resultStr
,
WmsLogisticsInfo
.
class
);
WmsLogisticsInfo
wmsLogisticsInfo
=
JSON
.
parseObject
(
resultStr
,
WmsLogisticsInfo
.
class
);
if
(
wmsLogisticsInfo
.
getSuccess
()
!=
null
&&
wmsLogisticsInfo
.
getSuccess
())
{
if
(
wmsLogisticsInfo
.
getSuccess
()
!=
null
&&
wmsLogisticsInfo
.
getSuccess
())
{
WmsLogisticsInfo
.
Result
result
=
wmsLogisticsInfo
.
getResult
();
WmsLogisticsInfo
.
Result
result
=
wmsLogisticsInfo
.
getResult
();
List
<
WmsLogisticsInfo
.
Result
.
LogisticsInner
>
items
=
result
.
getResult
();
List
<
WmsLogisticsInfo
.
Result
.
LogisticsInner
>
items
=
result
.
getResult
();
if
(
jobPointLog
.
getPageIndex
().
equals
(
0
))
{
if
(
jobPointLog
.
getPageIndex
().
equals
(
0
))
{
...
...
data-base/base-sync-transfer/pom.xml
View file @
bd39692c
...
@@ -21,12 +21,7 @@
...
@@ -21,12 +21,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
@@ -79,4 +74,4 @@
...
@@ -79,4 +74,4 @@
</resource>
</resource>
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-base/base-sync-warehouse/pom.xml
View file @
bd39692c
...
@@ -21,12 +21,7 @@
...
@@ -21,12 +21,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
@@ -80,4 +75,4 @@
...
@@ -80,4 +75,4 @@
</resource>
</resource>
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-mid/mid-auto-turnover-prepare/pom.xml
View file @
bd39692c
...
@@ -26,12 +26,7 @@
...
@@ -26,12 +26,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
...
data-mid/mid-calculate-cost-first/pom.xml
View file @
bd39692c
...
@@ -21,12 +21,7 @@
...
@@ -21,12 +21,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
@@ -80,4 +75,4 @@
...
@@ -80,4 +75,4 @@
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-mid/mid-calculate-item/pom.xml
View file @
bd39692c
...
@@ -22,12 +22,7 @@
...
@@ -22,12 +22,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
...
data-mid/mid-calculate-sales/pom.xml
View file @
bd39692c
...
@@ -26,12 +26,7 @@
...
@@ -26,12 +26,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
...
data-mid/mid-calculate-transit/pom.xml
View file @
bd39692c
...
@@ -21,12 +21,7 @@
...
@@ -21,12 +21,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
@@ -80,4 +75,4 @@
...
@@ -80,4 +75,4 @@
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-mid/mid-daily-stock/pom.xml
View file @
bd39692c
...
@@ -22,12 +22,7 @@
...
@@ -22,12 +22,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
<plugins>
<plugins>
...
@@ -80,4 +75,4 @@
...
@@ -80,4 +75,4 @@
</resource>
</resource>
</resources>
</resources>
</build>
</build>
</project>
</project>
\ No newline at end of file
data-mid/mid-duration-stock/pom.xml
View file @
bd39692c
...
@@ -24,12 +24,7 @@
...
@@ -24,12 +24,7 @@
<groupId>
org.projectlombok
</groupId>
<groupId>
org.projectlombok
</groupId>
<artifactId>
lombok
</artifactId>
<artifactId>
lombok
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
RELEASE
</version>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
data-parent/pom.xml
View file @
bd39692c
...
@@ -61,6 +61,15 @@
...
@@ -61,6 +61,15 @@
<dependencyManagement>
<dependencyManagement>
<dependencies>
<!--这下面进行依赖管理 -->
<dependencies>
<!--这下面进行依赖管理 -->
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api -->
<dependency>
<groupId>
org.junit.jupiter
</groupId>
<artifactId>
junit-jupiter-api
</artifactId>
<version>
5.5.2
</version>
</dependency>
<!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
<!-- https://mvnrepository.com/artifact/redis.clients/jedis -->
<dependency>
<dependency>
<groupId>
redis.clients
</groupId>
<groupId>
redis.clients
</groupId>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment