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
d68ef5d3
Commit
d68ef5d3
authored
Sep 28, 2020
by
lzxry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tkio分摊报表
parent
1335ec2f
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
0 deletions
+32
-0
Contract.java
src/main/java/common/model/Contract.java
+29
-0
ShareIncomeServiceImpl.java
...main/java/common/service/impl/ShareIncomeServiceImpl.java
+0
-0
AppRepository.java
src/main/java/tkio/repository/AppRepository.java
+3
-0
No files found.
src/main/java/common/model/Contract.java
View file @
d68ef5d3
...
...
@@ -63,6 +63,7 @@ public class Contract {
private
Long
incomeExcludingTax
;
//不含税收入 (*100的结果)
private
Long
intervaIncomeShare
;
//区间分摊收入(*100的结果)
private
Long
incomeShareAll
;
//分摊总收入(*100的结果)
private
Long
incomeGross
;
//累计总收入(*100的结果)合同自开始至选择的结束日期(分摊收入+调整金额)
private
Integer
shareSign
;
//标记是否计算分摊收入 1 计算 0 不计算
...
...
@@ -94,6 +95,8 @@ public class Contract {
private
String
belongGroup
;
//隶属集团
private
Double
trackFlow
;
//流量,tkio的
private
Double
unitPrice
;
//单价,tkio
private
Double
clickFlow
;
//区间点击数,tkio
@Id
@GeneratedValue
...
...
@@ -576,6 +579,32 @@ public class Contract {
public
void
setTrackFlow
(
Double
trackFlow
)
{
this
.
trackFlow
=
trackFlow
;
}
@Transient
public
Double
getUnitPrice
()
{
return
unitPrice
;
}
public
void
setUnitPrice
(
Double
unitPrice
)
{
this
.
unitPrice
=
unitPrice
;
}
@Transient
public
Double
getClickFlow
()
{
return
clickFlow
;
}
public
void
setClickFlow
(
Double
clickFlow
)
{
this
.
clickFlow
=
clickFlow
;
}
@Transient
public
Long
getIncomeGross
()
{
return
incomeGross
;
}
public
void
setIncomeGross
(
Long
incomeGross
)
{
this
.
incomeGross
=
incomeGross
;
}
@Override
public
String
toString
()
{
...
...
src/main/java/common/service/impl/ShareIncomeServiceImpl.java
View file @
d68ef5d3
This diff is collapsed.
Click to expand it.
src/main/java/tkio/repository/AppRepository.java
View file @
d68ef5d3
...
...
@@ -18,4 +18,7 @@ public interface AppRepository extends JpaRepository<App, Long> {
@Query
(
value
=
"select appkey from app where account in ?1"
,
nativeQuery
=
true
)
List
<
String
>
findAppkeys
(
List
<
Long
>
accountId
);
@Query
(
value
=
"select appkey from app where account in ?1 and is_debug is not true"
,
nativeQuery
=
true
)
List
<
String
>
findAppkeysNotDebug
(
List
<
Long
>
accountId
);
}
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