修改 所有vo

liquidnet-bus-service/liquidnet-api-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinPerformanceClient.java

 package com.liquidnet.service.feign.kylin.api;
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import feign.hystrix.FallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -18,5 +18,5 @@ public interface FeignKylinPerformanceClient {
 
     // 演出列表
     @GetMapping(value =  "performance/list")
-    ResponseDto<List<PerformanceVo>> performanceList(@RequestParam String... performancesIds);
+    ResponseDto<List<KylinPerformanceVo>> performanceList(@RequestParam String... performancesIds);
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectBaseVo.java

 package com.liquidnet.service.adam.dto.vo;
 
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,7 +30,7 @@ public class AdamCollectBaseVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 18, value = "更新时间")
     private String updatedAt;
     @ApiModelProperty(position = 19, value = "展示信息")
-    private PerformanceVo contentInfo;
+    private KylinPerformanceVo contentInfo;
 
     private static final AdamCollectBaseVo obj = new AdamCollectBaseVo();
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectVo.java

 package com.liquidnet.service.adam.dto.vo;
 
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +18,7 @@ public class AdamCollectVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 13, required = true, value = "收藏时间")
     private String createdAt;
     @ApiModelProperty(position = 14, required = true, value = "展示信息")
-    private PerformanceVo contentInfo;
+    private KylinPerformanceVo contentInfo;
 
     private static final AdamCollectVo obj = new AdamCollectVo();
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamDisposedBaseVo.java

 package com.liquidnet.service.adam.dto.vo;
 
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,7 +30,7 @@ public class AdamDisposedBaseVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 18, value = "更新时间")
     private String updatedAt;
     @ApiModelProperty(position = 19, value = "展示信息")
-    private PerformanceVo contentInfo;
+    private KylinPerformanceVo contentInfo;
 
     private static final AdamDisposedBaseVo obj = new AdamDisposedBaseVo();
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamDisposedVo.java

 package com.liquidnet.service.adam.dto.vo;
 
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +19,7 @@ public class AdamDisposedVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 13, value = "标记时间")
     private String createdAt;
     @ApiModelProperty(position = 14, value = "展示信息")
-    private PerformanceVo contentInfo;
+    private KylinPerformanceVo contentInfo;
     @ApiModelProperty(position = 15, value = "想去的用户信息列表，默认三个")
     private List<AdamDisposedUserVo> userVos;
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java

