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

Commit b771955d authored by 胡佳晨's avatar 胡佳晨

1

parent 02550d85
...@@ -62,7 +62,8 @@ ...@@ -62,7 +62,8 @@
<div th:each="itemAgent : ${item.dataAgentVos}"> <div th:each="itemAgent : ${item.dataAgentVos}">
<td th:text="${itemAgent.number}"></td> <td th:text="${itemAgent.number}"></td>
</div> </div>
<td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.price}"></td> <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td>
<!-- <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.price}"></td>-->
<td th:if="${item.priceStatus!=0}" th:text="待打款"></td> <td th:if="${item.priceStatus!=0}" th:text="待打款"></td>
<td th:if="${item.priceStatus==0}" th:text="已打款"></td> <td th:if="${item.priceStatus==0}" th:text="已打款"></td>
<td th:if="${item.priceStatus!=0}" th:text="打款按钮"></td> <td th:if="${item.priceStatus!=0}" th:text="打款按钮"></td>
......
...@@ -347,7 +347,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -347,7 +347,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
userDataAgentVo.setPrice(new BigDecimal(0)); userDataAgentVo.setPrice(new BigDecimal(0));
userDataAgentVo.setAgent(smileUser.getType() == 1 ? map.get(smileAgent.getTicketsId()).getTotalCarry() : map.get(smileAgent.getTicketsId()).getOrdCarry()); userDataAgentVo.setAgent(smileUser.getType() == 1 ? map.get(smileAgent.getTicketsId()).getTotalCarry() : map.get(smileAgent.getTicketsId()).getOrdCarry());
userDataAgentVo.setCommission(new BigDecimal(0)); userDataAgentVo.setCommission(new BigDecimal(0));
log.info("saleData:演出id:{},用户id:{},票提id:{}", performancesId, smileUser.getUid(), smileAgent.getTicketsId()); log.debug("saleData:演出id:{},用户id:{},票提id:{}", performancesId, smileUser.getUid(), smileAgent.getTicketsId());
} }
//判断该用户是否是总代理 //判断该用户是否是总代理
if (smileUser.getType() == 1) { if (smileUser.getType() == 1) {
...@@ -356,7 +356,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc ...@@ -356,7 +356,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
if (orgMap != null) { if (orgMap != null) {
userDataAgentVo.setCommission(userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice"))); userDataAgentVo.setCommission(userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice")));
} else { } else {
log.info("saleData:演出id:{},用户id:{},票提id:{}", performancesId, smileUser.getUid(), smileAgent.getTicketsId()); log.debug("saleData:演出id:{},用户id:{},票提id:{}", performancesId, smileUser.getUid(), smileAgent.getTicketsId());
} }
} }
if (userDataAgentVo.getCommission().compareTo(new BigDecimal(0)) != 0) { if (userDataAgentVo.getCommission().compareTo(new BigDecimal(0)) != 0) {
......
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