PerformanceVo 修改 增加 是否优惠 是否提前 修复了 创建票逻辑

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceVo.java

@@ -20,6 +20,8 @@ public class PerformanceVo {
     private String performancesId;
     @ApiModelProperty(value = "演出名称")
     private String title;
+    @ApiModelProperty(value = "演出图片")
+    private String imgPoster;
     @ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧 101音乐节 102小型演出(livehouse演出) 103巡演")
     private int type;
     @ApiModelProperty(value = "演出开始时间")
@@ -70,6 +72,10 @@ public class PerformanceVo {
     private Integer limitCountMember;
     @ApiModelProperty(value = "是否专属")
     private int isExclusive;
+    @ApiModelProperty(value = "是否优惠")
+    private int isDiscount;
+    @ApiModelProperty(value = "是否提前")
+    private int isAdvance;
     @ApiModelProperty(value = "文案")
     private String message;
 
@@ -77,12 +83,13 @@ public class PerformanceVo {
     public void setPerformance(KylinPerformances performance) {
         this.performancesId = performance.getPerformancesId();
         this.title = performance.getTitle();
+        this.imgPoster = performance.getImgPoster();
         this.timeStart = performance.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         this.timeEnd = performance.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         this.type = performance.getType();
     }
 
-    public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime) {
+    public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime,int isAdvance,int isDiscount) {
         this.isLackRegister = isLackRegister;
         this.isMember = isMember;
         this.isExclusive = isExclusive;
@@ -90,9 +97,9 @@ public class PerformanceVo {
         this.stopSellTime = stopSellTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         this.sellTime = sellTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
         this.appStatus = 9;
+        this.isDiscount = isDiscount;
+        this.isAdvance = isAdvance;
         this.message = "";
-
-
     }
 
     public void setPerformanceStatus(KylinPerformanceStatus performanceStatus) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/TicketVo.java

@@ -108,7 +108,7 @@ public class TicketVo {
         this.isElectronic = ticketStatus.getIsElectronic();
         this.isExpress = ticketStatus.getIsExpress();
         this.isStudent = ticketStatus.getIsStudent();
-        this.limitCountMember = ticketStatus.getLimitCountMember();
+        this.limitCountMember = ticketStatus.getMemberLimitCount();
         this.limitCount = ticketStatus.getLimitCount();
         this.counts = ticketStatus.getCounts();
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.service.admin;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
+import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
 import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
@@ -80,7 +81,11 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      */
     PageInfo<PerformanceRecommendAdminDao> listRecommend();
 
-    //获取 演出会员信息(包含场次票)
+    /**
+     * 获取 演出会员信息(包含场次票)
+     * @return sql 数据
+     */
+    PerformanceMemberAuditDao performanceMemberInfo(String performanceId);
 
     //修改 演出会员信息(包含场次票)
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceMemberAuditDao.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @ApiModel
 @Data
 public class PerformanceMemberAuditDao {
@@ -16,6 +18,6 @@ public class PerformanceMemberAuditDao {
     @ApiModelProperty(value = "是否专属")
     private int isExclusive;
     @ApiModelProperty(value = "票种列表")
-    private TicketMemberAuditDao ticketMemberAudit;
+    private List<TicketMemberAuditDao> ticketMemberAudit;
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/TicketMemberAuditDao.java

@@ -11,10 +11,10 @@ public class TicketMemberAuditDao {
     private String ticketsId;
     @ApiModelProperty(value = "演出名称")
     private String title;
-    @ApiModelProperty(value = "是否会员")
+    @ApiModelProperty(value = "适用时间开始")
     private String useStart;
-    @ApiModelProperty(value = "是否专属")
-    private String useEnd;
+//    @ApiModelProperty(value = "使用时间结束")
+//    private String useEnd;
     @ApiModelProperty(value = "状态")
     private int status;
     @ApiModelProperty(value = "开售时间")
@@ -25,7 +25,11 @@ public class TicketMemberAuditDao {
     private int priceMember;
     @ApiModelProperty(value = "会员优惠时间段限购数量")
     private int memberLimitCount;
-    @ApiModelProperty(value = "会员开售时间")
+    @ApiModelProperty(value = "会员提前开售分钟")
     private int timeStartMember;
+    @ApiModelProperty(value = "是否会员")
+    private int isMember;
+    @ApiModelProperty(value = "是否专属")
+    private int isExclusive;
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinTicketStatus.java

@@ -122,7 +122,7 @@ public class KylinTicketStatus implements Serializable {
     /**
      * 会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)
      */
-    private Integer limitCountMember;
+    private Integer memberLimitCount;
 
     /**
      * 是否会员专属 0不是 1是

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinPerformancesMapper.java

@@ -32,6 +32,9 @@ public interface KylinPerformancesMapper extends BaseMapper<KylinPerformances> {
     //推荐列表
     List<PerformanceRecommendAdminDao> reCommendPerformanceList();
 
-//    演出 会员相关信息
-//    PerformanceMemberAuditDao misPerformanceMemberInfo(String performancesId);
+    //演出 会员演出相关信息
+    PerformanceTitleDao misPerformanceMemberInfo(String performancesId);
+
+    //演出 会员票相关信息
+    List<TicketMemberAuditDao> misTicketMemberInfo(String performancesId);
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -48,6 +48,21 @@
         <result column="is_recommend" property="isRecommend"/>
     </resultMap>
 
+    <resultMap id="ticketMemberAuditDaoResult" type="com.liquidnet.service.kylin.dao.TicketMemberAuditDao">
+        <result column="tickets_id" property="ticketsId"/>
+        <result column="t.title" property="title"/>
+        <result column="tt.use_start" property="useStart"/>
+        <result column="t.status" property="status"/>
+        <result column="t.time_start" property="timeStart"/>
+        <result column="t.price" property="price"/>
+        <result column="t.price_discount_member" property="priceMember"/>
+        <result column="advance_minute_member" property="timeStartMember"/>
+        <result column="t.limit_count_member" property="memberLimitCount"/>
+        <result column="t.is_member" property="isMember"/>
+        <result column="t.is_exclusive" property="isExclusive"/>
+    </resultMap>
+
+
     <!-- 第三方演出列表 (不包含退票信息) -->
     <select id="partnerPerformanceList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
         SELECT
@@ -223,39 +238,41 @@
         ORDER BY is_recommend DESC
 
     </select>
-<!--    &lt;!&ndash; Mis根据演出id查询演出名称 &ndash;&gt;-->
-<!--    <select id="misPerformanceMemberInfo" resultMap="com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao">-->
-<!--        SELECT-->
-<!--            performances_id as 'performancesId',title-->
-<!--        FROM-->
-<!--            kylin_performances AS p-->
-<!--                LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id-->
-<!--        WHERE performances_id = ${performancesId};-->
+    <!-- Mis根据演出id查询演出名称 -->
+    <select id="misPerformanceMemberInfo" resultMap="performanceTitleDaoResult">
+        SELECT
+            performances_id ,title
+        FROM
+            kylin_performances AS p
+                LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
+        WHERE performances_id = ${performancesId};
 
-<!--    </select>-->
-<!--    &lt;!&ndash; Mis根据演出id查询票种信息 &ndash;&gt;-->
-<!--    <select id="misPerformanceMemberInfo" resultMap="com.liquidnet.service.kylin.dao.TicketMemberAuditDao">-->
-<!--        SELECT-->
-<!--            tickets_id,t.title,tt.use_start,t.status,t.time_start,t.price,t.price_discount_member,advance_minute_member,t.limit_count_member-->
-<!--        FROM-->
-<!--            kylin_ticket_time_relation AS ttr-->
-<!--                LEFT JOIN kylin_ticket_times AS tt ON tt.ticket_times_id = ttr.times_id-->
-<!--                LEFT JOIN(-->
-<!--                SELECT-->
-<!--                    tickets_id ,-->
-<!--                    tr.times_id as 'times_id',-->
-<!--                    title ,-->
-<!--                    status ,-->
-<!--                    time_start ,-->
-<!--                    price ,-->
-<!--                    advance_minute_member ,-->
-<!--                    price_discount_member ,-->
-<!--                    limit_count_member-->
-<!--                FROM-->
-<!--                    kylin_tickets AS t-->
-<!--                        LEFT JOIN kylin_ticket_status AS ts ON ts.ticket_id = t.tickets_id-->
-<!--                        LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = t.tickets_id-->
-<!--            ) as t on t.times_id = ttr.times_id where ttr.performance_id = {performancesId};-->
+    </select>
+    <!-- Mis根据演出id查询票种信息 -->
+    <select id="misTicketMemberInfo" resultMap="ticketMemberAuditDaoResult">
+        SELECT
+            tickets_id,t.title,tt.use_start,t.status,t.time_start,t.price,t.price_discount_member,advance_minute_member,t.limit_count_member,t.is_member,t.is_exclusive
+        FROM
+            kylin_ticket_time_relation AS ttr
+                LEFT JOIN kylin_ticket_times AS tt ON tt.ticket_times_id = ttr.times_id
+                LEFT JOIN(
+                SELECT
+                    tickets_id ,
+                    tr.times_id as 'times_id',
+                    title ,
+                    status ,
+                    time_start ,
+                    price ,
+                    advance_minute_member ,
+                    price_discount_member ,
+                    limit_count_member ,
+                    is_member ,
+                    is_exclusive
+                FROM
+                    kylin_tickets AS t
+                        LEFT JOIN kylin_ticket_status AS ts ON ts.ticket_id = t.tickets_id
+                        LEFT JOIN kylin_ticket_relations AS tr ON tr.ticket_id = t.tickets_id
+            ) as t on t.times_id = ttr.times_id where ttr.performance_id = ${performancesId};
 
-<!--    </select>-->
+    </select>
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinPerformancesAdminController.java

@@ -4,6 +4,7 @@ package com.liquidnet.service.kylin.controller.admin;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.ResponseDto;
 import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
+import com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao;
 import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
 import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
@@ -132,4 +133,16 @@ public class KylinPerformancesAdminController {
             return ResponseDto.failure("获取失败");
         }
     }
+
+    @GetMapping(value = "performance/member")
+    @ApiOperation(value = "演出会员信息")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PerformanceMemberAuditDao> performanceMemberInfo(String performanceId) {
+        PerformanceMemberAuditDao result = performancesAdminService.performanceMemberInfo(performanceId);
+        if (result != null) {
+            return ResponseDto.success(result);
+        } else {
+            return ResponseDto.failure("获取失败");
+        }
+    }
 }

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

@@ -8,9 +8,7 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
-import com.liquidnet.service.kylin.dao.PerformanceRecommendAdminDao;
-import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
+import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceRecommendAdminParam;
 import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
@@ -299,4 +297,27 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         }
         return pageInfoTmp;
     }
+
+    @Override
+    public PerformanceMemberAuditDao performanceMemberInfo(String performanceId) {
+        PerformanceMemberAuditDao performanceMemberAuditDao = new PerformanceMemberAuditDao();
+        PerformanceTitleDao data = performancesMapper.misPerformanceMemberInfo(performanceId);
+        List<TicketMemberAuditDao> ticketData = performancesMapper.misTicketMemberInfo(performanceId);
+        performanceMemberAuditDao.setPerformancesId(data.getPerformancesId());
+        performanceMemberAuditDao.setTitle(data.getTitle());
+        performanceMemberAuditDao.setIsExclusive(0);
+        performanceMemberAuditDao.setIsMember(0);
+        performanceMemberAuditDao.setTicketMemberAudit(ticketData);
+
+        for (TicketMemberAuditDao item : ticketData) {
+            if (item.getIsMember() == 1) {
+                performanceMemberAuditDao.setIsMember(1);
+            }
+            if (item.getIsExclusive() == 1) {
+                performanceMemberAuditDao.setIsExclusive(1);
+            }
+        }
+
+        return performanceMemberAuditDao;
+    }
 }

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

@@ -499,9 +499,9 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     public boolean onLinePerformance(String performancesId) {
         try {
             KylinPerformanceStatus performanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
-            if (!(performanceStatusData.getStatus() == 3 || performanceStatusData.getStatus() == 7)) {
-                return false;
-            }
+//            if (!(performanceStatusData.getStatus() == 3 || performanceStatusData.getStatus() == 7)) {
+//                return false;
+//            }
             // mysql
             LocalDateTime updatedAt = LocalDateTime.now();
             KylinPerformanceStatus performanceStatusUpdate = new KylinPerformanceStatus();
@@ -528,6 +528,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             int isLackRegister = 0;
             int isMember = 0;
             int isExclusive = 0;
+            int isAdvance = 0;
+            int isDiscount = 0;
             BigDecimal price = new BigDecimal("0.00");
 
 
@@ -581,6 +583,14 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_EXCHANGE, ticketInventoryDto.getSurplusExchange());
                     }
 
+                    if (ticketVo.getMemberPrice().compareTo(ticketVo.getPrice()) != 0) {
+                        isDiscount = 1;
+                    }
+
+                    if (!ticketVo.getTimeStart().equalsIgnoreCase(ticketVo.getMemberTimeStart())) {
+                        isAdvance = 1;
+                    }
+
                     if (ticketVo.getIsMember() == 1) {
                         isMember = 1;
                     }
@@ -609,7 +619,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                 }
 
             }
-            performanceVoData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellTime);
+            performanceVoData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellTime, isAdvance, isDiscount);
             performanceVoData.setPerformanceRelations(performanceRelationsData);
             boolean performanceExists =
                     mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performanceVoData.getPerformancesId())), PerformanceVo.class, PerformanceVo.class.getSimpleName());

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

@@ -74,20 +74,20 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         KylinTicketTimeRelation timesRelations = ticketTimeRelationMapper.selectOne(
                 new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketCreateParam.getTimesId()));
 
-        if(null != timesRelations) {
+        if (null != timesRelations) {
             KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
                     new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", timesRelations.getPerformanceId()));
-            if(null == performanceStatus ){
+            if (null == performanceStatus) {
                 ticketPartnerVo = createTicket(ticketCreateParam);
                 log.info(" PERFORMANCE 票 创建");
-            }else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
+            } else if (performanceStatus.getStatus() >= 3 && performanceStatus.getStatus() != 4) {//未被拒绝 且 通过审核的演出
                 ticketPartnerVo = addNewTicket(ticketCreateParam);
                 log.info(" PERFORMANCE 票 添加");
             } else {
                 ticketPartnerVo = createTicket(ticketCreateParam);
                 log.info(" PERFORMANCE 票 创建");
             }
-        }else{
+        } else {
             ticketPartnerVo = createTicket(ticketCreateParam);
             log.info(" PERFORMANCE 票 创建");
         }
@@ -107,7 +107,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         BeanUtils.copyProperties(ticketCreateParam, ticketPartnerVo);
         ticketPartnerVo.setTicketsId(ticketsId);
         ticketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         ticketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         ticketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 
@@ -118,7 +117,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         ticketPartnerVo.setStatus(0);
         ticketPartnerVo.setDefault();
 
-        ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        if (ticketCreateParam.getIsExpress() == 1) {
+            ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        }
+
+        if (ticketCreateParam.getIsShowCode() == 1) {
+            ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        }
+
         TicketPartnerVo data = mongoTemplate.insert(
                 ticketPartnerVo, TicketPartnerVo.class.getSimpleName()
         );
@@ -139,7 +145,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         BeanUtils.copyProperties(ticketCreateParam, ticketPartnerVo);
         ticketPartnerVo.setTicketsId(ticketsId);
         ticketPartnerVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         ticketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         ticketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 
@@ -150,7 +155,14 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
         ticketPartnerVo.setStatus(-2);
         ticketPartnerVo.setDefault();
 
-        ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        if (ticketCreateParam.getIsExpress() == 1) {
+            ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        }
+
+        if (ticketCreateParam.getIsShowCode() == 1) {
+            ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        }
+
         TicketPartnerVo data = mongoTemplate.insert(
                 ticketPartnerVo, TicketPartnerVo.class.getSimpleName()
         );
@@ -167,13 +179,17 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
             TicketPartnerVo ticketPartnerVo = new TicketPartnerVo();
             BeanUtils.copyProperties(ticketCreateParam, ticketPartnerVo);
             ticketPartnerVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             ticketPartnerVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             ticketPartnerVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             ticketPartnerVo.setTimesId(null);
             ticketPartnerVo.setStatus(null);
             ticketPartnerVo.setDefault();
+            if (ticketCreateParam.getIsExpress() == 1) {
+                ticketPartnerVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            }
+            if (ticketCreateParam.getIsShowCode() == 1) {
+                ticketPartnerVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            }
 
             BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(ticketPartnerVo));
             Document doc = mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).findOneAndUpdate(

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

@@ -137,7 +137,7 @@ public class PerformanceVoTask {
                         status10Count += 1;
                     } else {
                         //库存判断
-                        int surplusGeneral = (int) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY+ticketVoItem.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL);
+                        int surplusGeneral = (int) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVoItem.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL);
 
                         if (surplusGeneral > 0) {
                             status = 6;
@@ -274,14 +274,13 @@ public class PerformanceVoTask {
         performanceMisVo.setSyncAgent(performanceStatus.getSyncAgent());
 
 
-
         boolean exists = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceMisVo.class, PerformanceMisVo.class.getSimpleName());
 
         if (!exists) {
             mongoTemplate.insert(
                     performanceMisVo, PerformanceMisVo.class.getSimpleName()
             );
-        }else{
+        } else {
             BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(performanceMisVo));
             mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
@@ -390,8 +389,9 @@ public class PerformanceVoTask {
                     ticketStatus.setTicketId(tickets.getTicketsId());
                     ticketStatus.setCounts(1);
                     ticketStatus.setIsMember(1);
+                    ticketStatus.setIsExclusive(0);
                     ticketStatus.setIsTrueName(performanceStatus.getIsTrueName());
-                    ticketStatus.setLimitCountMember(1);
+                    ticketStatus.setMemberLimitCount(1);
                     ticketStatus.setStatusExchange(7);
                     ticketStatus.setQrCodeShowTime(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getQrCodeShowTime())));
 
@@ -409,7 +409,7 @@ public class PerformanceVoTask {
                 }
             }
         } catch (Exception e) {
-
+            e.printStackTrace();
         }
     }
 
@@ -447,9 +447,9 @@ public class PerformanceVoTask {
             performanceRelations.setCreatedAt(null);
             performanceRelations.setUpdatedAt(updatedAt);
 
-            performancesMapper.update(performances,new UpdateWrapper<KylinPerformances>().eq("performances_id",performances.getPerformancesId()));
-            performanceStatusMapper.update(performanceStatus,new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id",performances.getPerformancesId()));
-            performanceRelationsMapper.update(performanceRelations,new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id",performances.getPerformancesId()));
+            performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performances.getPerformancesId()));
+            performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performances.getPerformancesId()));
+            performanceRelationsMapper.update(performanceRelations, new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performances.getPerformancesId()));
 
 
             //场次数据
@@ -472,13 +472,13 @@ public class PerformanceVoTask {
                 ticketTimeRelation.setCreatedAt(null);
                 ticketTimeRelation.setUpdatedAt(updatedAt);
 
-                ticketTimesMapper.update(ticketTimes,new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id",ticketTimes.getTicketTimesId()));
-                ticketTimeRelationMapper.update(ticketTimeRelation,new UpdateWrapper<KylinTicketTimeRelation>().eq("ticket_time_id",ticketTimes.getTicketTimesId()));
+                ticketTimesMapper.update(ticketTimes, new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimes.getTicketTimesId()));
+                ticketTimeRelationMapper.update(ticketTimeRelation, new UpdateWrapper<KylinTicketTimeRelation>().eq("ticket_time_id", ticketTimes.getTicketTimesId()));
 
                 //修改票
                 for (TicketPartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
                     TicketPartnerVo ticketPartnerVo;
-                    if(ticketItem.getStatus()!=7){
+                    if (ticketItem.getStatus() != 7) {
                         BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
                         Document docTicket = mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).findOneAndUpdate(
                                 Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
@@ -486,7 +486,7 @@ public class PerformanceVoTask {
                                 new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
                         );
                         ticketPartnerVo = JsonUtils.fromJson(docTicket.toJson(), TicketPartnerVo.class);
-                    }else{
+                    } else {
                         ticketPartnerVo = mongoTemplate.findOne(
                                 Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())),
                                 TicketPartnerVo.class,
@@ -535,9 +535,9 @@ public class PerformanceVoTask {
                     ticketRelations.setCreatedAt(null);
                     ticketRelations.setUpdatedAt(updatedAt);
 
-                    ticketsMapper.update(tickets,new UpdateWrapper<KylinTickets>().eq("tickets_id",tickets.getTicketsId()));
-                    ticketStatusMapper.update(ticketStatus,new UpdateWrapper<KylinTicketStatus>().eq("tickets_id",tickets.getTicketsId()));
-                    ticketRelationsMapper.update(ticketRelations,new UpdateWrapper<KylinTicketRelations>().eq("tickets_id",tickets.getTicketsId()));
+                    ticketsMapper.update(tickets, new UpdateWrapper<KylinTickets>().eq("tickets_id", tickets.getTicketsId()));
+                    ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("tickets_id", tickets.getTicketsId()));
+                    ticketRelationsMapper.update(ticketRelations, new UpdateWrapper<KylinTicketRelations>().eq("tickets_id", tickets.getTicketsId()));
                 }
             }
         } catch (Exception e) {