@@ -13,7 +13,7 @@ import com.liquidnet.service.adam.service.IAdamCollectionService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
@@ -119,13 +119,13 @@ public class AdamCollectionServiceImpl extends ServiceImpl<AdamCollectionMapper,
             try {
                 String[] contentIds = collectVoList.stream().map(AdamCollectVo::getContentId).toArray(a -> new String[collectVoList.size()]);
 
-                ResponseDto<List<PerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
+                ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
 
                 if (performanceVoListDto.isSuccess()) {
-                    List<PerformanceVo> performanceVoList = performanceVoListDto.getData();
+                    List<KylinPerformanceVo> kylinPerformanceVoList = performanceVoListDto.getData();
 
                     collectVoList.forEach(v -> {
-                        performanceVoList.forEach(vl -> {
+                        kylinPerformanceVoList.forEach(vl -> {
                             if (vl.getPerformancesId().equals(v.getContentId())) {
                                 v.setContentInfo(vl);
                             }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java

@@ -14,7 +14,7 @@ import com.liquidnet.service.adam.service.IAdamDisposedService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -115,14 +115,14 @@ public class AdamDisposedServiceImpl extends ServiceImpl<AdamDisposedMapper, Ada
             List<AdamDisposedVo> disposedVoList = mongoTemplate.find(query, AdamDisposedVo.class, AdamDisposedBaseVo.class.getSimpleName());
 
             if (!CollectionUtils.isEmpty(disposedVoList)) {
-                List<PerformanceVo> performanceVoList = null;
+                List<KylinPerformanceVo> kylinPerformanceVoList = null;
                 try {
                     String[] contentIds = disposedVoList.stream().map(AdamDisposedVo::getContentId).toArray(a -> new String[disposedVoList.size()]);
 
-                    ResponseDto<List<PerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
+                    ResponseDto<List<KylinPerformanceVo>> performanceVoListDto = kylinPerformanceClient.performanceList(contentIds);
 
                     if (performanceVoListDto.isSuccess()) {
-                        performanceVoList = performanceVoListDto.getData();
+                        kylinPerformanceVoList = performanceVoListDto.getData();
                     } else {
                         log.info("Failed:{}.API.performanceList(...) for AdamDisposedVo:{}", kylinPerformanceClient.getClass().getSimpleName(), performanceVoListDto.toJson());
                     }
@@ -130,8 +130,8 @@ public class AdamDisposedServiceImpl extends ServiceImpl<AdamDisposedMapper, Ada
                     log.error("Exception:{}.API.performanceList(...) for AdamDisposedVo >> {}", kylinPerformanceClient.getClass().getSimpleName(), e.getLocalizedMessage());
                 }
 
-                if (!CollectionUtils.isEmpty(performanceVoList)) {
-                    performanceVoList.forEach(pv -> {
+                if (!CollectionUtils.isEmpty(kylinPerformanceVoList)) {
+                    kylinPerformanceVoList.forEach(pv -> {
                         disposedVoList.forEach(v -> {
                             if (pv.getPerformancesId().equals(v.getContentId())) v.setContentInfo(pv);
 

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

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysDamaiParam {
+    @ApiModelProperty(value = "类型id", example = "")
+    private String id;
+    @ApiModelProperty(value = "类型 演出/performance ticket/票", example = "")
+    private String type;
+    @ApiModelProperty(value = "状态 1同步 2不同步", example = "")
+    private Integer status;
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/BannersVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinBannersVo.java

@@ -19,7 +19,7 @@ import java.util.List;
 
 @Data
 @ApiModel
-public class BannersVo implements Serializable {
+public class KylinBannersVo implements Serializable {
     @ApiModelProperty(value = "Banner主键ID")
     private String bannersId;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/BuyNoticeVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinBuyNoticeVo.java

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.dto.vo;
 import lombok.Data;
 
 @Data
-public class BuyNoticeVo {
+public class KylinBuyNoticeVo {
 
     private String buyNoticeId;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsMisDetailsVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinFieldsMisDetailsVo.java

@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
 //返回
 
 @Data
-public class FieldsMisDetailsVo implements Serializable {
+public class KylinFieldsMisDetailsVo implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String fieldsId;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsMisListVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinFieldsMisListVo.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class FieldsMisListVo implements Serializable {
+public class KylinFieldsMisListVo implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String fieldsId;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/FieldsVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinFieldsVo.java

@@ -16,7 +16,7 @@ import java.time.LocalDateTime;
 //返回
 
 @Data
-public class FieldsVo implements Serializable {
+public class KylinFieldsVo implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String fieldsId;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PagerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinPagerVo.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Data
 @ApiModel
-public class PagerVo<T> {
+public class KylinPagerVo<T> {
 
     @ApiModelProperty(value = "返回记录集合")
     private List<T> rows;//返回的记录集合

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

@@ -15,7 +15,7 @@ import java.time.format.DateTimeFormatter;
 
 @ApiModel
 @Data
-public class PerformanceVo {
+public class KylinPerformanceVo {
 
     @ApiModelProperty(value = "主键")
     private String performancesId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/RoadShowVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinRoadShowVo.java

@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 @ApiModel
 @Data
-public class RoadShowVo {
+public class KylinRoadShowVo {
 
     @ApiModelProperty(value = "巡演主键", example = "测试场地")
     private String roadShowsId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/TicketTimesVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinTicketTimesVo.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 @Data
 @ApiModel
-public class TicketTimesVo {
+public class KylinTicketTimesVo {
 
     @ApiModelProperty(value = "主键")
     private String ticketTimesId;
@@ -27,7 +27,7 @@ public class TicketTimesVo {
     @ApiModelProperty(value = "适用结束时间")
     private String useEnd;
     @ApiModelProperty(value = "票种")
-    private List<TicketVo> ticketList;
+    private List<KylinTicketVo> ticketList;
 
 //    @ApiModelProperty(value = "票种信息集合")
 //    private List<TicketVo> ticketVoList;

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

@@ -12,7 +12,7 @@ import java.time.format.DateTimeFormatter;
 
 @Data
 @ApiModel
-public class TicketVo {
+public class KylinTicketVo {
 
     @ApiModelProperty(value = "主键")
     private String ticketsId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/PerformanceMemberHistoryVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/KylinPerformanceMemberHistoryVo.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 @ApiModel
 @Data
-public class PerformanceMemberHistoryVo {
+public class KylinPerformanceMemberHistoryVo {
 
     @ApiModelProperty(value = "0未提交 1待审核 2已拒绝 3已通过")
     private Integer status;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/RoadShowAdminVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/KylinRoadShowAdminVo.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 @ApiModel
 @Data
-public class RoadShowAdminVo {
+public class KylinRoadShowAdminVo {
 
     @ApiModelProperty(value = "巡演id")
     private String roadShowId;

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

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 
 @Data
-public class PerformanceIgnoreVo {
+public class KylinPerformanceIgnoreVo {
 
     @ApiModelProperty(value = "主键")
     private String performancesId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/TicketIgnoreVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/KylinTicketIgnoreVo.java

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 import java.time.format.DateTimeFormatter;
 
 @Data
-public class TicketIgnoreVo {
+public class KylinTicketIgnoreVo {
 
     @ApiModelProperty(value = "主键")
     private String ticketsId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/TicketTimesIgnoreVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/ignore/KylinTicketTimesIgnoreVo.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import java.time.format.DateTimeFormatter;
 
 @Data
-public class TicketTimesIgnoreVo {
+public class KylinTicketTimesIgnoreVo {
 
     @ApiModelProperty(value = "主键")
     private String ticketTimesId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformanceMisVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinPerformanceMisVo.java

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
-public class PerformanceMisVo {
+public class KylinPerformanceMisVo {
 
     //演出数据
     @ApiModelProperty(value = "主键id")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/PerformancePartnerListVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinPerformancePartnerListVo.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class PerformancePartnerListVo {
+public class KylinPerformancePartnerListVo {
 
     //演出数据
     @ApiModelProperty(value = "主键id")

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketPartnerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketPartnerVo.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
  * 修改场地全部显示数据参数
  */
 @Data
-public class TicketPartnerVo implements Serializable {
+public class KylinTicketPartnerVo implements Serializable {
     @ApiModelProperty(value = "主键")
     private String ticketsId;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/TicketTimesPartnerVo.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/partner/KylinTicketTimesPartnerVo.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 //返回
 
 @Data
-public class TicketTimesPartnerVo implements Serializable {
+public class KylinTicketTimesPartnerVo implements Serializable {
     @ApiModelProperty(value = "主键id")
     private String ticketTimesId;
 

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

@@ -39,5 +39,5 @@ public class TicketTimesTicketCreatePartnerVo implements Serializable {
 
     //票
     @ApiModelProperty(value = "票数据")
-    private List<TicketPartnerVo> ticket;
+    private List<KylinTicketPartnerVo> ticket;
 }

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

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 订单详情 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface IKylinOrderTicketEntitiesService extends IService<KylinOrderTicketEntities> {
+
+}

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

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 订单 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
+
+    // 下单前判断接口(判断是否可锁定库存)
+
+    // 下单接口(无订单->待支付->可支付)
+
+    // 再次支付(待支付->可支付->倒计时结束释放库存)
+
+    // 取消支付(待支付->订单失效->释放库存->中断倒计时)
+
+    // 支付回调(待支付->已支付->中断倒计时)
+
+    // 同步大麦数据接口
+
+    // 代理票务 可买状态判断
+
+    //订单列表(状态 待支付 已支付 倒计时 已失效)
+
+    //订单详情
+
+    //TASK 倒计时
+}

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

 package com.liquidnet.service.kylin.service;
 
-import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 
 import java.util.HashMap;
 
@@ -16,6 +16,6 @@ public interface KylinFieldsService{
 
     HashMap<String,Object> fieldList(int page, int size, int city_id);
 
-    FieldsVo fieldDetails(String fieldId);
+    KylinFieldsVo fieldDetails(String fieldId);
 
 }

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

@@ -9,7 +9,8 @@ import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceRecommendAdminParam;
-import com.liquidnet.service.kylin.dto.vo.partner.PerformanceMisVo;
+import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
 import java.util.List;
@@ -30,7 +31,7 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      * @param performancesId 演出id
      * @return PerformanceMisVo
      */
-    PerformanceMisVo performanceDetails(String performancesId);
+    KylinPerformanceMisVo performanceDetails(String performancesId);
 
     /**
      * 演出审核
@@ -148,4 +149,10 @@ public interface IKylinPerformancesAdminService extends IService<KylinPerformanc
      * @return
      */
     boolean changeTicketAgent(String ticketId, Integer status);
+
+    /**
+     * 修改 演出&票种&是否同步到大麦
+     * @return
+     */
+    boolean changeSysDamai(List<SysDamaiParam> params);
 }

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

@@ -2,10 +2,9 @@ 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.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
-import com.liquidnet.service.kylin.dto.vo.admin.RoadShowAdminVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
 import com.liquidnet.service.kylin.entity.KylinRoadShows;
 
 /**
@@ -45,7 +44,7 @@ public interface IKylinRoadShowsAdminService extends IService<KylinRoadShows> {
      * @param roadShowId 巡演id
      * @return 巡演数据
      */
-    RoadShowAdminVo detailsRoadShow(String roadShowId);
+    KylinRoadShowAdminVo detailsRoadShow(String roadShowId);
 
     /**
      * 巡演列表

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

 package com.liquidnet.service.kylin.service.admin;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
 import com.liquidnet.service.kylin.dao.FieldMisListDao;
 import com.liquidnet.service.kylin.dto.param.FieldsAuditParam;
 import com.liquidnet.service.kylin.dto.param.FieldsParam;
 import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
 import com.liquidnet.service.kylin.dto.param.FieldsStatusParam;
-import com.liquidnet.service.kylin.dto.vo.FieldsMisDetailsVo;
-import com.liquidnet.service.kylin.dto.vo.FieldsMisListVo;
-import com.thoughtworks.xstream.core.util.Fields;
 
-import java.util.HashMap;
 import java.util.List;
 
 /**

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinBuyNoticePartnerService.java

 package com.liquidnet.service.kylin.service.partner;
 
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
+import com.liquidnet.service.kylin.dto.vo.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -19,6 +19,6 @@ public interface IKylinBuyNoticePartnerService extends IService<KylinBuyNotice>
      * 购票须知列表
      * @return 分页 mysql 数据
      */
-    PageInfo<BuyNoticeVo> getBuyNotice();
+    PageInfo<KylinBuyNoticeVo> getBuyNotice();
 
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketTimesPartnerService.java

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.service.partner;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 
 import java.util.List;
@@ -24,21 +24,21 @@ public interface IKylinTicketTimesPartnerService extends IService<KylinTicketTim
      * @param createTicketTimesParam 相关参数
      * @return vo
      */
-    ResponseDto<TicketTimesPartnerVo> createTimesSummary(CreateTicketTimesParam createTicketTimesParam);
+    ResponseDto<KylinTicketTimesPartnerVo> createTimesSummary(CreateTicketTimesParam createTicketTimesParam);
 
     /**
      * 未通过审核创建场次
      * @param createTicketTimesParam 相关参数
      * @return vo
      */
-    ResponseDto<TicketTimesPartnerVo> createTimes(CreateTicketTimesParam createTicketTimesParam);
+    ResponseDto<KylinTicketTimesPartnerVo> createTimes(CreateTicketTimesParam createTicketTimesParam);
 
     /**
      * 通过审核后创建场次
      * @param createTicketTimesParam 相关参数
      * @return 相关参数
      */
-    ResponseDto<TicketTimesPartnerVo> addNewTimes(CreateTicketTimesParam createTicketTimesParam);
+    ResponseDto<KylinTicketTimesPartnerVo> addNewTimes(CreateTicketTimesParam createTicketTimesParam);
 
     /**
      * 删除 场次(只有未审核通过可删除)
@@ -52,19 +52,19 @@ public interface IKylinTicketTimesPartnerService extends IService<KylinTicketTim
      * @param createTicketTimesParam 相关参数
      * @return vo
      */
-    ResponseDto<TicketTimesPartnerVo> changeTimes(CreateTicketTimesParam createTicketTimesParam);
+    ResponseDto<KylinTicketTimesPartnerVo> changeTimes(CreateTicketTimesParam createTicketTimesParam);
 
     /**
      * 根据演出id 获取全部场次数据
      * @param performancesId 演出id
      * @return list<vo>
      */
-    List<TicketTimesPartnerVo> getTimesMongoList(String performancesId);
+    List<KylinTicketTimesPartnerVo> getTimesMongoList(String performancesId);
 
     /**
      * 根据场次id 获取场次信息
      * @param timesId 场次id
      * @return vo
      */
-    TicketTimesPartnerVo getTimesMongo(String timesId);
+    KylinTicketTimesPartnerVo getTimesMongo(String timesId);
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinTicketsPartnerService.java

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.service.partner;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.entity.KylinTickets;
 
 import java.util.List;
@@ -23,28 +23,28 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
      * @param ticketCreateParam 相关参数
      * @return vo
      */
-    ResponseDto<TicketPartnerVo> createTicketSummary(TicketCreateParam ticketCreateParam);
+    ResponseDto<KylinTicketPartnerVo> createTicketSummary(TicketCreateParam ticketCreateParam);
 
     /**
      * 未通过审核创建票
      * @param ticketCreateParam 相关参数
      * @return vo
      */
-    ResponseDto<TicketPartnerVo> createTicket(TicketCreateParam ticketCreateParam);
+    ResponseDto<KylinTicketPartnerVo> createTicket(TicketCreateParam ticketCreateParam);
 
     /**
      * 通过审核后创建票
      * @param ticketCreateParam 相关参数
      * @return vo
      */
-    ResponseDto<TicketPartnerVo> addNewTicket(TicketCreateParam ticketCreateParam);
+    ResponseDto<KylinTicketPartnerVo> addNewTicket(TicketCreateParam ticketCreateParam);
 
     /**
      * 修改票
      * @param ticketCreateParam 相关参数
      * @return vo
      */
-    ResponseDto<TicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam);
+    ResponseDto<KylinTicketPartnerVo> updateTicket(TicketCreateParam ticketCreateParam);
 
     /**
      * 删除 票(只有未审核通过可删除)
@@ -58,7 +58,7 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
      * @param ticketsId 票id
      * @return vo
      */
-    ResponseDto<TicketPartnerVo> copyTicket(String ticketsId);
+    ResponseDto<KylinTicketPartnerVo> copyTicket(String ticketsId);
 
     /**
      * 整个场次票 提交 审核
@@ -72,14 +72,14 @@ public interface IKylinTicketsPartnerService extends IService<KylinTickets> {
      * @param timesId 场次id
      * @return list<vo>
      */
-    List<TicketPartnerVo> getTicketMongoList(String timesId);
+    List<KylinTicketPartnerVo> getTicketMongoList(String timesId);
 
     /**
      * 从mongo 获取 当前票
      * @param ticketsId 票id
      * @return vo
      */
-    TicketPartnerVo getTicketsMongo(String ticketsId);
+    KylinTicketPartnerVo getTicketsMongo(String ticketsId);
 
     /**
      * 票上线

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/KylinFieldsPartnerService.java

 package com.liquidnet.service.kylin.service.partner;
 
-import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 
 import java.util.HashMap;
 
@@ -8,6 +8,6 @@ public interface KylinFieldsPartnerService {
 
     HashMap<String,Object> fieldList(int page, int size, String name);
 
-    FieldsVo fieldDetails(String fieldId);
+    KylinFieldsVo fieldDetails(String fieldId);
 
 }

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

@@ -99,7 +99,8 @@ public class MybatisPlusCodeGenerator {
 //        String[] dbTableArray = new String[]{"kylin_performances","kylin_performance_status","kylin_performance_relations"};
 //        String[] dbTableArray = new String[]{"kylin_ticket_status","kylin_ticket_time_relation","kylin_ticket_times","kylin_ticket_relations","kylin_tickets"};
 //        String[] dbTableArray = new String[]{"kylin_road_shows"};
-        String[] dbTableArray = new String[]{"kylin_buy_notice"};
+//        String[] dbTableArray = new String[]{"kylin_buy_notice"};
+        String[] dbTableArray = new String[]{"kylin_order_tickets","kylin_order_ticket_relations","kylin_order_ticket_status","kylin_order_ticket_entities"};
 
 
         doGenerator(resourcePath, dsc, directory, dbTableArray);

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

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 订单详情
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinOrderTicketEntities implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * order_ticket_entities_id
+     */
+    private String orderTicketEntitiesId;
+
+    /**
+     * 订单详情关联id
+     */
+    private String orderId;
+
+    /**
+     * 票务id
+     */
+    private String ticketId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 演出id
+     */
+    private String performanceId;
+
+    /**
+     * 入场人证件类型 1大陆身份证 2港澳通行证 3台胞证 4护照 5军官证
+     */
+    private Integer enterType;
+
+    /**
+     * 入场人姓名
+     */
+    private String enterName;
+
+    /**
+     * 入场人联系电话
+     */
+    private String enterMobile;
+
+    /**
+     * 入场人证件号
+     */
+    private String enterIdCode;
+
+    /**
+     * 出票状态: 0未出票 1已出票
+     */
+    private Integer status;
+
+    /**
+     * 大麦同步状态: 0不同步 1待同步 2同步完成 3同步失败
+     */
+    private Integer sysDamai;
+
+    /**
+     * 出票端 例如 pda 验票app android/ios 大麦出票
+     */
+    private String checkClient;
+
+    /**
+     * 支付状态: 0未支付 1已支付 2退款中 3已退款 
+     */
+    private Integer isPayment;
+
+    /**
+     * comment
+     */
+    private String comment;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

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

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 订单关系
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinOrderTicketRelations implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * order_ticket_relations_id
+     */
+    private String orderTicketRelationsId;
+
+    /**
+     * 订单id
+     */
+    private String orderId;
+
+    /**
+     * 转增订单id
+     */
+    private String transferId;
+
+    /**
+     * 关联直播id
+     */
+    private String liveId;
+
+    /**
+     * 分销代理id
+     */
+    private String agentId;
+
+    /**
+     * 购买者是否是会员
+     */
+    private String isMember;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

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

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 订单状态
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinOrderTicketStatus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * order_ticket_status_id
+     */
+    private String orderTicketStatusId;
+
+    /**
+     * 订单id
+     */
+    private String orderId;
+
+    /**
+     * 快递方式 1寄付 2到付
+     */
+    private Integer expressType;
+
+    /**
+     * 转移状态，0未转移，1收到他人转赠，2已转赠给他人
+     */
+    private Integer transferStatus;
+
+    /**
+     * 订单状态:0待付款，1已付款，2已关闭，3正在退款，4已退款, 5待关闭 6部分退款
+     */
+    private Integer status;
+
+    /**
+     * 支付状态:0未支付 1已支付 2支付失败
+     */
+    private Integer payStatus;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

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

+package com.liquidnet.service.kylin.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 订单
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinOrderTickets implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * order_tickets_id
+     */
+    private String orderTicketsId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 用户昵称
+     */
+    private String userName;
+
+    /**
+     * 用户手机号
+     */
+    private String userMobile;
+
+    /**
+     * 演出名称
+     */
+    private String performanceTitle;
+
+    /**
+     * 订单号
+     */
+    private String orderCode;
+
+    /**
+     * 二维码地址
+     */
+    private String qrCode;
+
+    /**
+     * 下单方式
+     */
+    private String orderType;
+
+    /**
+     * 下单版本
+     */
+    private String orderVersion;
+
+    /**
+     * 数量
+     */
+    private String number;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 会员单价
+     */
+    private BigDecimal priceMember;
+
+    /**
+     * 应付价格
+     */
+    private BigDecimal priceTotal;
+
+    /**
+     * 优惠价格
+     */
+    private BigDecimal priceVoucher;
+
+    /**
+     * 实付价格
+     */
+    private BigDecimal priceActual;
+
+    /**
+     * 快递价格
+     */
+    private BigDecimal priceExpress;
+
+    /**
+     * 退款价格
+     */
+    private BigDecimal priceRefund;
+
+    /**
+     * 退款张数
+     */
+    private BigDecimal priceNumber;
+
+    /**
+     * 选择支付方式
+     */
+    private String payType;
+
+    /**
+     * 实际支付方式
+     */
+    private String paymentType;
+
+    /**
+     * 支付时间
+     */
+    private String timePay;
+
+    /**
+     * 收货人
+     */
+    private String expressContacts;
+
+    /**
+     * 收货地址
+     */
+    private String expressAddress;
+
+    /**
+     * 收货人联系方式
+     */
+    private String expressPhone;
+
+    /**
+     * 券使用类别
+     */
+    private String couponType;
+
+    /**
+     * 取票方式 电子票electronic快递票express
+     */
+    private String getTicketType;
+
+    /**
+     * 直播用取票观演码，隔开
+     */
+    private String getTicketDescribe;
+
+    /**
+     * 订单过期时间
+     */
+    private String payCountdownMinute;
+
+    /**
+     * comment
+     */
+    private String comment;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

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

@@ -59,6 +59,11 @@ public class KylinPerformanceStatus implements Serializable {
      */
     private Integer syncAgent;
 
+    /**
+     * 是否同步大麦 0不关联 1关联
+     */
+    private Integer syncDamai;
+
     /**
      * -1未提交审核，0提交审核，1审核通过，2审核拒绝
      */

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

@@ -139,6 +139,11 @@ public class KylinTicketStatus implements Serializable {
      */
     private Integer isAgent;
 
+    /**
+     * 是否同步大麦 0不关联 1关联
+     */
+    private Integer syncDamai;
+
     /**
      * 创建时间
      */

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

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 订单详情 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface KylinOrderTicketEntitiesMapper extends BaseMapper<KylinOrderTicketEntities> {
+
+}

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

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 订单关系 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface KylinOrderTicketRelationsMapper extends BaseMapper<KylinOrderTicketRelations> {
+
+}

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

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 订单状态 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface KylinOrderTicketStatusMapper extends BaseMapper<KylinOrderTicketStatus> {
+
+}

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

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 订单 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface KylinOrderTicketsMapper extends BaseMapper<KylinOrderTickets> {
+
+}

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper">
+
+</mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper">
+
+</mapper>

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

 package com.liquidnet.service.kylin.controller;
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 import com.liquidnet.service.kylin.service.impl.FieldsServiceImpl;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +20,8 @@ public class FieldsController {
 //    @GetMapping(value = "details")
 //    @ApiOperation(value = "获取场地详情")
 //    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<FieldsVo> fieldDetails(@RequestParam(value = "fieldId", defaultValue = "59666659929161728") String fieldId) {
-        FieldsVo result = null;
+    public ResponseDto<KylinFieldsVo> fieldDetails(@RequestParam(value = "fieldId", defaultValue = "59666659929161728") String fieldId) {
+        KylinFieldsVo result = null;
         result = fieldsService.fieldDetails(fieldId);
         if (null == result) {
             return ResponseDto.failure("场地详情查询失败");

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

@@ -2,7 +2,7 @@ package com.liquidnet.service.kylin.controller;
 
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.BannersVo;
+import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinBannersServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -37,7 +37,7 @@ public class KylinBannersController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "position", value = "展示位置 1首页 3周边 5积分商城 6YB 8视频", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "provinceName", value = "城市名称"),
     })
-    public ResponseDto<List<BannersVo>> blist(
+    public ResponseDto<List<KylinBannersVo>> blist(
             @RequestParam() String position,
             @RequestParam(defaultValue = "") String provinceName
     ) {

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

+package com.liquidnet.service.kylin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 订单详情 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+@RestController
+@RequestMapping("orderEnter")
+public class KylinOrderTicketEntitiesController {
+
+}

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

+package com.liquidnet.service.kylin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 订单 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+@RestController
+@RequestMapping("order")
+public class KylinOrderTicketsController {
+
+}

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

@@ -2,8 +2,8 @@ package com.liquidnet.service.kylin.controller;
 
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -91,8 +91,8 @@ public class KylinPerformancesController {
 
     @GetMapping("recommendList")
     @ApiOperation("推荐演出列表")
-    public ResponseDto<List<PerformanceVo>> recommendList() {
-        List<PerformanceVo> result = kylinPerformancesService.recommendList();
+    public ResponseDto<List<KylinPerformanceVo>> recommendList() {
+        List<KylinPerformanceVo> result = kylinPerformancesService.recommendList();
         return ResponseDto.success(result);
     }
 
@@ -113,8 +113,8 @@ public class KylinPerformancesController {
     @GetMapping(value = "list")
     @ApiOperation("根据多个演出id获取演出列表-Adam")
     @ApiImplicitParam(type = "query", dataType = "String", name = "performancesIds", value = "多演出id", required = true)
-    public ResponseDto<List<PerformanceVo>> performanceList(@RequestParam String... performancesIds) {
-        List<PerformanceVo> result = kylinPerformancesService.performanceList(performancesIds);
+    public ResponseDto<List<KylinPerformanceVo>> performanceList(@RequestParam String... performancesIds) {
+        List<KylinPerformanceVo> result = kylinPerformancesService.performanceList(performancesIds);
         return ResponseDto.success(result);
     }
 
@@ -144,11 +144,11 @@ public class KylinPerformancesController {
             @ApiImplicitParam(type = "path", dataType = "String", name = "performancesId", value = "演出id", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isAgent", value = "是否分销 1是 0不是 空/不传/0")
     })
-    public ResponseDto<List<TicketTimesVo>> ticketTimesPartner(
+    public ResponseDto<List<KylinTicketTimesVo>> ticketTimesPartner(
             @PathVariable("performancesId") String performancesId,
             @RequestParam(defaultValue = "0") Integer isAgent
     ) {
-        List<TicketTimesVo> result = kylinPerformancesService.ticketTimesPartner(performancesId, isAgent);
+        List<KylinTicketTimesVo> result = kylinPerformancesService.ticketTimesPartner(performancesId, isAgent);
         if (result.size() > 0) {
             return ResponseDto.success(result);
         } else {

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

@@ -7,8 +7,8 @@ import com.liquidnet.service.kylin.dto.param.FieldsAuditParam;
 import com.liquidnet.service.kylin.dto.param.FieldsParam;
 import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
 import com.liquidnet.service.kylin.dto.param.FieldsStatusParam;
-import com.liquidnet.service.kylin.dto.vo.FieldsVo;
-import com.liquidnet.service.kylin.dto.vo.PagerVo;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPagerVo;
 import com.liquidnet.service.kylin.service.impl.admin.FieldsAdminServiceImpl;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +27,7 @@ public class FieldsAdminController {
 //    @PostMapping(value = "")
 //    @ApiOperation(value = "创建场地")
 //    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<FieldsVo> createFields(@RequestBody FieldsParam fieldsParam) {
+    public ResponseDto<KylinFieldsVo> createFields(@RequestBody FieldsParam fieldsParam) {
         boolean result = fieldsAdminService.fieldCreate(fieldsParam);
         if (result) {
             return ResponseDto.success();
@@ -39,7 +39,7 @@ public class FieldsAdminController {
 //    @PutMapping(value = "")
 //    @ApiOperation(value = "mis修改场地全部数据")
 //    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<FieldsVo> fieldUpdate(@RequestBody FieldsParam fieldsParam) {
+    public ResponseDto<KylinFieldsVo> fieldUpdate(@RequestBody FieldsParam fieldsParam) {
         boolean result = fieldsAdminService.fieldUpdateMessage(fieldsParam);
         if (result) {
             return ResponseDto.success();
@@ -51,16 +51,16 @@ public class FieldsAdminController {
 //    @PostMapping(value = "list")
 //    @ApiOperation(value = "mis获取场地列表")
 //    @ApiResponse(response = PagerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PagerVo<FieldMisListDao>> fieldList(@RequestBody FieldsSearchParam fieldsSearchParam) {
+    public ResponseDto<KylinPagerVo<FieldMisListDao>> fieldList(@RequestBody FieldsSearchParam fieldsSearchParam) {
         List<FieldMisListDao> result = fieldsAdminService.fieldList(fieldsSearchParam);
         Long total = fieldsAdminService.fieldListCount(fieldsSearchParam);
 
-        PagerVo<FieldMisListDao> pagerVo = new PagerVo();
-        pagerVo.setRows(result);
-        pagerVo.setTotal(total);
+        KylinPagerVo<FieldMisListDao> kylinPagerVo = new KylinPagerVo();
+        kylinPagerVo.setRows(result);
+        kylinPagerVo.setTotal(total);
 
-        if (pagerVo.getRows().size() > 0) {
-            return ResponseDto.success(pagerVo);
+        if (kylinPagerVo.getRows().size() > 0) {
+            return ResponseDto.success(kylinPagerVo);
         } else {
             return ResponseDto.failure("获取列表失败");
         }

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

@@ -5,8 +5,8 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.BannersParam;
 import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
-import com.liquidnet.service.kylin.dto.vo.BannersVo;
-import com.liquidnet.service.kylin.dto.vo.PagerVo;
+import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPagerVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinBannersServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -60,8 +60,8 @@ public class KylinBannersAdminController {
     @GetMapping("{bannersId}")
     @ApiOperation("banner详情")
     @ApiImplicitParam(type = "path", dataType = "String", name = "bannersId", value = "banner主键id", required = true)
-    public ResponseDto<BannersVo> detail(@PathVariable("bannersId") String bannersId) {
-        BannersVo result = null;
+    public ResponseDto<KylinBannersVo> detail(@PathVariable("bannersId") String bannersId) {
+        KylinBannersVo result = null;
         result = kylinBannersServiceImpl.detail(bannersId);
         if (null != result) {
             return ResponseDto.success(result);
@@ -79,7 +79,7 @@ public class KylinBannersAdminController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页码"),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "每页数量")
     })
-    public ResponseDto<PagerVo<BannerDetailsListDao>> bannerList(
+    public ResponseDto<KylinPagerVo<BannerDetailsListDao>> bannerList(
             @RequestParam(defaultValue = "") String bannersName,
             @RequestParam(defaultValue = "1") Integer isOnline,
             @RequestParam(defaultValue = "") Integer promotionType,
@@ -95,12 +95,12 @@ public class KylinBannersAdminController {
         List<BannerDetailsListDao> result = kylinBannersServiceImpl.bannerList(bannersSearchParam);
         Long total = kylinBannersServiceImpl.bannerListCount(bannersSearchParam);
 
-        PagerVo<BannerDetailsListDao> pagerVo = new PagerVo();
-        pagerVo.setRows(result);
-        pagerVo.setTotal(total);
+        KylinPagerVo<BannerDetailsListDao> kylinPagerVo = new KylinPagerVo();
+        kylinPagerVo.setRows(result);
+        kylinPagerVo.setTotal(total);
 
-        if (pagerVo.getRows().size() > 0) {
-            return ResponseDto.success(pagerVo);
+        if (kylinPagerVo.getRows().size() > 0) {
+            return ResponseDto.success(kylinPagerVo);
         } else {
             return ResponseDto.failure("获取列表失败");
         }

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

@@ -10,7 +10,8 @@ import com.liquidnet.service.kylin.dao.PerformanceTitleDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceRecommendAdminParam;
-import com.liquidnet.service.kylin.dto.vo.partner.PerformanceMisVo;
+import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinPerformancesAdminServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -53,9 +54,9 @@ public class KylinPerformancesAdminController {
 
     @GetMapping(value = "details")
     @ApiOperation(value = "获取演出详情", position = 2)
-    @ApiResponse(response = PerformanceMisVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<PerformanceMisVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
-        PerformanceMisVo result = null;
+    @ApiResponse(response = KylinPerformanceMisVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinPerformanceMisVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
+        KylinPerformanceMisVo result = null;
         result = performancesAdminService.performanceDetails(performancesId);
         if (null != result) {
             return ResponseDto.success(result);
@@ -224,4 +225,16 @@ public class KylinPerformancesAdminController {
             return ResponseDto.failure("操作失败");
         }
     }
+
+    @PostMapping(value = "performance/sysDamai")
+    @ApiOperation(value = "修改大麦分销状态")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> changeSysDamai(@RequestBody List<SysDamaiParam> params) {
+        boolean result = performancesAdminService.changeSysDamai(params);
+        if (result) {
+            return ResponseDto.success("修改完成");
+        } else {
+            return ResponseDto.failure("操作失败");
+        }
+    }
 }

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

@@ -5,7 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
-import com.liquidnet.service.kylin.dto.vo.admin.RoadShowAdminVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
 import com.liquidnet.service.kylin.service.impl.admin.KylinRoadShowsAdminServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -87,9 +87,9 @@ public class KylinRoadShowsAdminController {
 
     @GetMapping(value = "details")
     @ApiOperation(value = "详情",position = 5)
-    @ApiResponse(response = RoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<RoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
-        RoadShowAdminVo result = null;
+    @ApiResponse(response = KylinRoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinRoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
+        KylinRoadShowAdminVo result = null;
         result = roadShowsService.detailsRoadShow(roadShowId);
         if (result != null) {
             return ResponseDto.success(result);

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

 package com.liquidnet.service.kylin.controller.partner;
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 import com.liquidnet.service.kylin.service.impl.partner.FieldsPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,8 +22,8 @@ public class FieldsPartnerController {
 //    @GetMapping(value = "details")
 //    @ApiOperation(value = "获取场地详情")
 //    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<FieldsVo> fieldDetails(@RequestParam(value = "fieldId", defaultValue = "59666659929161728") String fieldId) {
-        FieldsVo result = null;
+    public ResponseDto<KylinFieldsVo> fieldDetails(@RequestParam(value = "fieldId", defaultValue = "59666659929161728") String fieldId) {
+        KylinFieldsVo result = null;
         result = fieldsPartnerService.fieldDetails(fieldId);
         if (null == result) {
             return ResponseDto.failure("场地详情查询失败");

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

@@ -3,8 +3,7 @@ package com.liquidnet.service.kylin.controller.partner;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
-import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.dto.vo.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinBuyNoticePartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -12,9 +11,6 @@ import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * <p>
  * 购票须知表 前端控制器
@@ -34,8 +30,8 @@ public class KylinBuyNoticeParnterController {
     @GetMapping(value = "")
     @ApiOperation(value = "购票须知列表",position = 1)
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<PageInfo<BuyNoticeVo>> copyPerformance() {
-        PageInfo<BuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
+    public ResponseDto<PageInfo<KylinBuyNoticeVo>> copyPerformance() {
+        PageInfo<KylinBuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
         if (null == result) {
             return ResponseDto.failure("查询失败");
         } else {

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.controller.partner;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesPartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,30 +31,30 @@ public class KylinTicketTimesPartnerController {
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建场次",position = 1)
-    @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesPartnerVo> createTimesSummary(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
+    @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketTimesPartnerVo> createTimesSummary(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
         return ticketTimesPartnerService.createTimesSummary(createTicketTimesParam);
     }
 
     @DeleteMapping(value = "")
     @ApiOperation(value = "删除场次",position = 2)
-    @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
     public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") String ticketTimesId) {
         return ticketTimesPartnerService.deleteTimes(ticketTimesId);
     }
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改场次",position = 3)
-    @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesPartnerVo> changeTimes(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
+    @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketTimesPartnerVo> changeTimes(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
         return ticketTimesPartnerService.changeTimes(createTicketTimesParam);
     }
 
     @GetMapping(value = "/details")
     @ApiOperation(value = "获取场次详情",position = 4)
-    @ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketTimesPartnerVo> getTimesMongo(@RequestParam("ticketTimesId") String ticketTimesId) {
-        TicketTimesPartnerVo result = null;
+    @ApiResponse(response = KylinTicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketTimesPartnerVo> getTimesMongo(@RequestParam("ticketTimesId") String ticketTimesId) {
+        KylinTicketTimesPartnerVo result = null;
         result = ticketTimesPartnerService.getTimesMongo(ticketTimesId);
         if (null == result) {
             return ResponseDto.failure("查询场次信息失败");

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.controller.partner;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
-import com.liquidnet.service.kylin.dto.vo.partner.TicketPartnerVo;
+import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinTicketsPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,15 +31,15 @@ public class KylinTicketsPartnerController {
 
     @PostMapping(value = "")
     @ApiOperation(value = "创建票务",position = 1 )
-    @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketPartnerVo> createTicketSummary(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
+    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketPartnerVo> createTicketSummary(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
         return ticketsPartnerService.createTicketSummary(ticketCreateParam);
     }
 
     @PutMapping(value = "")
     @ApiOperation(value = "修改票务",position = 2)
-    @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketPartnerVo> updateTicket(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
+    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketPartnerVo> updateTicket(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
         return ticketsPartnerService.updateTicket(ticketCreateParam);
     }
 
@@ -52,16 +52,16 @@ public class KylinTicketsPartnerController {
 
     @PostMapping(value = "/copy")
     @ApiOperation(value = "复制票务",position = 4)
-    @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketPartnerVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
+    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketPartnerVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
         return ticketsPartnerService.copyTicket(ticketsId);
     }
 
     @GetMapping(value = "/details")
     @ApiOperation(value = "获取票务详情",position = 5)
-    @ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<TicketPartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
-        TicketPartnerVo result = null;
+    @ApiResponse(response = KylinTicketPartnerVo.class, code = 200, message = "接口返回对象参数")
+    public ResponseDto<KylinTicketPartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
+        KylinTicketPartnerVo result = null;
         result = ticketsPartnerService.getTicketsMongo(ticketsId);
         if (null == result) {
             return ResponseDto.failure("查询票务信息失败");

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

@@ -4,7 +4,7 @@ package com.liquidnet.service.kylin.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 import com.liquidnet.service.kylin.entity.KylinFields;
 import com.liquidnet.service.kylin.mapper.KylinFieldsMapper;
 import com.liquidnet.service.kylin.service.KylinFieldsService;
@@ -40,11 +40,11 @@ public class FieldsServiceImpl extends ServiceImpl<KylinFieldsMapper, KylinField
         Query query = Query.query(Criteria.where("cityId").is(city_id));
 
         // 查询总数
-        long count = mongoTemplate.count(query, FieldsVo.class, FieldsVo.class.getSimpleName());
+        long count = mongoTemplate.count(query, KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());
 
         query.with(pageable);
         info.put("total",count);
-        info.put("data", mongoTemplate.find(query, FieldsVo.class, FieldsVo.class.getSimpleName()));
+        info.put("data", mongoTemplate.find(query, KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName()));
 
         return info;
     }
@@ -56,13 +56,13 @@ public class FieldsServiceImpl extends ServiceImpl<KylinFieldsMapper, KylinField
      * @return FieldsVo
      */
     @Override
-    public FieldsVo fieldDetails(String fieldId) {
-        FieldsVo info = null;
+    public KylinFieldsVo fieldDetails(String fieldId) {
+        KylinFieldsVo info = null;
         // 获取 redis数据
-        info = (FieldsVo) redisUtil.hget(KylinRedisConst.FIELDS, fieldId + "");
+        info = (KylinFieldsVo) redisUtil.hget(KylinRedisConst.FIELDS, fieldId + "");
         //不存在 获取 mongo数据
         if (null == info) {
-            info = mongoTemplate.findOne(Query.query(Criteria.where("fieldsId").is(fieldId)), FieldsVo.class, FieldsVo.class.getSimpleName());
+            info = mongoTemplate.findOne(Query.query(Criteria.where("fieldsId").is(fieldId)), KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());
             redisUtil.hset(KylinRedisConst.FIELDS, fieldId + "",info);
         }
         return info;

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

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
+import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketEntitiesService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 订单详情 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+@Service
+public class KylinOrderTicketEntitiesServiceImpl extends ServiceImpl<KylinOrderTicketEntitiesMapper, KylinOrderTicketEntities> implements IKylinOrderTicketEntitiesService {
+
+}

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

+package com.liquidnet.service.kylin.service.impl;
+
+import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 订单 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+@Service
+public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsMapper, KylinOrderTickets> implements IKylinOrderTicketsService {
+
+}

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

@@ -6,9 +6,9 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.DistanceUtil;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.TicketVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
@@ -115,13 +115,13 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 //        query.fields().exclude();//不包含该字段
 
         // 查询总数
-        long count = mongoTemplate.count(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        long count = mongoTemplate.count(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
         query.with(pageable);
         query.fields().exclude("details");
         query.fields().exclude("noticeImage");
 
-        List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        List<KylinPerformanceVo> list = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
         // 组合数据
         info.put("total", count);
@@ -147,7 +147,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         query.addCriteria(Criteria.where("timeStart").gte(toDayTimeStr).lt(toDayEndTimeStr));
         query.fields().exclude("details");
         query.fields().exclude("noticeImage");
-        List<PerformanceVo> toDayList = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        List<KylinPerformanceVo> toDayList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
         // 三天的
         Query queryT = new Query();
@@ -160,7 +160,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         queryT.addCriteria(Criteria.where("timeStart").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
         queryT.fields().exclude("details");
         queryT.fields().exclude("noticeImage");
-        List<PerformanceVo> threeDaysList = mongoTemplate.find(queryT, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        List<KylinPerformanceVo> threeDaysList = mongoTemplate.find(queryT, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
         HashMap<String, Object> info = new HashMap<>();
         info.put("toDayList", toDayList);
@@ -168,7 +168,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         return info;
     }
 
-    public List<PerformanceVo> recommendList() {
+    public List<KylinPerformanceVo> recommendList() {
         // 固定条件
         Query query = new Query();
         LocalDateTime nowTime = LocalDateTime.now();
@@ -180,7 +180,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         // 推荐
         query.addCriteria(Criteria.where("isRecommend").is(1));
-        List<PerformanceVo> recommendList = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        List<KylinPerformanceVo> recommendList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
         return recommendList;
     }
@@ -188,13 +188,13 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     public HashMap<String, Object> detail(String performancesId, double latitudeFrom, double longitudeFrom) {
         HashMap<String, Object> info = new HashMap<>();
 
-        PerformanceVo performancesInfo = (PerformanceVo) redisUtil.hget(KylinRedisConst.PERFORMANCES, performancesId);
+        KylinPerformanceVo performancesInfo = (KylinPerformanceVo) redisUtil.hget(KylinRedisConst.PERFORMANCES, performancesId);
         String roadShowId = "";
         if (null == performancesInfo) {
             performancesInfo = mongoTemplate.findOne(
                     Query.query(Criteria.where("performancesId").is(performancesId)),
-                    PerformanceVo.class,
-                    PerformanceVo.class.getSimpleName()
+                    KylinPerformanceVo.class,
+                    KylinPerformanceVo.class.getSimpleName()
             );
             if (performancesInfo == null) {
                 return null;
@@ -207,12 +207,12 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             roadShowId = performancesInfo.getRoadShowId();
         }
 
-        List<PerformanceVo> roadList = new ArrayList();
+        List<KylinPerformanceVo> roadList = new ArrayList();
         if (!roadShowId.isEmpty()) {
             roadList = mongoTemplate.find(
                     Query.query(Criteria.where("roadShowId").is(roadShowId)),
-                    PerformanceVo.class,
-                    PerformanceVo.class.getSimpleName()
+                    KylinPerformanceVo.class,
+                    KylinPerformanceVo.class.getSimpleName()
             );
         }
 
@@ -245,7 +245,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         if (longitudeFrom != CommonConst.DFT_DOUBLE_VAL) {
             String diffDistance = DistanceUtil.getDistance(longitudeFrom, latitudeFrom, Double.parseDouble(performancesInfo.getLongitude()), Double.parseDouble(performancesInfo.getLatitude()));
             performancesInfo.setDiffDistance(diffDistance);
-            for (PerformanceVo road : roadList) {
+            for (KylinPerformanceVo road : roadList) {
                 String diffDistanceRoad = DistanceUtil.getDistance(longitudeFrom, latitudeFrom, Double.parseDouble(performancesInfo.getLongitude()), Double.parseDouble(performancesInfo.getLatitude()));
                 road.setDiffDistance(diffDistanceRoad);
             }
@@ -257,26 +257,26 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         return info;
     }
 
-    public List<TicketTimesVo> ticketTimesPartner(String performancesId, Integer isAgent) {
+    public List<KylinTicketTimesVo> ticketTimesPartner(String performancesId, Integer isAgent) {
         HashMap<String, Object> info = new HashMap<>();
 
-        List<TicketTimesVo> ticketTimesList = mongoTemplate.find(
+        List<KylinTicketTimesVo> ticketTimesList = mongoTemplate.find(
                 Query.query(Criteria.where("performanceId").is(performancesId)),
-                TicketTimesVo.class,
-                TicketTimesVo.class.getSimpleName()
+                KylinTicketTimesVo.class,
+                KylinTicketTimesVo.class.getSimpleName()
         );
-        for (TicketTimesVo partner : ticketTimesList) {
+        for (KylinTicketTimesVo partner : ticketTimesList) {
             Query query = Query.query(Criteria.where("timeId").is(partner.getTimeId()));
             if (isAgent > 0) {
                 query.addCriteria(Criteria.where("isAgent").is(isAgent));
             }
-            List<TicketVo> ticketList = mongoTemplate.find(
+            List<KylinTicketVo> ticketList = mongoTemplate.find(
                     query,
-                    TicketVo.class,
-                    TicketVo.class.getSimpleName()
+                    KylinTicketVo.class,
+                    KylinTicketVo.class.getSimpleName()
             );
 
-            for (TicketVo ticket : ticketList) {
+            for (KylinTicketVo ticket : ticketList) {
                 // 处理状态 购买 未开始 结束可更改   下架 售馨不可更改
                 if (ticket.getStatus() == 6 || ticket.getStatus() == 9 || ticket.getStatus() == 10) {
                     String timeEnd = ticket.getTimeEnd();
@@ -327,14 +327,14 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         return ticketTimesList;
     }
 
-    public List<PerformanceVo> performanceList(String... performancesIds) {
+    public List<KylinPerformanceVo> performanceList(String... performancesIds) {
         Query query = new Query();
         query.addCriteria(Criteria.where("performancesId").in(performancesIds));
 
         query.fields().exclude("details");
         query.fields().exclude("noticeImage");
 
-        List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        List<KylinPerformanceVo> list = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
         return list;
     }
@@ -349,10 +349,10 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         Query query = Query.query(Criteria.where("timeStart").gte(monthStart).lte(monthEnd));
         query.fields().include("timeStart");
 
-        List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        List<KylinPerformanceVo> list = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
         List date = new ArrayList();
-        for (PerformanceVo v : list) {
+        for (KylinPerformanceVo v : list) {
             String timeStart = v.getTimeStart();
             String[] timeStartArr = timeStart.split(" ");
             date.add(timeStartArr[0]);

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

@@ -14,7 +14,7 @@ import com.liquidnet.service.kylin.dto.param.FieldsAuditParam;
 import com.liquidnet.service.kylin.dto.param.FieldsParam;
 import com.liquidnet.service.kylin.dto.param.FieldsSearchParam;
 import com.liquidnet.service.kylin.dto.param.FieldsStatusParam;
-import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 import com.liquidnet.service.kylin.entity.KylinFieldStatus;
 import com.liquidnet.service.kylin.entity.KylinFields;
 import com.liquidnet.service.kylin.mapper.KylinFieldRelationMapper;
@@ -76,17 +76,17 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
             fieldRelationsMapper.insert(fieldsParam.getFieldRelations(fieldsId, createdAt));
 
             // mongo 操作
-            FieldsVo fieldsVo = new FieldsVo();
-            BeanUtils.copyProperties(fieldsParam, fieldsVo);
-            fieldsVo.setFieldsId(fieldsId);
-            fieldsVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            fieldsVo.setUpdatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            FieldsVo data = mongoTemplate.insert(
-                    fieldsVo, FieldsVo.class.getSimpleName()
+            KylinFieldsVo kylinFieldsVo = new KylinFieldsVo();
+            BeanUtils.copyProperties(fieldsParam, kylinFieldsVo);
+            kylinFieldsVo.setFieldsId(fieldsId);
+            kylinFieldsVo.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            kylinFieldsVo.setUpdatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            KylinFieldsVo data = mongoTemplate.insert(
+                    kylinFieldsVo, KylinFieldsVo.class.getSimpleName()
             );
 
             // redis 操作
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, fieldsVo);
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, kylinFieldsVo);
 
             return true;
         } catch (Exception e) {
@@ -113,20 +113,20 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
                     , new UpdateWrapper<KylinFields>().eq("fields_id", fieldsId));
 
             // mongo 操作
-            FieldsVo fieldsVoData = new FieldsVo();
-            BeanUtils.copyProperties(fieldsParam, fieldsVoData);
-            fieldsVoData.setFieldsId(fieldsId);
-            fieldsVoData.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            KylinFieldsVo kylinFieldsVoData = new KylinFieldsVo();
+            BeanUtils.copyProperties(fieldsParam, kylinFieldsVoData);
+            kylinFieldsVoData.setFieldsId(fieldsId);
+            kylinFieldsVoData.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(fieldsVoData)));
-            Document doc = mongoTemplate.getCollection(FieldsVo.class.getSimpleName()).findOneAndUpdate(
+            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinFieldsVoData)));
+            Document doc = mongoTemplate.getCollection(KylinFieldsVo.class.getSimpleName()).findOneAndUpdate(
                     Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
                     object,
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
             // redis 操作
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), FieldsVo.class));
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), KylinFieldsVo.class));
             return true;
 
         } catch (Exception e) {
@@ -207,14 +207,14 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
             // mongo 操作
             Object obj = JSON.parse(JsonUtils.toJson(fieldsAuditParam));
             BasicDBObject object = new BasicDBObject("$set", obj);
-            Document doc = mongoTemplate.getCollection(FieldsVo.class.getSimpleName()).findOneAndUpdate(
+            Document doc = mongoTemplate.getCollection(KylinFieldsVo.class.getSimpleName()).findOneAndUpdate(
                     Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
                     object,
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
             // redis 操作
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), FieldsVo.class));
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), KylinFieldsVo.class));
             return true;
 
         } catch (Exception e) {
@@ -241,13 +241,13 @@ public class FieldsAdminServiceImpl implements KylinFieldsAdminService {
 
             Object obj = JSON.parse(JsonUtils.toJson(fieldsStatusParam));
             BasicDBObject object = new BasicDBObject("$set", obj);
-            Document doc = mongoTemplate.getCollection(FieldsVo.class.getSimpleName()).findOneAndUpdate(
+            Document doc = mongoTemplate.getCollection(KylinFieldsVo.class.getSimpleName()).findOneAndUpdate(
                     Query.query(Criteria.where("fieldsId").is(fieldsId)).getQueryObject(),
                     object,
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
-            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), FieldsVo.class));
+            redisUtil.hset(KylinRedisConst.FIELDS, fieldsId, JsonUtils.fromJson(doc.toJson(), KylinFieldsVo.class));
             return true;
         }catch (Exception e){
             return false;

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

@@ -10,7 +10,7 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.dto.param.BannersParam;
 import com.liquidnet.service.kylin.dto.param.BannersSearchParam;
-import com.liquidnet.service.kylin.dto.vo.BannersVo;
+import com.liquidnet.service.kylin.dto.vo.KylinBannersVo;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.liquidnet.service.kylin.entity.KylinBannersRelations;
 import com.liquidnet.service.kylin.mapper.KylinBannersMapper;
@@ -94,34 +94,34 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             }
 
             // 处理缓存数据
-            BannersVo bannersVo = new BannersVo();
-            BeanUtils.copyProperties(bannersParam, bannersVo);
-            bannersVo.setBannersId(bannersId);
-            bannersVo.setCreatedAt(createdAtString);
+            KylinBannersVo kylinBannersVo = new KylinBannersVo();
+            BeanUtils.copyProperties(bannersParam, kylinBannersVo);
+            kylinBannersVo.setBannersId(bannersId);
+            kylinBannersVo.setCreatedAt(createdAtString);
             // 处理基础数据 防止缓存中无字段
-            bannersVo.setIsDeleted(1);
-            bannersVo.setUpdatedAt("");
-            bannersVo.setPositionList(positionList);
-            bannersVo.setProvincesList(provincesList);
+            kylinBannersVo.setIsDeleted(1);
+            kylinBannersVo.setUpdatedAt("");
+            kylinBannersVo.setPositionList(positionList);
+            kylinBannersVo.setProvincesList(provincesList);
             if (StringUtils.isNullOrEmpty(bannersParam.getTargetObj())) {
-                bannersVo.setTargetObj("");
+                kylinBannersVo.setTargetObj("");
             }
             if (StringUtils.isNullOrEmpty(bannersParam.getOnlineStartTime())) {
-                bannersVo.setOnlineStartTime("");
+                kylinBannersVo.setOnlineStartTime("");
             }
             if (StringUtils.isNullOrEmpty(bannersParam.getOnlineEndTime())) {
-                bannersVo.setOnlineEndTime("");
+                kylinBannersVo.setOnlineEndTime("");
             }
             if (null == bannersParam.getBannersSort()) {
-                bannersVo.setBannersSort(0);
+                kylinBannersVo.setBannersSort(0);
             }
             if (StringUtils.isNullOrEmpty(bannersParam.getRemarks())) {
-                bannersVo.setRemarks("");
+                kylinBannersVo.setRemarks("");
             }
             // 入缓存
-            mongoTemplate.insert(bannersVo, BannersVo.class.getSimpleName());
+            mongoTemplate.insert(kylinBannersVo, KylinBannersVo.class.getSimpleName());
 
-            redisUtil.hset(KylinRedisConst.BANNERS, bannersId, bannersVo);
+            redisUtil.hset(KylinRedisConst.BANNERS, bannersId, kylinBannersVo);
 
             return true;
         } catch (Exception e) {
@@ -171,21 +171,21 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
                 provincesList = new ArrayList();
             }
             // 处理缓存数据
-            BannersVo bannersVo = new BannersVo();
-            BeanUtils.copyProperties(bannersParam, bannersVo);
-            bannersVo.setBannersId(bannersId);
-            bannersVo.setUpdatedAt(updatedAtString);
-            bannersVo.setPositionList(positionList);
-            bannersVo.setProvincesList(provincesList);
+            KylinBannersVo kylinBannersVo = new KylinBannersVo();
+            BeanUtils.copyProperties(bannersParam, kylinBannersVo);
+            kylinBannersVo.setBannersId(bannersId);
+            kylinBannersVo.setUpdatedAt(updatedAtString);
+            kylinBannersVo.setPositionList(positionList);
+            kylinBannersVo.setProvincesList(provincesList);
             // 修改缓存
-            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(bannersVo)));
-            Document doc = mongoTemplate.getCollection(BannersVo.class.getSimpleName()).findOneAndUpdate(
+            BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinBannersVo)));
+            Document doc = mongoTemplate.getCollection(KylinBannersVo.class.getSimpleName()).findOneAndUpdate(
                     Query.query(Criteria.where("bannersId").is(bannersId)).getQueryObject(),
                     object,
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
-            redisUtil.hset(KylinRedisConst.BANNERS, bannersId, JsonUtils.fromJson(doc.toJson(), BannersVo.class));
+            redisUtil.hset(KylinRedisConst.BANNERS, bannersId, JsonUtils.fromJson(doc.toJson(), KylinBannersVo.class));
 
             return true;
         } catch (Exception e) {
@@ -193,9 +193,9 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         }
     }
 
-    public BannersVo detail(String bannersId) {
+    public KylinBannersVo detail(String bannersId) {
         KylinBanners data = bannersMapper.selectOne(new UpdateWrapper<KylinBanners>().eq("banners_id", bannersId).eq("is_deleted", 1));
-        BannersVo bannersVo = new BannersVo();
+        KylinBannersVo kylinBannersVo = new KylinBannersVo();
         if (null != data) {
             List<String> positionList = kylinBannersRelationsMapper.getBannersRelationsField("field_id", bannersId, 1);
             List<String> provincesList = kylinBannersRelationsMapper.getBannersRelationsField("field_id", bannersId, 2);
@@ -203,13 +203,13 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             data.setPositionList(positionList);
             data.setProvincesList(provincesList);
 
-            bannersVo = new BannersVo();
-            BeanUtils.copyProperties(data, bannersVo);
+            kylinBannersVo = new KylinBannersVo();
+            BeanUtils.copyProperties(data, kylinBannersVo);
         }else {
             return null;
         }
 
-        return bannersVo;
+        return kylinBannersVo;
     }
 
     public List<BannerDetailsListDao> bannerList(BannersSearchParam bannersSearchParam) {
@@ -250,14 +250,14 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             map.put("isDeleted", 0);
 
             BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            Document doc = mongoTemplate.getCollection(BannersVo.class.getSimpleName()).findOneAndUpdate(
+            Document doc = mongoTemplate.getCollection(KylinBannersVo.class.getSimpleName()).findOneAndUpdate(
                     Query.query(Criteria.where("bannersId").is(bannersId)).getQueryObject(),
                     object,
                     new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
             );
 
             // redis 操作
-            redisUtil.hset(KylinRedisConst.BANNERS, bannersId, JsonUtils.fromJson(doc.toJson(), BannersVo.class));
+            redisUtil.hset(KylinRedisConst.BANNERS, bannersId, JsonUtils.fromJson(doc.toJson(), KylinBannersVo.class));
 
             return true;
         } catch (Exception e) {
@@ -300,8 +300,8 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
 
         List bannerList = mongoTemplate.find(
                 query,
-                BannersVo.class,
-                BannersVo.class.getSimpleName()
+                KylinBannersVo.class,
+                KylinBannersVo.class.getSimpleName()
         );
 
         return bannerList;

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

@@ -9,9 +9,9 @@ import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.TicketVo;
-import com.liquidnet.service.kylin.dto.vo.admin.PerformanceMemberHistoryVo;
+import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceMemberHistoryVo;
 import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
@@ -23,7 +23,6 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.pool2.BaseObject;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -95,9 +94,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     private KylinTicketsPartnerServiceImpl ticketsPartnerService;
 
     @Override
-    public PerformanceMisVo performanceDetails(String performancesId) {
+    public KylinPerformanceMisVo performanceDetails(String performancesId) {
         log.info(" PERFORMANCE  mis演出详情");
-        PerformanceMisVo createMisVo = performanceVoTask.getPerformanceMisVo(performancesId);
+        KylinPerformanceMisVo createMisVo = performanceVoTask.getPerformanceMisVo(performancesId);
         return createMisVo;
     }
 
@@ -137,11 +136,11 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     performances.setRejectTxt(rejectTxt);
                     performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
 
-                    List<TicketTimesPartnerVo> ticketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
-                    for (TicketTimesPartnerVo ticketTimeItem : ticketTimesPartnerVos) {
-                        for (TicketPartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
+                    List<KylinTicketTimesPartnerVo> kylinTicketTimesPartnerVos = ticketTimesPartnerService.getTimesMongoList(performancesId);
+                    for (KylinTicketTimesPartnerVo ticketTimeItem : kylinTicketTimesPartnerVos) {
+                        for (KylinTicketPartnerVo ticketItem : ticketsPartnerService.getTicketMongoList(ticketTimeItem.getTicketTimesId())) {
                             BasicDBObject objectTicketVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                            mongoTemplate.getCollection(TicketPartnerVo.class.getSimpleName()).updateOne(
+                            mongoTemplate.getCollection(KylinTicketPartnerVo.class.getSimpleName()).updateOne(
                                     Query.query(Criteria.where("ticketsId").is(ticketItem.getTicketsId())).getQueryObject(),
                                     objectTicketVo
                             );
@@ -249,7 +248,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             HashMap<String, Object> map = new HashMap<>();
             map.put("roadShowId", roadShowId);
             BasicDBObject object = new BasicDBObject("$set", map);
-            mongoTemplate.getCollection(PerformanceVo.class.getSimpleName()).updateOne(
+            mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
                     object
             );
@@ -271,7 +270,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             HashMap<String, Object> map = new HashMap<>();
             map.put("isRecommend", 0);
             BasicDBObject object = new BasicDBObject("$set", map);
-            mongoTemplate.getCollection(PerformanceVo.class.getSimpleName()).updateMany(
+            mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateMany(
                     Query.query(Criteria.where("isRecommend").gt(0)).getQueryObject(),
                     object
             );
@@ -283,7 +282,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 HashMap<String, Object> map2 = new HashMap<>();
                 map2.put("isRecommend", item.getIsRecommend());
                 BasicDBObject object2 = new BasicDBObject("$set", map2);
-                mongoTemplate.getCollection(PerformanceVo.class.getSimpleName()).updateOne(
+                mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(item.getPerformanceId())).getQueryObject(),
                         object2
                 );
@@ -461,7 +460,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                     map.put("memberTimeStart", ticketsTime.getTimeStart().plusMinutes(-ticketsTime.getAdvanceMinuteMember()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                     map.put("limitCountMember", item.getMemberLimitCount());
                     BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-                    mongoTemplate.getCollection(TicketVo.class.getSimpleName()).updateOne(
+                    mongoTemplate.getCollection(KylinTicketVo.class.getSimpleName()).updateOne(
                             Query.query(Criteria.where("ticketsId").is(item.getTicketsId())).getQueryObject(),
                             object);
                 }
@@ -473,7 +472,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 mapPerformanceVo.put("isAdvance", isAdvance);
                 mapPerformanceVo.put("isDiscount", isDiscount);
                 BasicDBObject objectPerformanceVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(mapPerformanceVo));
-                mongoTemplate.getCollection(PerformanceVo.class.getSimpleName()).updateOne(
+                mongoTemplate.getCollection(KylinPerformanceVo.class.getSimpleName()).updateOne(
                         Query.query(Criteria.where("performancesId").is(performanceId)).getQueryObject(),
                         objectPerformanceVo);
 
@@ -518,9 +517,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         List<PerformanceMemberAuditParam> paramList = mongoTemplate.find(query, PerformanceMemberAuditParam.class, PerformanceMemberAuditParam.class.getSimpleName());
         query.with(pageable);
         //处理Vo
-        List<PerformanceMemberHistoryVo> voList = new ArrayList<>();
+        List<KylinPerformanceMemberHistoryVo> voList = new ArrayList<>();
         for (PerformanceMemberAuditParam item : paramList) {
-            PerformanceMemberHistoryVo voData = new PerformanceMemberHistoryVo();
+            KylinPerformanceMemberHistoryVo voData = new KylinPerformanceMemberHistoryVo();
             voData.setAuditTime(item.getUpdatedAt());
             voData.setRejectTxt(item.getRejectTxt());
             voData.setStatus(item.getStatus());
@@ -550,7 +549,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             map.put("isAgent", status);
             BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
-            mongoTemplate.getCollection(TicketVo.class.getSimpleName()).updateOne(
+            mongoTemplate.getCollection(KylinTicketVo.class.getSimpleName()).updateOne(
                     Query.query(Criteria.where("ticketsId").is(ticketId)).getQueryObject(),
                     object);
 
@@ -560,4 +559,31 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             return false;
         }
     }
+
+    @Override
+    public boolean changeSysDamai(List<SysDamaiParam> params) {
+        try {
+            LocalDateTime updatedAt = LocalDateTime.now();
+            for (SysDamaiParam item : params) {
+                if (item.getStatus() != 0 && item.getStatus() != 1) {
+                    return false;
+                }
+                //修改 mysql
+                if(item.getType().equals("ticket")) {
+                    KylinTicketStatus ticketStatus = new KylinTicketStatus();
+                    ticketStatus.setUpdatedAt(updatedAt);
+                    ticketStatus.setSyncDamai(item.getStatus());
+                    ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", item.getId()));
+                }else if(item.getType().equals("performance")){
+                    KylinPerformanceStatus performanceStatus = new KylinPerformanceStatus();
+                    performanceStatus.setUpdatedAt(updatedAt);
+                    performanceStatus.setSyncDamai(item.getStatus());
+                    performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", item.getId()));
+                }
+            }
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
 }

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

@@ -4,16 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
 import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
-import com.liquidnet.service.kylin.dto.vo.RoadShowVo;
-import com.liquidnet.service.kylin.dto.vo.admin.RoadShowAdminVo;
+import com.liquidnet.service.kylin.dto.vo.KylinRoadShowVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
 import com.liquidnet.service.kylin.entity.KylinRoadShows;
 import com.liquidnet.service.kylin.mapper.KylinRoadShowsMapper;
-import com.liquidnet.service.kylin.service.IKylinRoadShowsService;
 import com.liquidnet.service.kylin.service.admin.IKylinRoadShowsAdminService;
 import com.mongodb.BasicDBObject;
 import org.springframework.beans.BeanUtils;
@@ -58,9 +55,9 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
             KylinRoadShows roadShows = new KylinRoadShows();
             BeanUtils.copyProperties(createRoadShowParam, roadShows);
             kylinRoadShowsMapper.insert(roadShows);
-            RoadShowVo roadShowVo = new RoadShowVo();
-            BeanUtils.copyProperties(createRoadShowParam, roadShowVo);
-            mongoTemplate.insert(roadShows, RoadShowVo.class.getSimpleName());
+            KylinRoadShowVo kylinRoadShowVo = new KylinRoadShowVo();
+            BeanUtils.copyProperties(createRoadShowParam, kylinRoadShowVo);
+            mongoTemplate.insert(roadShows, KylinRoadShowVo.class.getSimpleName());
             return roadShowId;
         } catch (Exception e) {
             return "";
@@ -75,8 +72,8 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
             createRoadShowParam.setStatus(null);
             BeanUtils.copyProperties(createRoadShowParam, roadShows);
             kylinRoadShowsMapper.update(roadShows, new UpdateWrapper<KylinRoadShows>().eq("road_shows_id", createRoadShowParam.getRoadShowsId()));
-            RoadShowVo roadShowVo = new RoadShowVo();
-            BeanUtils.copyProperties(createRoadShowParam, roadShowVo);
+            KylinRoadShowVo kylinRoadShowVo = new KylinRoadShowVo();
+            BeanUtils.copyProperties(createRoadShowParam, kylinRoadShowVo);
 
             BasicDBObject objectRoadShowVo = new BasicDBObject("$set", mongoConverter.convertToMongoType(roadShows));
             mongoTemplate.getCollection(KylinRoadShows.class.getSimpleName()).updateOne(
@@ -105,9 +102,9 @@ public class KylinRoadShowsAdminServiceImpl extends ServiceImpl<KylinRoadShowsMa
     }
 
     @Override
-    public RoadShowAdminVo detailsRoadShow(String roadShowId) {
+    public KylinRoadShowAdminVo detailsRoadShow(String roadShowId) {
         KylinRoadShows data = kylinRoadShowsMapper.selectOne(new UpdateWrapper<KylinRoadShows>().eq("road_shows_id", roadShowId));
-        RoadShowAdminVo vo = new RoadShowAdminVo();
+        KylinRoadShowAdminVo vo = new KylinRoadShowAdminVo();
         vo.setTitle(data.getTitle());
         vo.setRoadShowId(data.getRoadShowsId());
         vo.setStatus(data.getStatus());

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

@@ -2,7 +2,7 @@ package com.liquidnet.service.kylin.service.impl.partner;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.FieldsVo;
+import com.liquidnet.service.kylin.dto.vo.KylinFieldsVo;
 import com.liquidnet.service.kylin.mapper.KylinFieldRelationMapper;
 import com.liquidnet.service.kylin.mapper.KylinFieldStatusMapper;
 import com.liquidnet.service.kylin.mapper.KylinFieldsMapper;
@@ -54,11 +54,11 @@ public class FieldsPartnerServiceImpl implements KylinFieldsPartnerService {
         Query query = Query.query(Criteria.where("name").regex(".*?\\" +name));
 
         // 查询总数
-        long count = mongoTemplate.count(query, FieldsVo.class, FieldsVo.class.getSimpleName());
+        long count = mongoTemplate.count(query, KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());
 
         query.with(pageable);
         info.put("total",count);
-        info.put("data", mongoTemplate.find(query, FieldsVo.class, FieldsVo.class.getSimpleName()));
+        info.put("data", mongoTemplate.find(query, KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName()));
 
         return info;
     }
@@ -70,13 +70,13 @@ public class FieldsPartnerServiceImpl implements KylinFieldsPartnerService {
      * @return
      */
     @Override
-    public FieldsVo fieldDetails(String fieldId) {
-        FieldsVo info = null;
+    public KylinFieldsVo fieldDetails(String fieldId) {
+        KylinFieldsVo info = null;
         // 获取 redis数据
-        info = (FieldsVo) redisUtil.hget(KylinRedisConst.FIELDS, fieldId + "");
+        info = (KylinFieldsVo) redisUtil.hget(KylinRedisConst.FIELDS, fieldId + "");
         //不存在 获取 mongo数据
         if (null == info) {
-            info = mongoTemplate.findOne(Query.query(Criteria.where("fieldsId").is(fieldId)), FieldsVo.class, FieldsVo.class.getSimpleName());
+            info = mongoTemplate.findOne(Query.query(Criteria.where("fieldsId").is(fieldId)), KylinFieldsVo.class, KylinFieldsVo.class.getSimpleName());
             redisUtil.hset(KylinRedisConst.FIELDS, fieldId + "",info);
         }
         return info;

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.service.impl.partner;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
+import com.liquidnet.service.kylin.dto.vo.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,19 +30,19 @@ public class KylinBuyNoticePartnerServiceImpl extends ServiceImpl<KylinBuyNotice
     private KylinBuyNoticeMapper kylinBuyNoticeMapper;
 
     @Override
-    public PageInfo<BuyNoticeVo> getBuyNotice() {
-        PageInfo<BuyNoticeVo> pageInfoTmp = null;
+    public PageInfo<KylinBuyNoticeVo> getBuyNotice() {
+        PageInfo<KylinBuyNoticeVo> pageInfoTmp = null;
 
         PageHelper.startPage(1, 20);
         List<KylinBuyNotice> buyNoticeList = kylinBuyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().eq("status", 1).orderByDesc("sort").orderByDesc("mid"));
 
-        List<BuyNoticeVo> buyNoticeVoList = new ArrayList<>();
+        List<KylinBuyNoticeVo> kylinBuyNoticeVoList = new ArrayList<>();
         for (KylinBuyNotice item : buyNoticeList) {
-            BuyNoticeVo buyNoticeVo = new BuyNoticeVo();
-            BeanUtils.copyProperties(item, buyNoticeVo);
-            buyNoticeVoList.add(buyNoticeVo);
+            KylinBuyNoticeVo kylinBuyNoticeVo = new KylinBuyNoticeVo();
+            BeanUtils.copyProperties(item, kylinBuyNoticeVo);
+            kylinBuyNoticeVoList.add(kylinBuyNoticeVo);
         }
-        pageInfoTmp = new PageInfo(buyNoticeVoList);
+        pageInfoTmp = new PageInfo(kylinBuyNoticeVoList);
 
         return pageInfoTmp;
     }