记得上下班打卡 | git大法好,push需谨慎

Commit 0351738f authored by GaoHu's avatar GaoHu

exit:黑名单记录买票数据

parent be9de7a9
...@@ -411,7 +411,7 @@ public class OrderUtils { ...@@ -411,7 +411,7 @@ public class OrderUtils {
agentVo.setIdentity(identity); agentVo.setIdentity(identity);
agentVo.setIsBlack(isBlack); agentVo.setIsBlack(isBlack);
agentVo.setAgentId(agentId); agentVo.setAgentId(agentId);
if (isBlack == 1) { /*if (isBlack == 1) {
agentVo.setAgentMasterId("0"); agentVo.setAgentMasterId("0");
agentVo.setCarry(BigDecimal.ZERO); agentVo.setCarry(BigDecimal.ZERO);
agentVo.setExCarry(BigDecimal.ZERO); agentVo.setExCarry(BigDecimal.ZERO);
...@@ -426,6 +426,15 @@ public class OrderUtils { ...@@ -426,6 +426,15 @@ public class OrderUtils {
agentVo.setCarry(ordCarry); agentVo.setCarry(ordCarry);
agentVo.setExCarry(totalCarry.subtract(ordCarry)); agentVo.setExCarry(totalCarry.subtract(ordCarry));
} }
}*/
if (agentId.equals(masterId)) {
agentVo.setAgentMasterId("0");
agentVo.setCarry(totalCarry);
agentVo.setExCarry(BigDecimal.ZERO);
} else {
agentVo.setAgentMasterId(masterId);
agentVo.setCarry(ordCarry);
agentVo.setExCarry(totalCarry.subtract(ordCarry));
} }
return agentVo; return agentVo;
} else { } else {
......
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