Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -430,17 +430,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             LocalDateTime updatedAt = LocalDateTime.now();
             if (status == 3) {
                 PerformanceMemberAuditParam memberAuditVo = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId).and("status").is(1)), PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
-                int isAdvance = 0;
-                int isDiscount = 0;
                 for (TicketMemberAuditParam item : memberAuditVo.getTicketMemberAudit()) {
-
-                    if (item.getPriceDiscountMember().compareTo(new BigDecimal("0")) == 1) {
-                        isDiscount = 1;
-                    }
-                    if (item.getAdvanceMinuteMember() > 0) {
-                        isAdvance = 1;
-                    }
-
                     //修改数据库
                     KylinTicketStatus ticketStatus = new KylinTicketStatus();
                     ticketStatus.setMemberLimitCount(item.getMemberLimitCount());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

@@ -144,6 +144,7 @@ public class MongoVoUtils {
             voData.setFieldsData(fields, cityName);
             voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellTime, isAdvance, isDiscount, payCountdownMinute);
             voData.setTicketTimeList(timeList);
+            voData.setAppStatus(p2.getStatus());
             return voData;
         }catch (Exception e){
             e.printStackTrace();