Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
manager
Project
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
reyun
manager
Commits
edeb7b2f
Commit
edeb7b2f
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cas导入校验ip发送日
parent
3285625c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
44 additions
and
6 deletions
+44
-6
ContractServiceImpl.java
src/main/java/common/service/impl/ContractServiceImpl.java
+44
-6
No files found.
src/main/java/common/service/impl/ContractServiceImpl.java
View file @
edeb7b2f
...
...
@@ -98,8 +98,6 @@ public class ContractServiceImpl implements ContractService {
put
(
"签约销售"
,
"sale"
);
put
(
"关联合同编号"
,
"relation_code"
);
put
(
"补充协议签订日期"
,
"signed_date"
);
put
(
"有效开始日"
,
"valid_start_date"
);
put
(
"有效结束日"
,
"valid_end_date"
);
put
(
"是否计算一次性收入"
,
"one_time"
);
}};
...
...
@@ -122,8 +120,6 @@ public class ContractServiceImpl implements ContractService {
put
(
"sale"
,
"签约销售"
);
put
(
"relation_code"
,
"关联合同编号"
);
put
(
"signed_date"
,
"补充协议签订日期"
);
put
(
"valid_start_date"
,
"有效开始日"
);
put
(
"valid_end_date"
,
"有效结束日"
);
put
(
"one_time"
,
"是否计算一次性收入"
);
}};
...
...
@@ -2443,7 +2439,7 @@ public class ContractServiceImpl implements ContractService {
if
(
platform
.
equals
(
"tkio"
))
{
row_length
=
17
;
}
if
(
platform
.
equals
(
"cas"
))
{
row_length
=
1
6
;
row_length
=
1
4
;
}
else
{
row_length
=
13
;
}
...
...
@@ -2542,7 +2538,10 @@ public class ContractServiceImpl implements ContractService {
if
(
"tkio"
.
equals
(
platform
))
{
extend_row_sql
=
"platform,product,my_body_code,create_time,code_num,type,status,back_status,ds,"
+
"create_account,create_name,relation_contract,invoice_money,first_back_id"
;
}
else
{
}
else
if
(
"cas"
.
equals
(
platform
)){
extend_row_sql
=
"platform,product,my_body_code,create_time,code_num,type,status,back_status,ds,"
+
"create_account,create_name,extra_flow,relation_contract,invoice_money,first_back_id,valid_start_date,valid_end_date"
;
}
else
{
extend_row_sql
=
"platform,product,my_body_code,create_time,code_num,type,status,back_status,ds,"
+
"create_account,create_name,extra_flow,relation_contract,invoice_money,first_back_id"
;
}
...
...
@@ -2666,6 +2665,10 @@ public class ContractServiceImpl implements ContractService {
if
(
"start_date"
.
equals
(
sheetTitle
))
{
filter
.
put
(
"w"
,
String
.
valueOf
(
w
));
}
}
else
if
(
"cas"
.
equals
(
platform
)){
if
(
"start_date"
.
equals
(
sheetTitle
)
||
"end_date"
.
equals
(
sheetTitle
)
)
{
filter
.
put
(
sheetTitle
,
String
.
valueOf
(
s_data
[
w
]));
}
}
else
{
if
(
"start_date"
.
equals
(
sheetTitle
))
{
createTime
=
d
;
...
...
@@ -2712,6 +2715,8 @@ public class ContractServiceImpl implements ContractService {
moreEmail
.
add
(
dataSTR
.
trim
());
}
accountsEmail
.
add
(
dataSTR
.
trim
());
}
else
if
(
"email"
.
equals
(
sheetTitle
)&&
"cas"
.
equals
(
platform
)){
filter
.
put
(
sheetTitle
,
dataSTR
.
trim
());
}
}
}
...
...
@@ -2754,6 +2759,35 @@ public class ContractServiceImpl implements ContractService {
}
}
}
}
else
if
(
"cas"
.
equals
(
platform
)){
String
email
=
filter
.
get
(
"email"
);
String
start_date
=
filter
.
get
(
"start_date"
);
String
end_date
=
filter
.
get
(
"end_date"
);
String
rowIndex
=
filter
.
get
(
"rowIndex"
);
Map
<
String
,
Object
>
adiAccount
=
checkAccount
(
email
,
platform
);
if
(
adiAccount
!=
null
){
Object
result
=
adiAccount
.
get
(
"result"
);
if
(
result
.
equals
(
1
)){
Object
validStartDate
=
adiAccount
.
get
(
"validStartDate"
);
if
(
validStartDate
==
null
||
StringUtils
.
isEmpty
(
validStartDate
)){
return
ResultModel
.
ERROR
(
"第"
+
rowIndex
+
"行主账号【"
+
email
+
"】未进行IP发送"
);
}
else
{
String
validStartDateStr
=
validStartDate
.
toString
().
split
(
" "
)[
0
];
DateTime
dateTime
=
new
DateTime
(
validStartDateStr
);
DateTime
startDate
=
new
DateTime
(
start_date
);
DateTime
endDate
=
new
DateTime
(
end_date
);
int
contractAllDay
=
Days
.
daysBetween
(
startDate
,
endDate
).
getDays
();
//合同总天数
filter
.
put
(
"valid_start_date"
,
dateTime
.
toString
(
"yyyy-MM-dd"
));
filter
.
put
(
"valid_end_date"
,
dateTime
.
plusDays
(
contractAllDay
).
toString
(
"yyyy-MM-dd"
));
}
}
else
{
return
ResultModel
.
ERROR
(
"第"
+
rowIndex
+
"行主账号【"
+
email
+
"】不存在"
);
}
}
else
{
return
ResultModel
.
ERROR
(
"第"
+
rowIndex
+
"行ADI主账号校验URL失效"
);
}
}
if
(!
accountsEmail
.
isEmpty
())
{
...
...
@@ -2811,6 +2845,10 @@ public class ContractServiceImpl implements ContractService {
s_data
[
row_already
+
12
]
=
-
1
;
s_data
[
row_already
+
13
]
=
0
;
s_data
[
row_already
+
14
]
=
0
;
if
(
"cas"
.
equals
(
platform
)){
s_data
[
row_already
+
15
]
=
filter
.
get
(
"valid_start_date"
);
s_data
[
row_already
+
16
]
=
filter
.
get
(
"valid_end_date"
);
}
}
//批量添加数据
...
...
This diff is collapsed.
Click to expand it.
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