Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refundBatch/applyView.html

@@ -15,7 +15,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">演出名称：</label>
 				<div class="col-sm-8">
-					<input class="form-control" type="text" name="title">
+					<span id="performanceTitle"></span>
 				</div>
 			</div>
 			<div class="form-group">
@@ -56,15 +56,56 @@
 								$.modal.loading("正在查询演出，请稍后...");
 							},
 							success: function(result) {
+								$("#performanceTitle").text(result.kylinPerformanceMisVo.title);
 								var options = {
-									data: result.orderTicketEntitiesVo,
+									data: result.performanceOrderStatisticalDao,
 									pagination: false,
 									columns: [{
 										checkbox: true
 									},
 										{
-											field: 'orderTicketEntitiesId',
-											title: '票种数据'
+											field: 'title',
+											title: '票种名'
+										},
+										{
+											field: 'price',
+											title: '单价'
+										},
+										{
+											field: 'type',
+											title: '类型'
+										},
+										{
+											field: 'useStart',
+											title: '适用时间'
+										},
+										{
+											field: 'saleGeneral',
+											title: '销售总数量'
+										},
+										{
+											field: 'totalMemberNumber',
+											title: '会员销售数量'
+										},
+										{
+											field: 'surplusGeneral',
+											title: '库存数量'
+										},
+										{
+											field: 'totalPayingNumber',
+											title: '正在支付数量'
+										},
+										{
+											field: 'totalRefundGeneral',
+											title: '退票数量'
+										},
+										{
+											field: 'totalSalePrice',
+											title: '销售额（元）'
+										},
+										{
+											field: 'totalExchange',
+											title: '兑换数量'
 										},
 									]
 								};

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -1053,7 +1053,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
 //                    List<KylinOrderTicketEntities> entities = entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId()));
                     List<KylinOrderTicketEntitiesVo> entities = vo.getEntitiesVoList();
-                            entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId()));
+//                            entitiesMapper.selectList(new UpdateWrapper<KylinOrderTicketEntities>().eq("order_id", item.getOrderTicketsId()));
                     for (int i = 0; i < entities.size(); i++) {
                         KylinOrderTicketEntitiesVo items = entities.get(i);
                         dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);