提交代码

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceParam.java

@@ -89,6 +89,15 @@ public class PerformanceParam implements Serializable {
     @ApiModelProperty(value = "巡演id", example = "0",hidden = true)
     private String roadShowId;
 
+    @ApiModelProperty(value = "拒绝理由",hidden = true)
+    private String rejectTxt;
+
+    @ApiModelProperty(value = "审核状态", hidden = true)
+    private String auditStatus;
+
+    @ApiModelProperty(value = "审核状态", hidden = true)
+    private Integer isShow;
+
     @ApiModelProperty(value = "搭售id", example = "0",hidden = true)
     private String projectId;
 

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

@@ -17,6 +17,8 @@ public class PerformanceIgnoreVo {
     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 = "演出开始时间")
@@ -29,20 +31,23 @@ public class PerformanceIgnoreVo {
     private String price;
     @ApiModelProperty(value = "开售时间")
     private String sellTime;
-
     @ApiModelProperty(value = "城市id")
-    private String cityId;
+    private Integer cityId;
+    @ApiModelProperty(value = "城市名称")
+    private String cityName;
     @ApiModelProperty(value = "场地id")
     private String fieldId;
     @ApiModelProperty(value = "场地名称")
     private String fieldName;
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
     @ApiModelProperty(value = "搭售id")
     private String projectId;
     @ApiModelProperty(value = "巡演id")
     private String roadShowId;
 
-//@ApiModelProperty(value = "巡演相关")
-//    private String roadShow;
     // OSS
 //    @ApiModelProperty(value = "演出详情")
 //    private String details;
@@ -50,6 +55,8 @@ public class PerformanceIgnoreVo {
 //    @ApiModelProperty(value = "购票须知")
 //    private String noticeImage;
 
+    @ApiModelProperty(value = "推荐顺序 0为不推荐")
+    private int isRecommend;
     @ApiModelProperty(value = "状态")
     private int appStatus;
     @ApiModelProperty(value = "是否可买")
@@ -58,42 +65,19 @@ public class PerformanceIgnoreVo {
     private int isMember;
     @ApiModelProperty(value = "是否开启缺票登记")
     private int isLackRegister;
+    @ApiModelProperty(value = "是否实名")
+    private int isTrueName;
+    @ApiModelProperty(value = "限购张数")
+    private int limitCount;
+    @ApiModelProperty(value = "会员限购张数")
+    private Integer limitCountMember;
     @ApiModelProperty(value = "是否专属")
     private int isExclusive;
+    @ApiModelProperty(value = "是否优惠")
+    private int isDiscount;
+    @ApiModelProperty(value = "是否提前")
+    private int isAdvance;
     @ApiModelProperty(value = "文案")
     private String message;
 
-
-    public void setPerformance(KylinPerformances performance) {
-        this.performancesId = performance.getPerformancesId();
-        this.title = performance.getTitle();
-        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"));
-    }
-
-    public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellTime) {
-        this.isLackRegister = isLackRegister;
-        this.isMember = isMember;
-        this.isExclusive = isExclusive;
-        this.price = price + "起";
-        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.message = "";
-
-
-    }
-
-    public void setPerformanceStatus(KylinPerformanceStatus performanceStatus) {
-        this.statusSell = performanceStatus.getStatusSell();
-    }
-
-    //TODO 巡演 搭售 场地
-    public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
-        this.fieldId = "";
-        this.fieldName = "";
-        this.cityId = "";
-        this.projectId = "";
-        this.roadShowId = "";
-    }
 }

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

@@ -119,12 +119,12 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 map.put("status", status);
                 map.put("auditStatus", auditStatus);
                 map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-//                BasicDBObject objectPerformanceVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-//                Document doc = mongoTemplate.getCollection(PerformanceMisVo.class.getSimpleName()).findOneAndUpdate(
-//                        Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
-//                        objectPerformanceVo,
-//                        new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
-//                );
+                BasicDBObject objectPerformanceVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
+                Document doc = mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).findOneAndUpdate(
+                        Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
+                        objectPerformanceVo,
+                        new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
+                );
 
                 KylinPerformanceStatus sqlStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
                 if (sqlStatus.getStatus() == 1) {
@@ -176,7 +176,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 map.put("status", status);
                 map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                mongoTemplate.getCollection(PerformancePartnerVo.class.getSimpleName()).updateOne(
+                mongoTemplate.getCollection(PerformanceParam.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
                         object
                 );

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

@@ -140,6 +140,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performanceParam.setStatusSell(1);
             performanceParam.setRoadShowId("0");
             performanceParam.setProjectId("0");
+            performanceParam.setIsShow(1);
             performanceParam.setFieldName((String)redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceParam.getFieldId(), "name"));
 
 
@@ -588,8 +589,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         ticketInventoryDto.setSurplusGeneral(ticketStatus.getTotalGeneral());
                         ticketInventoryDto.setTicketsId(ticketVo.getTicketsId());
                         redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL, ticketInventoryDto.getSurplusGeneral());
