Commit 04b7ff48 by guanchen

刷新佣金时 不再更新状态

parent 226eb959
...@@ -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);
} }
......
...@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment