提交 销售数据ui

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/saleData.html

@@ -24,11 +24,14 @@
             <label class="col-sm-3 control-label is-required">票提设置：</label>
             <table id="team-table" class="table table-condensed table-sm" th:border="1">
                 <tr>
+                    <td>票种名称</td>
                     <td>总代票提</td>
                     <td>普代票提</td>
                 <tr/>
                 <div th:each="item : *{showAgentVoList}">
                     <tr class="content-tr">
+                        <td th:text="${item.title}">
+                        </td>
                         <td th:text="${item.totalCarry}">
                         </td>
                         <td th:text="${item.ordCarry}">
@@ -49,7 +52,7 @@
                     </div>
                     <td>总销售张数</td>
                     <td>总销售金额</td>
-                    <td>票提</td>
+                    <td>总销售佣金</td>
                     <td>打款状态</td>
                     <td>操作</td>
                 <tr/>
@@ -59,11 +62,10 @@
                         <td th:text="${item.cityName}"></td>
                         <td th:if="${item.type==1}" th:text="总代"></td>
                         <td th:if="${item.type==2}" th:text="普代"></td>
-                        <div th:each="itemAgent : ${item.dataAgentVos}">
-                            <td th:text="${itemAgent.number}"></td>
-                        </div>
                         <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td>
-<!--                        <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.price}"></td>-->
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![number])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![price])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![commission])}"></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>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -359,9 +359,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     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) {
                 userDataAgentVos.add(userDataAgentVo);
-            }
+//            }
         }
         userData.setUid(smileUser.getUid());
         userData.setUsername(smileUser.getName());