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

Commit 36c279d3 authored by 胡佳晨's avatar 胡佳晨

修改 sql 增加 优惠券数量

修改 web 显示 优惠券数量
parent b3a47a0a
......@@ -97,6 +97,9 @@
<th>
<div class="cell">退票数量</div>
</th>
<th>
<div class="cell">优惠券数量</div>
</th>
<th>
<div class="cell">销售额(元)</div>
</th>
......@@ -134,6 +137,9 @@
<td>
<div class="cell" th:text="${respBean.totalRefundGeneral}">0</div>
</td>
<td>
<div class="cell" th:text="${respBean.totalVoucherCount}">0</div>
</td>
<td>
<div class="cell" th:text="${respBean.totalSalePrice}">0</div>
</td>
......
......@@ -895,6 +895,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
countBean.setTotalRefundPrice(countBean.getTotalRefundPrice().add(dto.getTotalRefundPrice()));
countBean.setTotalMemberNumber(countBean.getTotalMemberNumber().add(dto.getTotalMemberNumber()));
countBean.setTotalPayingNumber(countBean.getTotalPayingNumber().add(dto.getTotalPayingNumber()));
countBean.setTotalVoucherCount(countBean.getTotalVoucherCount().add(dto.getTotalVoucherCount()));
countBean.setTotalBuyUsers(dto.getTotalBuyUsers());
});
dtoList.add(countBean);
......
......@@ -33,6 +33,7 @@ public class PerformanceOrderStatisticalDao implements Cloneable{
private BigDecimal totalMemberNumber = BigDecimal.ZERO;
private BigDecimal totalPayingNumber = BigDecimal.ZERO;
private BigDecimal totalBuyUsers = BigDecimal.ZERO;
private BigDecimal totalVoucherCount = BigDecimal.ZERO;
private static final PerformanceOrderStatisticalDao obj = new PerformanceOrderStatisticalDao();
public static PerformanceOrderStatisticalDao getNew() {
......
......@@ -171,6 +171,7 @@
<result column="total_member_number" property="totalMemberNumber"/>
<result column="total_paying_number" property="totalPayingNumber"/>
<result column="total_buy_users" property="totalBuyUsers"/>
<result column="total_voucher_count" property="totalVoucherCount"/>
</resultMap>
<resultMap id="performanceOrderListDaoResult" type="com.liquidnet.service.kylin.dao.PerformanceOrderListDao">
<result column="performances_id" property="performancesId"/>
......@@ -514,6 +515,7 @@
IFNULL(ot.total_member_number , 0) AS 'total_member_number',
IFNULL(otp.total_paying_number , 0) AS 'total_paying_number',
IFNULL(ut.total_buy_users , 0) AS 'total_buy_users'
,IFNULL(ot.voucher_count, 0) AS 'total_voucher_count'
FROM
(select t.performances_id,ktr.ticket_id from kylin_performances t inner join kylin_ticket_time_relation kttr
on t.performances_id = kttr.performance_id
......@@ -526,6 +528,7 @@
sum(kot.number)-sum(ifnull(kot.refund_number,0)) AS 'total_sale_general' ,
sum(kot.price_actual)-sum(ifnull(kot.price_refund,0)) AS 'total_sale_price',
sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number
,count(koc.order_id) as voucher_count
FROM
kylin_order_ticket_relations kotr
inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
......
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