-                        redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL, ticketInventoryDto.getSurplusGeneral());
-
+                        redisUtil.hset(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_EXCHANGE, ticketInventoryDto.getSurplusExchange());
                     } else {
                         int surplusGeneral = (int) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL);
                         int surplusExchange = (int) redisUtil.hget(KylinRedisConst.PERFORMANCES_INVENTORY + ticketVo.getTicketsId(), KylinRedisConst.SURPLUS_EXCHANGE);

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

@@ -137,7 +137,7 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
         TicketTimesPartnerVo data = mongoTemplate.insert(
                 ticketTimesPartnerVo, TicketTimesPartnerVo.class.getSimpleName()
         );
-        return null;
+        return ticketTimesPartnerVo;
     }
 
     @Override

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

@@ -73,12 +73,11 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
     public TicketPartnerVo createTicketSummary(TicketCreateParam ticketCreateParam) {
         TicketPartnerVo ticketPartnerVo = null;
         //获取演出状态
-        KylinTicketTimeRelation timesRelations = ticketTimeRelationMapper.selectOne(
-                new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketCreateParam.getTimesId()));
+        TicketTimesPartnerVo timesPartnerVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())),TicketTimesPartnerVo.class,TicketTimesPartnerVo.class.getSimpleName());
 
-        if (null != timesRelations) {
+        if (null != timesPartnerVo) {
             KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(
-                    new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", timesRelations.getPerformanceId()));
+                    new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", timesPartnerVo.getPerformancesId()));
             if (null == performanceStatus) {
                 ticketPartnerVo = createTicket(ticketCreateParam);
                 log.info(" PERFORMANCE 票 创建");
@@ -200,7 +199,6 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
-            // redis 操作
             TicketPartnerVo ticketPartnerVoData = JsonUtils.fromJson(doc.toJson(), TicketPartnerVo.class);
             return ticketPartnerVoData;
         } catch (Exception e) {

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

@@ -251,14 +251,16 @@ public class PerformanceVoTask {
         performanceMisVo.setPrice(floatList.get(0) + "起");
         performanceMisVo.setStopSellTime(StringList.get(0));
         performanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
-        performanceMisVo.setStatus(1);
-        performanceMisVo.setStatusSell(1);
-        performanceMisVo.setRejectTxt("");
 
-        performanceMisVo.setIsShow(1);
-        performanceMisVo.setIsDistribution(0);
-        performanceMisVo.setSyncAgent(0);
-        performanceMisVo.setAuditStatus(0);
+//        if (performanceMisVo.getStatus() != 0) {
+//            performanceMisVo.setStatus(null);
+//            performanceMisVo.setStatusSell(null);
+//            performanceMisVo.setRejectTxt("");
+//            performanceMisVo.setIsShow(1);
+            performanceMisVo.setIsDistribution(0);
+            performanceMisVo.setSyncAgent(0);
+            performanceMisVo.setAuditStatus(0);
+//        }
 
 //        boolean exists = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceMisVo.class, PerformanceMisVo.class.getSimpleName());
 //
@@ -419,7 +421,7 @@ public class PerformanceVoTask {
                     tickets.setPriceDiscount(new BigDecimal("0.00"));
                     tickets.setTimeStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeStart())));
                     tickets.setTimeEnd(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEnd())));
-                    if(ticketItem.getIsExpress()==1) {
+                    if (ticketItem.getIsExpress() == 1) {
                         tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
                     }
                     tickets.setUseStart(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketTimeItem.getUseStart())));
@@ -436,7 +438,7 @@ public class PerformanceVoTask {
                     ticketStatus.setIsTrueName(performanceStatus.getIsTrueName());
                     ticketStatus.setMemberLimitCount(1);
                     ticketStatus.setStatusExchange(7);
-                    if(ticketItem.getIsShowCode() == 1){
+                    if (ticketItem.getIsShowCode() == 1) {
                         ticketStatus.setQrCodeShowTime(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getQrCodeShowTime())));
                     }