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
3732037f
Commit
3732037f
authored
4 years ago
by
lzxry
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '1608_bugfix' into 1619_bugfix
parents
d37b79f6
3a856bbc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
1 deletion
+36
-1
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+8
-1
ContractBranchUtil.java
src/main/java/util/ContractBranchUtil.java
+28
-0
No files found.
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
3732037f
...
...
@@ -108,7 +108,14 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
try
(
Stream
<
Contract
>
streamContract
=
contracts
.
parallelStream
())
{
streamContract
.
forEachOrdered
(
v
->
{
this
.
shareIncome4Contract
(
v
,
start
,
end
);
switch
(
platform
){
case
"type_one"
:
this
.
shareIncome4Contract
(
v
,
start
,
end
);
break
;
case
"type_two"
:
this
.
shareIncome4Contract
(
v
,
start
,
end
);
break
;
}
v
.
setMyBodyName
(
bodiesNameMap
.
get
(
v
.
getMyBodyCode
()));
if
(
v
.
getBarrioId
()!=
null
)
v
.
setBarrioName
(
barrioCitiesNameMap
.
get
(
barrioCitiesNameMap
.
get
(
v
.
getBarrioId
()).
getParentId
()).
getName
());
...
...
This diff is collapsed.
Click to expand it.
src/main/java/util/ContractBranchUtil.java
0 → 100644
View file @
3732037f
package
util
;
import
com.google.common.collect.ArrayListMultimap
;
import
com.google.common.collect.Multimap
;
import
java.util.HashMap
;
import
java.util.Map
;
/**
* @author liyin
* @description
* @date
*/
public
class
ContractBranchUtil
{
private
static
Map
<
String
,
String
>
map
=
new
HashMap
<>();
static
{
map
.
put
(
"dmp"
,
"type_one"
);
map
.
put
(
"fake"
,
"type_one"
);
map
.
put
(
"adi"
,
"type_one"
);
map
.
put
(
"ads"
,
"type_one"
);
map
.
put
(
"abtest"
,
"type_one"
);
map
.
put
(
"tkio"
,
"type_two"
);
}
public
static
String
getValue
(
String
key
){
return
map
.
get
(
key
);
}
}
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