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
7b178713
Commit
7b178713
authored
Sep 25, 2021
by
王业雄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
2a6fd6e9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
ChannelRuleEntity.java
...et/distribution/service/jpa/entity/ChannelRuleEntity.java
+2
-0
CoreFilter.java
...tgroup/asset/distribution/service/newrule/CoreFilter.java
+1
-1
FundProductServiceImpl.java
...stribution/service/route/impl/FundProductServiceImpl.java
+3
-1
No files found.
src/main/java/com/quantgroup/asset/distribution/service/jpa/entity/ChannelRuleEntity.java
View file @
7b178713
package
com
.
quantgroup
.
asset
.
distribution
.
service
.
jpa
.
entity
;
import
lombok.Data
;
import
org.hibernate.annotations.DynamicInsert
;
import
org.hibernate.annotations.DynamicUpdate
;
...
...
@@ -16,6 +17,7 @@ import java.util.Objects;
@Table
(
name
=
"channel_rule"
,
schema
=
"asset-distribution"
,
catalog
=
""
)
@DynamicInsert
@DynamicUpdate
@Data
public
class
ChannelRuleEntity
{
private
Long
id
;
private
Long
fundProductId
;
...
...
src/main/java/com/quantgroup/asset/distribution/service/newrule/CoreFilter.java
View file @
7b178713
...
...
@@ -82,7 +82,7 @@ public class CoreFilter {
List
<
RoutingRecordVO
>
routingRecordList
=
new
ArrayList
<>();
for
(
ChannelRuleEntity
channelRuleEntity
:
channelRuleEntityList
)
{
FundProductEntity
fundProduct
=
fundProductRepository
.
getByIdEquals
(
channelRuleEntity
.
getFundProductId
());
log
.
info
(
"coreHandle | 开始路由channelRuleEntity={}"
,
channelRuleEntity
);
log
.
info
(
"coreHandle | 开始路由channelRuleEntity={}"
,
channelRuleEntity
.
toString
()
);
if
(
fundProduct
==
null
){
log
.
error
(
"这种情况不可能出现,需要看下原因 {}"
,
JSON
.
toJSONString
(
channelRuleEntity
));
continue
;
...
...
src/main/java/com/quantgroup/asset/distribution/service/route/impl/FundProductServiceImpl.java
View file @
7b178713
...
...
@@ -325,7 +325,9 @@ public class FundProductServiceImpl implements IFundProductService {
}
});
one
.
setBasicRule
(
basicRule
.
substring
(
0
,
basicRule
.
lastIndexOf
(
" && "
)));
if
(!
StringUtils
.
isEmpty
(
ruleList
)){
one
.
setRuleList
(
ruleList
.
substring
(
0
,
ruleList
.
lastIndexOf
(
","
)));
}
one
.
setAreaRule
(
JSONObject
.
toJSONString
(
areaRuleConcrete
));
fundProductRepository
.
save
(
one
);
return
GlobalResponse
.
success
();
...
...
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