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
f313008e
Commit
f313008e
authored
Sep 24, 2021
by
王业雄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户标签字段加上中括号
parent
915cf08e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
ChannelRouteServiceImpl.java
...tribution/service/route/impl/ChannelRouteServiceImpl.java
+10
-1
FundProductServiceImpl.java
...stribution/service/route/impl/FundProductServiceImpl.java
+4
-0
No files found.
src/main/java/com/quantgroup/asset/distribution/service/route/impl/ChannelRouteServiceImpl.java
View file @
f313008e
...
@@ -77,6 +77,11 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
...
@@ -77,6 +77,11 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
String
userLevel
=
channelRouteResultVo
.
getUserLevel
();
String
userLevel
=
channelRouteResultVo
.
getUserLevel
();
if
(!
StringUtils
.
isEmpty
(
userLevel
)){
if
(!
StringUtils
.
isEmpty
(
userLevel
)){
channelRouteResultVo
.
setUserLevel
(
userLevel
.
substring
(
1
,
userLevel
.
length
()
-
1
));
channelRouteResultVo
.
setUserLevel
(
userLevel
.
substring
(
1
,
userLevel
.
length
()
-
1
));
}
String
userTag
=
channelRouteResultVo
.
getUserTag
();
if
(!
StringUtils
.
isEmpty
(
userTag
)){
channelRouteResultVo
.
setUserTag
(
userTag
.
replace
(
"["
,
""
).
replace
(
"]"
,
""
));
}
}
channelRouteResultVos
.
add
(
channelRouteResultVo
);
channelRouteResultVos
.
add
(
channelRouteResultVo
);
...
@@ -118,7 +123,10 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
...
@@ -118,7 +123,10 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
if
(!
StringUtils
.
isEmpty
(
userLevel
)){
if
(!
StringUtils
.
isEmpty
(
userLevel
)){
configInfoVo
.
setUserLevel
(
userLevel
.
substring
(
1
,
userLevel
.
length
()
-
1
));
configInfoVo
.
setUserLevel
(
userLevel
.
substring
(
1
,
userLevel
.
length
()
-
1
));
}
}
String
userTag
=
configInfoVo
.
getUserTag
();
if
(!
StringUtils
.
isEmpty
(
userTag
)){
configInfoVo
.
setUserTag
(
userTag
.
replace
(
"["
,
""
).
replace
(
"]"
,
""
));
}
FundProductEntity
one
=
fundProductRepository
.
findOne
(
channelRuleEntity
.
getFundProductId
());
FundProductEntity
one
=
fundProductRepository
.
findOne
(
channelRuleEntity
.
getFundProductId
());
if
(
Objects
.
nonNull
(
one
)){
if
(
Objects
.
nonNull
(
one
)){
configInfoVo
.
setSystermType
(
one
.
getSystermType
());
configInfoVo
.
setSystermType
(
one
.
getSystermType
());
...
@@ -183,6 +191,7 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
...
@@ -183,6 +191,7 @@ public class ChannelRouteServiceImpl implements IChannelRouteService {
}
else
{
}
else
{
channelRuleEntity
.
setEnable
(
Byte
.
valueOf
(
"0"
));
channelRuleEntity
.
setEnable
(
Byte
.
valueOf
(
"0"
));
}
}
channelRuleEntity
.
setUserTag
(
"["
+
channelRuleEntity
.
getUserTag
()+
"]"
);
channelRuleEntity
.
setUserLevel
(
"["
+
channelRuleEntity
.
getUserLevel
()+
"]"
);
channelRuleEntity
.
setUserLevel
(
"["
+
channelRuleEntity
.
getUserLevel
()+
"]"
);
channelRuleRepository
.
save
(
channelRuleEntity
);
channelRuleRepository
.
save
(
channelRuleEntity
);
}
}
...
...
src/main/java/com/quantgroup/asset/distribution/service/route/impl/FundProductServiceImpl.java
View file @
f313008e
...
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
...
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.quantgroup.asset.distribution.config.code.AreaCode
;
import
com.quantgroup.asset.distribution.config.code.AreaCode
;
import
com.quantgroup.asset.distribution.config.code.InitAreaCode
;
import
com.quantgroup.asset.distribution.config.code.InitAreaCode
;
import
com.quantgroup.asset.distribution.constant.CommonConstants
;
import
com.quantgroup.asset.distribution.enums.route.SystemType
;
import
com.quantgroup.asset.distribution.enums.route.SystemType
;
import
com.quantgroup.asset.distribution.model.entity.route.fundproduct.*
;
import
com.quantgroup.asset.distribution.model.entity.route.fundproduct.*
;
import
com.quantgroup.asset.distribution.model.response.GlobalResponse
;
import
com.quantgroup.asset.distribution.model.response.GlobalResponse
;
...
@@ -29,6 +30,7 @@ import org.springframework.data.domain.Sort;
...
@@ -29,6 +30,7 @@ import org.springframework.data.domain.Sort;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.CollectionUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
shaded.com.google.common.collect.Lists
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.InputStream
;
...
@@ -37,6 +39,8 @@ import java.time.LocalDateTime;
...
@@ -37,6 +39,8 @@ import java.time.LocalDateTime;
import
java.util.*
;
import
java.util.*
;
import
java.util.regex.Matcher
;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
import
java.util.regex.Pattern
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
@Service
@Service
@Slf4j
@Slf4j
...
...
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