Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
browser-backend
Project
Project
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
Administrator
browser-backend
Commits
54bcb100
Commit
54bcb100
authored
May 09, 2020
by
renjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改购买6,12个月续费bug
parent
06d31065
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
6 deletions
+8
-6
IpResourceServiceImpl.java
...erbackend/browser/service/Impl/IpResourceServiceImpl.java
+8
-6
No files found.
src/main/java/com/edgec/browserbackend/browser/service/Impl/IpResourceServiceImpl.java
View file @
54bcb100
...
@@ -361,16 +361,17 @@ public class IpResourceServiceImpl implements IpResourceService {
...
@@ -361,16 +361,17 @@ public class IpResourceServiceImpl implements IpResourceService {
IpOperationResultDto
ipOperationResultDto
=
new
IpOperationResultDto
();
IpOperationResultDto
ipOperationResultDto
=
new
IpOperationResultDto
();
if
(
ipResourceRequestDto
.
getAddr
()
!=
null
&&
ipResourceRequestDto
.
getAddr
().
size
()
>
0
)
{
RestTemplate
restTemplate
=
new
RestTemplate
();
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"iplist"
,
ipResourceRequestDto
.
getAddr
());
int
period
=
0
;
int
period
=
0
;
period
=
ipResourceRequestDto
.
getPeriod
();
period
=
ipResourceRequestDto
.
getPeriod
();
if
(
ipResourceRequestDto
.
getUnit
().
equals
(
"month"
)
&&
ipResourceRequestDto
.
getPeriod
()
==
6
)
if
(
ipResourceRequestDto
.
getUnit
().
equals
(
"month"
)
&&
ipResourceRequestDto
.
getPeriod
()
==
6
)
period
=
7
;
period
=
7
;
else
if
(
ipResourceRequestDto
.
getUnit
().
equals
(
"month"
)
&&
ipResourceRequestDto
.
getPeriod
()
==
12
)
else
if
(
ipResourceRequestDto
.
getUnit
().
equals
(
"month"
)
&&
ipResourceRequestDto
.
getPeriod
()
==
12
)
period
=
14
;
period
=
14
;
if
(
ipResourceRequestDto
.
getAddr
()
!=
null
&&
ipResourceRequestDto
.
getAddr
().
size
()
>
0
)
{
RestTemplate
restTemplate
=
new
RestTemplate
();
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"iplist"
,
ipResourceRequestDto
.
getAddr
());
map
.
put
(
"period"
,
period
);
map
.
put
(
"period"
,
period
);
map
.
put
(
"unit"
,
ipResourceRequestDto
.
getUnit
());
map
.
put
(
"unit"
,
ipResourceRequestDto
.
getUnit
());
HttpHeaders
headers
=
buildPostHeader
();
HttpHeaders
headers
=
buildPostHeader
();
...
@@ -403,6 +404,7 @@ public class IpResourceServiceImpl implements IpResourceService {
...
@@ -403,6 +404,7 @@ public class IpResourceServiceImpl implements IpResourceService {
ipOperationResultDto
.
setFailList
(
failedList
);
ipOperationResultDto
.
setFailList
(
failedList
);
}
}
if
(
ipResourceRequestDto
.
getIpId
()
!=
null
&&
ipResourceRequestDto
.
getIpId
().
size
()
>
0
)
{
if
(
ipResourceRequestDto
.
getIpId
()
!=
null
&&
ipResourceRequestDto
.
getIpId
().
size
()
>
0
)
{
int
finalPeriod
=
period
;
ipResourceRequestDto
.
getIpId
().
forEach
(
x
->
{
ipResourceRequestDto
.
getIpId
().
forEach
(
x
->
{
IpResource
ipResource
=
ipResourceRepository
.
findByIdAndIsDeleted
(
x
,
false
);
IpResource
ipResource
=
ipResourceRepository
.
findByIdAndIsDeleted
(
x
,
false
);
List
<
String
>
vendorPrices
;
List
<
String
>
vendorPrices
;
...
@@ -425,10 +427,10 @@ public class IpResourceServiceImpl implements IpResourceService {
...
@@ -425,10 +427,10 @@ public class IpResourceServiceImpl implements IpResourceService {
if
(
ipResourceRequestDto
.
getUnit
().
equals
(
"week"
))
{
if
(
ipResourceRequestDto
.
getUnit
().
equals
(
"week"
))
{
ipResource
.
setValidTime
(
Instant
.
ofEpochMilli
(
ipResource
.
getValidTime
()).
atZone
(
ZoneOffset
.
UTC
)
ipResource
.
setValidTime
(
Instant
.
ofEpochMilli
(
ipResource
.
getValidTime
()).
atZone
(
ZoneOffset
.
UTC
)
.
plusWeeks
(
ipResourceRequestDto
.
getPeriod
()
).
toInstant
().
toEpochMilli
());
.
plusWeeks
(
finalPeriod
).
toInstant
().
toEpochMilli
());
}
else
{
}
else
{
ipResource
.
setValidTime
(
Instant
.
ofEpochMilli
(
ipResource
.
getValidTime
()).
atZone
(
ZoneOffset
.
UTC
)
ipResource
.
setValidTime
(
Instant
.
ofEpochMilli
(
ipResource
.
getValidTime
()).
atZone
(
ZoneOffset
.
UTC
)
.
plusMonths
(
ipResourceRequestDto
.
getPeriod
()
).
toInstant
().
toEpochMilli
());
.
plusMonths
(
finalPeriod
).
toInstant
().
toEpochMilli
());
}
}
ipResourceRepository
.
save
(
ipResource
);
ipResourceRepository
.
save
(
ipResource
);
ipOperationResultDto
.
getSuccessList
().
add
(
x
);
ipOperationResultDto
.
getSuccessList
().
add
(
x
);
...
...
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