Merge branch 'zjp_20241105_daili' into jxl_20240313_prod

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

@@ -55,9 +55,12 @@
                         <td th:text="${item.title}"></td>
                     </div>
                     <td>总销售张数</td>
-                    <td>总销售金额</td>
-                    <td>实际销售金额</td>
+                    <td>票面票房金额</td>
+                    <td>总支付金额</td>
+                    <td>快递费总金额</td>
                     <td>优惠券金额</td>
+                    <td>实际销售金额</td>
+                    <td>佣金比例</td>
                     <td>总销售佣金</td>
                     <td>打款状态</td>
                     <td>是否黑名单</td>
@@ -77,9 +80,12 @@
                         <td th:text="${item.agentName}"></td>
                         <td th:each="itemAgent : ${item.dataAgentVos}" th:text="${itemAgent.number}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![number])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![faceTotalPrice])}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![priceReal])}"></td>
-                        <td th:text="${#aggregates.sum(item.dataAgentVos.![realTotalPrice])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![totalPriceExpress])}"></td>
                         <td th:text="${#aggregates.sum(item.dataAgentVos.![voucherPrice])}"></td>
+                        <td th:text="${#aggregates.sum(item.dataAgentVos.![realTotalPrice])}"></td>
+                        <td th:text="${item.agentDistributions}"></td>
                         <td th:text="${item.totalCommission}"></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/dto/ShowAgentVo.java

@@ -45,4 +45,8 @@ public class ShowAgentVo {
      */
     @ApiModelProperty(value = "普代票提", example = "")
     private BigDecimal ordCarry;
+
+
+    @ApiModelProperty(value = "票种单价", example = "")
+    private BigDecimal price;
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserData.java

@@ -77,7 +77,8 @@ public class UserData implements Serializable, Cloneable {
 
     @ApiModelProperty(value = "总佣金")
     private BigDecimal totalCommission;
-
+    @ApiModelProperty(value = "票提", example = "")
+    private BigDecimal agentDistributions;
 
     private static final UserData obj = new UserData();
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserDataAgentVo.java

@@ -67,6 +67,26 @@ public class UserDataAgentVo implements Serializable, Cloneable{
     @ApiModelProperty(value = "优惠券金额", example = "")
     private BigDecimal voucherPrice;
 
+
+
+    /**
+     * 票面金额
+     */
+    @ApiModelProperty(value = "票面金额", example = "")
+    private BigDecimal faceTotalPrice;
+
+    /**
+     * 快递费总金额
+     */
+    @ApiModelProperty(value = "快递费总金额", example = "")
+    private BigDecimal totalPriceExpress;
+
+    /**
+     * 票提
+     */
+    @ApiModelProperty(value = "票提", example = "")
+    private BigDecimal agentDistributions;
+
     private static final UserDataAgentVo obj = new UserDataAgentVo();
 
     public static UserDataAgentVo getNew() {

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/ShowBaseVoDto.java

@@ -89,6 +89,21 @@ public class ShowBaseVoDto implements Serializable, Cloneable{
      */
     private BigDecimal voucherPrice;
 
+    /**
+     * 票面金额
+     */
+    private BigDecimal faceTotalPrice;
+
+    /**
+     * 快递费总金额
+     */
+    private BigDecimal totalPriceExpress;
+
+    /**
+     * 佣金比例
+     */
+    private BigDecimal agentDistributions;
+
     private static final ShowBaseVoDto obj = new ShowBaseVoDto();
 
     public static ShowBaseVoDto getNew() {

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -88,7 +88,10 @@
             SUM( kot.number ) number,
             SUM( (kot.price_actual - kot.price_express) * sukotr.agent_distributions ) totalPrice,
             SUM( (kot.price_actual - kot.price_express) ) realTotalPrice,
-            SUM( kot.price_voucher ) voucherPrice
+            SUM( kot.price_voucher ) voucherPrice,
+            SUM( kot.price_express )  totalPriceExpress,
+            SUM( kot.price_total - kot.price_express ) faceTotalPrice,
+            MAX(sukotr.agent_distributions ) agentDistributions
         FROM
             kylin_order_tickets AS kot
                 INNER JOIN (
@@ -129,6 +132,13 @@
         GROUP BY
             sukotr.uid,
             sukotr.ticket_id
+        ORDER BY
+            CASE sukotr.type
+            WHEN 2 THEN 1
+            WHEN 1 THEN 2
+            WHEN 5 THEN 3
+            ELSE 4
+        END
     </select>
 
     <update id="upTakeByPerId">

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -186,7 +186,7 @@
                              FROM kylin_order_ticket_relations AS kotr
                                       INNER JOIN kylin_order_ticket_status AS kots ON kots.order_id = kotr.order_id
                              WHERE kotr.performance_id = #{performancesId}
-                               AND kotr.agent_id != 0 AND kots.status IN (1,6,3)) kk ON su.uid = kk.agent_id_master
+                               AND kotr.agent_id != 0 AND kots.status IN (1)) kk ON su.uid = kk.agent_id_master
         GROUP BY su.uid
     </select>