Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
asset-distribution
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
data-spider
asset-distribution
Commits
38a737f9
Commit
38a737f9
authored
Sep 29, 2021
by
技术部-韩成龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
地区校验fix
parent
8af3c618
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
AreaVerifyImpl.java
...t/distribution/service/newrule/common/AreaVerifyImpl.java
+7
-7
No files found.
src/main/java/com/quantgroup/asset/distribution/service/newrule/common/AreaVerifyImpl.java
View file @
38a737f9
...
@@ -56,9 +56,9 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
...
@@ -56,9 +56,9 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
UserAssociationBean
userInfo
=
param
.
getUserInfo
();
UserAssociationBean
userInfo
=
param
.
getUserInfo
();
AtomicInteger
hit
=
new
AtomicInteger
(
0
);
AtomicInteger
hit
=
new
AtomicInteger
(
0
);
if
(
StringUtils
.
isNotBlank
(
ruleConcrete
.
getNativeList
())){
if
(
StringUtils
.
isNotBlank
(
ruleConcrete
.
getNativeList
())){
List
<
Integer
>
nativeList
=
JacksonUtil
.
deserializeList
(
ruleConcrete
.
getNativeList
(),
Integer
.
class
);
String
nativeList
=
ruleConcrete
.
getNativeList
(
);
String
nativeCode
=
IdCardUtil
.
getCityCodeByIdCard
(
userInfo
.
getIdNo
());
String
nativeCode
=
IdCardUtil
.
getCityCodeByIdCard
(
userInfo
.
getIdNo
());
if
(
StringUtils
.
isNotBlank
(
nativeCode
)
&&
nativeList
.
contains
(
Integer
.
parseInt
(
nativeCode
)
)){
if
(
StringUtils
.
isNotBlank
(
nativeCode
)
&&
nativeList
.
contains
(
nativeCode
)){
hit
.
incrementAndGet
();
hit
.
incrementAndGet
();
}
}
if
(
AreaEnum
.
CHOOSE_ONE_MORE
.
equals
(
param
.
getAreaNum
())){
if
(
AreaEnum
.
CHOOSE_ONE_MORE
.
equals
(
param
.
getAreaNum
())){
...
@@ -67,14 +67,14 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
...
@@ -67,14 +67,14 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
}
}
}
}
if
(
StringUtils
.
isNotBlank
(
ruleConcrete
.
getResidenceList
())){
if
(
StringUtils
.
isNotBlank
(
ruleConcrete
.
getResidenceList
())){
List
<
Integer
>
residenceList
=
JacksonUtil
.
deserializeList
(
ruleConcrete
.
getResidenceList
(),
Integer
.
class
);
String
residenceList
=
ruleConcrete
.
getResidenceList
(
);
SDKUserInfo
userExtInfo
=
userCenterService
.
getSDKUserExtInfo
(
userInfo
.
getPhoneNo
(),
null
);
SDKUserInfo
userExtInfo
=
userCenterService
.
getSDKUserExtInfo
(
userInfo
.
getPhoneNo
(),
null
);
List
<
UserAddressInfo
>
addressList
=
userExtInfo
.
getAddressList
();
List
<
UserAddressInfo
>
addressList
=
userExtInfo
.
getAddressList
();
if
(!
CollectionUtils
.
isEmpty
(
addressList
)){
if
(!
CollectionUtils
.
isEmpty
(
addressList
)){
UserAddressInfo
userAddressInfo
=
addressList
.
get
(
0
);
UserAddressInfo
userAddressInfo
=
addressList
.
get
(
0
);
boolean
residenceResult
=
(
userAddressInfo
.
getDistrictCode
()
!=
null
&&
residenceList
.
contains
(
userAddressInfo
.
getDistrictCode
(
)))
boolean
residenceResult
=
(
userAddressInfo
.
getDistrictCode
()
!=
null
&&
residenceList
.
contains
(
String
.
valueOf
(
userAddressInfo
.
getDistrictCode
()
)))
||
(
userAddressInfo
.
getCityCode
()
!=
null
&&
residenceList
.
contains
(
userAddressInfo
.
getCityCode
(
)))
||
(
userAddressInfo
.
getCityCode
()
!=
null
&&
residenceList
.
contains
(
String
.
valueOf
(
userAddressInfo
.
getCityCode
()
)))
||
(
userAddressInfo
.
getProvinceCode
()
!=
null
&&
residenceList
.
contains
(
userAddressInfo
.
getProvinceCode
(
)));
||
(
userAddressInfo
.
getProvinceCode
()
!=
null
&&
residenceList
.
contains
(
String
.
valueOf
(
userAddressInfo
.
getProvinceCode
()
)));
if
(
residenceResult
){
if
(
residenceResult
){
hit
.
incrementAndGet
();
hit
.
incrementAndGet
();
}
}
...
@@ -86,7 +86,7 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
...
@@ -86,7 +86,7 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
}
}
}
}
if
(
StringUtils
.
isNotBlank
(
ruleConcrete
.
getTelAreaNameList
())){
if
(
StringUtils
.
isNotBlank
(
ruleConcrete
.
getTelAreaNameList
())){
List
<
String
>
telAreaNameList
=
JacksonUtil
.
deserializeList
(
ruleConcrete
.
getTelAreaNameList
(),
String
.
class
);
String
telAreaNameList
=
ruleConcrete
.
getTelAreaNameList
(
);
PhoneNumberGeo
phoneNumberGeo
=
new
PhoneNumberGeo
();
PhoneNumberGeo
phoneNumberGeo
=
new
PhoneNumberGeo
();
PhoneNumberInfo
numberInfo
=
phoneNumberGeo
.
lookup
(
userInfo
.
getPhoneNo
());
PhoneNumberInfo
numberInfo
=
phoneNumberGeo
.
lookup
(
userInfo
.
getPhoneNo
());
if
(
numberInfo
==
null
){
if
(
numberInfo
==
null
){
...
...
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