Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
huhu-partner
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guanchen
huhu-partner
Commits
04b7ff48
Commit
04b7ff48
authored
Apr 24, 2020
by
guanchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
刷新佣金时 不再更新状态
parent
226eb959
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
AgentSettleTask.java
...ava/com/lanren/huhu/partner/schedule/AgentSettleTask.java
+4
-4
PartnerSettleTask.java
...a/com/lanren/huhu/partner/schedule/PartnerSettleTask.java
+3
-3
No files found.
src/main/java/com/lanren/huhu/partner/schedule/AgentSettleTask.java
View file @
04b7ff48
...
@@ -78,8 +78,8 @@ public class AgentSettleTask {
...
@@ -78,8 +78,8 @@ public class AgentSettleTask {
}
}
private
void
updateAll
(
long
beginTs
,
long
endTs
)
{
private
void
updateAll
(
long
beginTs
,
long
endTs
)
{
//
updateOrderCommission(beginTs, endTs, 0, 0);
updateOrderCommission
(
beginTs
,
endTs
,
0
,
0
);
doSettle
(
beginTs
,
endTs
);
//
doSettle(beginTs, endTs);
}
}
private
void
doSettle
(
long
beginTs
,
long
endTs
)
{
private
void
doSettle
(
long
beginTs
,
long
endTs
)
{
...
@@ -421,7 +421,7 @@ public class AgentSettleTask {
...
@@ -421,7 +421,7 @@ public class AgentSettleTask {
BigDecimal
commission
=
cash
.
multiply
(
agentReward
.
getCommissionRate
());
BigDecimal
commission
=
cash
.
multiply
(
agentReward
.
getCommissionRate
());
agentReward
.
setAmount
(
commission
);
agentReward
.
setAmount
(
commission
);
agentReward
.
setCommission
(
commission
);
agentReward
.
setCommission
(
commission
);
agentReward
.
setSettleState
(
Constants
.
SETTLE_STATE_DONE
);
//
agentReward.setSettleState(Constants.SETTLE_STATE_DONE);
agentReward
.
setUpdatedAt
(
System
.
currentTimeMillis
()
/
1000L
);
agentReward
.
setUpdatedAt
(
System
.
currentTimeMillis
()
/
1000L
);
updateCommisionList
.
add
(
agentReward
);
updateCommisionList
.
add
(
agentReward
);
}
}
...
@@ -432,7 +432,7 @@ public class AgentSettleTask {
...
@@ -432,7 +432,7 @@ public class AgentSettleTask {
BigDecimal
commission
=
allMoneyOri
.
multiply
(
agentReward
.
getCommissionRate
());
BigDecimal
commission
=
allMoneyOri
.
multiply
(
agentReward
.
getCommissionRate
());
agentReward
.
setAmount
(
commission
);
agentReward
.
setAmount
(
commission
);
agentReward
.
setCommission
(
commission
);
agentReward
.
setCommission
(
commission
);
agentReward
.
setSettleState
(
Constants
.
SETTLE_STATE_DONE
);
//
agentReward.setSettleState(Constants.SETTLE_STATE_DONE);
agentReward
.
setUpdatedAt
(
System
.
currentTimeMillis
()
/
1000L
);
agentReward
.
setUpdatedAt
(
System
.
currentTimeMillis
()
/
1000L
);
updateCommisionList
.
add
(
agentReward
);
updateCommisionList
.
add
(
agentReward
);
}
}
...
...
src/main/java/com/lanren/huhu/partner/schedule/PartnerSettleTask.java
View file @
04b7ff48
...
@@ -73,7 +73,7 @@ public class PartnerSettleTask {
...
@@ -73,7 +73,7 @@ public class PartnerSettleTask {
private
void
updateAll
(
long
beginTs
,
long
endTs
)
{
private
void
updateAll
(
long
beginTs
,
long
endTs
)
{
updateOrderCommission
(
beginTs
,
endTs
,
0
,
0
);
updateOrderCommission
(
beginTs
,
endTs
,
0
,
0
);
doSettle
(
beginTs
,
endTs
);
//
doSettle(beginTs, endTs);
}
}
public
boolean
doOneUserSettle
(
Integer
userId
)
{
public
boolean
doOneUserSettle
(
Integer
userId
)
{
...
@@ -370,7 +370,7 @@ public class PartnerSettleTask {
...
@@ -370,7 +370,7 @@ public class PartnerSettleTask {
partnerReward
.
setCash
(
cash
);
partnerReward
.
setCash
(
cash
);
BigDecimal
commission
=
cash
.
multiply
(
partnerReward
.
getCommissionRate
());
BigDecimal
commission
=
cash
.
multiply
(
partnerReward
.
getCommissionRate
());
partnerReward
.
setCommissionAcount
(
commission
);
partnerReward
.
setCommissionAcount
(
commission
);
partnerReward
.
setSettleState
(
Constants
.
SETTLE_STATE_DONE
);
//
partnerReward.setSettleState(Constants.SETTLE_STATE_DONE);
partnerReward
.
setUpdatedAt
(
System
.
currentTimeMillis
()
/
1000L
);
partnerReward
.
setUpdatedAt
(
System
.
currentTimeMillis
()
/
1000L
);
// partnerRewardService.updateById(partnerReward);
// partnerRewardService.updateById(partnerReward);
updateCommisionList
.
add
(
partnerReward
);
updateCommisionList
.
add
(
partnerReward
);
...
@@ -380,7 +380,7 @@ public class PartnerSettleTask {
...
@@ -380,7 +380,7 @@ public class PartnerSettleTask {
partnerReward
.
setCash
(
allMoneyOri
);
partnerReward
.
setCash
(
allMoneyOri
);
BigDecimal
commission
=
allMoneyOri
.
multiply
(
partnerReward
.
getCommissionRate
());
BigDecimal
commission
=
allMoneyOri
.
multiply
(
partnerReward
.
getCommissionRate
());
partnerReward
.
setCommissionAcount
(
commission
);
partnerReward
.
setCommissionAcount
(
commission
);
partnerReward
.
setSettleState
(
Constants
.
SETTLE_STATE_DONE
);
//
partnerReward.setSettleState(Constants.SETTLE_STATE_DONE);
partnerReward
.
setUpdatedAt
(
System
.
currentTimeMillis
()
/
1000L
);
partnerReward
.
setUpdatedAt
(
System
.
currentTimeMillis
()
/
1000L
);
// partnerRewardService.updateById(partnerReward);
// partnerRewardService.updateById(partnerReward);
updateCommisionList
.
add
(
partnerReward
);
updateCommisionList
.
add
(
partnerReward
);
...
...
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