提交 mongo迁移

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

-package com.liquidnet.service.kylin.dto;
-
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import lombok.Data;
-
-@Data
-public class PerformancePartnerDto implements Serializable {
-
-    /**
-     * performances_id
-     */
-    private String performancesId;
-
-    /**
-     * 演出名称
-     */
-    private String title;
-
-    /**
-     * 1音乐节 2演唱会 3小型演出 4展览 6舞台剧
-     */
-    private Integer type;
-
-    /**
-     * 演出海报
-     */
-    private String imgPoster;
-
-    /**
-     * 省id
-     */
-    private String provinceId;
-
-    /**
-     * 省名称
-     */
-    private String provinceName;
-
-    /**
-     * 城市id
-     */
-    private Integer cityId;
-
-    /**
-     * 城市名称
-     */
-    private String cityName;
-
-    /**
-     * 县id
-     */
-    private Integer districtId;
-
-    /**
-     * 县名称
-     */
-    private String districtName;
-
-    /**
-     * 批文地址
-     */
-    private String approvalUrl;
-
-    /**
-     * 演出公告
-     */
-    private String notice;
-
-    /**
-     * 主办方id
-     */
-    private String sponsorId;
-
-    /**
-     * 主办方类型
-     */
-    private String sponsorType;
-
-    /**
-     * 主办方
-     */
-    private String sponsor;
-
-    /**
-     * 联系人
-     */
-    private String contacts;
-
-    /**
-     * 联系电话
-     */
-    private String mobile;
-
-    /**
-     * 演出简介
-     */
-    private String describes;
-
-    /**
-     * 演出详情
-     */
-    private String details;
-
-    /**
-     * 购票须知
-     */
-    private String noticeImage;
-
-    /**
-     * 演出开始时间
-     */
-    private LocalDateTime timeStart;
-
-    /**
-     * 演出结束时间
-     */
-    private LocalDateTime timeEnd;
-
-    /**
-     * 拒绝理由
-     */
-    private String rejectTxt;
-
-    /**
-     * 权重 高则在上
-     */
-    private Integer sort;
-
-    /**
-     * comment
-     */
-    private String comment;
-
-
-    /**
-     * 复制来源演出id
-     */
-    private String copyId;
-
-    /**
-     * 商户id
-     */
-    private String merchantId;
-
-    /**
-     * 场地id
-     */
-    private String fieldId;
-
-    /**
-     * 巡演id
-     */
-    private String roadShowId;
-
-    /**
-     * 专题id
-     */
-    private String projectId;
-
-    /**
-     * 视频id
-     */
-    private String videoId;
-
-    /**
-     * 是否显示 0全部用户可见 1白名单可见 2任何不显示
-     */
-    private Integer isShow;
-
-    /**
-     * 状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退
-     */
-    private String status;
-
-    /**
-     * 是否售卖 0停止 1正常
-     */
-    private Integer statusSell;
-
-    /**
-     * 是否开启分销 0关闭 1开启
-     */
-    private Integer isDistribution;
-
-    /**
-     * 是否关联小程序 0不关联 1关联
-     */
-    private Integer syncAgent;
-
-    /**
-     * -1未提交审核，0提交审核，1审核通过，2审核拒绝
-     */
-    private Integer auditStatus;
-
-    /**
-     * 创建时间
-     */
-    private String createdAt;
-
-    /**
-     * 修改时间
-     */
-    private String updatedAt;
-
-
-}

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

-package com.liquidnet.service.kylin.dto;
-
-import lombok.Data;
-
-@Data
-public class TicketInventoryDto {
-
-    /**
-     * 票id
-     */
-    private String ticketsId;
-
-    /**
-     * 售票库存
-     */
-    private Integer surplusGeneral;
-
-    /**
-     * 兑换库存
-     */
-    private Integer surplusExchange;
-
-}

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

-package com.liquidnet.service.kylin.dto.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class KylinPagerVo<T> {
-
-    @ApiModelProperty(value = "返回记录集合")
-    private List<T> rows;//返回的记录集合
-    @ApiModelProperty(value = "总记录条数")
-    private long total;//总记录条数
-
-}

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.admin;
 
 import com.liquidnet.service.kylin.dao.TicketAgentDao;
 import io.swagger.annotations.ApiModel;

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.admin;
 
 import com.liquidnet.service.kylin.dao.TicketAgentDao;
 import com.liquidnet.service.kylin.dao.TicketDamaiDao;

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.middle;
 
 import lombok.Data;
 

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.middle;
 
 import com.liquidnet.service.kylin.entity.KylinTicketTimes;
 import io.swagger.annotations.ApiModel;
@@ -29,9 +29,6 @@ public class KylinTicketTimesVo {
     @ApiModelProperty(value = "票种")
     private List<KylinTicketVo> ticketList;
 
-//    @ApiModelProperty(value = "票种信息集合")
-//    private List<TicketVo> ticketVoList;
-
     public void setTicketTimes(KylinTicketTimes ticketTimes){
         this.ticketTimesId=ticketTimes.getTicketTimesId();
         this.title=ticketTimes.getTitle();

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.middle;
 
 import com.liquidnet.service.kylin.entity.KylinTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinTickets;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PayDataVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/middle/PayDataVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.middle;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinCheckUserPerformanceVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinCheckUserPerformanceVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.mongo;
 
 import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
 import io.swagger.annotations.ApiModel;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinCheckUserVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinCheckUserVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.mongo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderTicketEntitiesVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketEntitiesVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.mongo;
 
 import lombok.Data;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderTicketVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.mongo;
 
 import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.mongo;
 
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.entity.KylinFields;
 import com.liquidnet.service.kylin.entity.KylinPerformanceRelations;
 import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
@@ -90,6 +91,9 @@ public class KylinPerformanceVo {
     private Integer sysDamai;
     @ApiModelProperty(value = "文案")
     private String message;
+    @ApiModelProperty(value = "场次")
+    private List<KylinTicketTimesVo> ticketTimeList;
+
     @ApiModelProperty(value = "巡演数据")
     private List<KylinPerformanceVo> roadList;
 
@@ -136,7 +140,6 @@ public class KylinPerformanceVo {
         this.sysDamai = performanceStatus.getSyncDamai();
     }
 
-    //TODO 巡演 搭售 场地
     public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {
         this.fieldId = performanceRelations.getFieldId();
         this.projectId = performanceRelations.getProjectId();

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

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.mongo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

 package com.liquidnet.service.kylin.dto.vo.partner;
 
-import com.liquidnet.service.kylin.dto.vo.KylinBuyNoticeVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderListVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderListVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
 import lombok.Data;
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderRefundBatchesPerformanceVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundBatchesPerformanceVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import io.swagger.annotations.ApiModel;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderRefundBatchesVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundBatchesVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinOrderRefundsVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderRefundsVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
 import com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao;
 import io.swagger.annotations.ApiModel;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinStationCheckOrderVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinStationCheckOrderVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import io.swagger.annotations.ApiModel;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinStationCheckRefreshVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinStationCheckRefreshVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinStationLoginVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinStationLoginVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinStationPerformanceVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinStationPerformanceVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinStationTicketVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinStationTicketVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/OrderDetailsVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import lombok.Data;
 
 import java.util.List;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PayDetailVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayDetailVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PayResultVo.java → liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/PayResultVo.java

-package com.liquidnet.service.kylin.dto.vo;
+package com.liquidnet.service.kylin.dto.vo.returns;
 
+import com.liquidnet.service.kylin.dto.vo.middle.PayDataVo;
 import lombok.Data;
 
 import java.io.Serializable;

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

@@ -6,9 +6,9 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderListVo;
-import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
-import com.liquidnet.service.kylin.dto.vo.PayResultVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 
 import java.util.List;

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

@@ -3,7 +3,7 @@ package com.liquidnet.service.kylin.service.admin;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
-import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 
 import java.util.List;

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

@@ -6,8 +6,8 @@ import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceAgentVo;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceDamaiVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 

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

@@ -2,7 +2,7 @@ package com.liquidnet.service.kylin.service.partner;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
-import com.liquidnet.service.kylin.dto.vo.KylinBuyNoticeVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 
 /**

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -12,8 +12,8 @@ import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
-import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundBatchAdminController.java

@@ -11,8 +11,8 @@ import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
 import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java

@@ -4,7 +4,7 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
-import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@ import java.util.List;
 
 /**
  * 订单Controller
- * 
+ *
  * @author anjiabin
  * @date 2021-05-24
  */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.kylin;
 
-import com.alibaba.druid.support.json.JSONUtils;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
-import com.liquidnet.client.admin.common.json.JSON;
 import com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceOrderStatisCountResp;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinDamaiServiceImpl;
 import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesAdminServiceImpl;
@@ -17,8 +15,8 @@ import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam;
 import com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam;
 import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceAgentVo;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceDamaiVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -13,7 +13,7 @@ import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.param.RefundSearchParam;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
@@ -283,4 +283,4 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
         return "success";
     }
 
-}
\ No newline at end of file
+}

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

@@ -9,7 +9,11 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderTicketsListDao;
 import com.liquidnet.service.kylin.dto.param.admin.OrderListReq;
-import com.liquidnet.service.kylin.dto.vo.*;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinOrderTicketsAdminService;
@@ -51,7 +55,7 @@ public class KylinOrderTicketsAdminServiceImpl extends ServiceImpl<KylinOrderTic
 
     @Autowired
     private ExpressesMapper expressesMapper;
-    
+
     @Override
     public List<OrderTicketsListDao> orderList(OrderListReq orderListReq) {
         HashMap<String, Object> map = new HashMap<>();

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

@@ -9,10 +9,10 @@ import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceAgentVo;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceDamaiVo;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
+import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceMemberHistoryVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;

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

@@ -10,10 +10,9 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderRefundBatchDao;
-import com.liquidnet.service.kylin.dao.OrderRefundDao;
 import com.liquidnet.service.kylin.dto.param.RefundBatchApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundBatchSearchParam;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderRefundBatchesVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundBatchesVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefundBatches;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinOrderRefundBatchesMapper;

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

@@ -13,8 +13,8 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderTicketEntitiesVo;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
@@ -306,7 +306,7 @@ public class KylinRefundsStatusServiceImpl {
             params.add("sign", sign);
 
 
-            // start 
+            // start
             // TODO: 2021/5/31 待整理
             String postResult = null;
             postResult = HttpUtil.post(applyUrl, params);

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

@@ -7,7 +7,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.kylin.dao.RoadShowAdminListDao;
 import com.liquidnet.service.kylin.dto.param.CreateRoadShowParam;
-import com.liquidnet.service.kylin.dto.vo.KylinRoadShowVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinRoadShowVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinRoadShowAdminVo;
 import com.liquidnet.service.kylin.entity.KylinRoadShows;
 import com.liquidnet.service.kylin.mapper.KylinRoadShowsMapper;

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

@@ -7,10 +7,10 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
-import com.liquidnet.service.kylin.dto.vo.KylinBuyNoticeVo;
-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.dto.vo.middle.KylinBuyNoticeVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;

liquidnet-bus-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.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import feign.hystrix.FallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;

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

 package com.liquidnet.service.feign.kylin.task;
 
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
 import feign.hystrix.FallbackFactory;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
 
 @Component
 @FeignClient(name = "liquidnet-service-kylin",

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.IAdamRdmService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;

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

@@ -7,7 +7,7 @@ import com.liquidnet.service.adam.service.IAdamDisposedService;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.feign.kylin.api.FeignKylinPerformanceClient;
-import com.liquidnet.service.kylin.dto.vo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;

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

@@ -6,9 +6,9 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderListVo;
-import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
-import com.liquidnet.service.kylin.dto.vo.PayResultVo;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
 import com.liquidnet.service.kylin.service.impl.KylinOrderTicketsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.PayDetailVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -10,7 +10,9 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
 import com.liquidnet.service.kylin.dto.param.KylinStationCheckOrderParam;
 import com.liquidnet.service.kylin.dto.param.KylinStationUploadParam;
-import com.liquidnet.service.kylin.dto.vo.*;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.*;
+import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketEntitiesService;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import io.swagger.annotations.Api;

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

-package com.liquidnet.service.kylin.controller.admin;
-
-import com.liquidnet.service.base.ResponseDto;
-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.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;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Api
-@RestController
-@RequestMapping("/admin/fields")
-public class FieldsAdminController {
-
-    @Autowired
-    private FieldsAdminServiceImpl fieldsAdminService;
-
-//    @PostMapping(value = "")
-//    @ApiOperation(value = "创建场地")
-//    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinFieldsVo> createFields(@RequestBody FieldsParam fieldsParam) {
-        boolean result = fieldsAdminService.fieldCreate(fieldsParam);
-        if (result) {
-            return ResponseDto.success();
-        } else {
-            return ResponseDto.failure("场地创建失败");
-        }
-    }
-
-//    @PutMapping(value = "")
-//    @ApiOperation(value = "mis修改场地全部数据")
-//    @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinFieldsVo> fieldUpdate(@RequestBody FieldsParam fieldsParam) {
-        boolean result = fieldsAdminService.fieldUpdateMessage(fieldsParam);
-        if (result) {
-            return ResponseDto.success();
-        } else {
-            return ResponseDto.failure("修改场地失败");
-        }
-    }
-
-//    @PostMapping(value = "list")
-//    @ApiOperation(value = "mis获取场地列表")
-//    @ApiResponse(response = PagerVo.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<KylinPagerVo<FieldMisListDao>> fieldList(@RequestBody FieldsSearchParam fieldsSearchParam) {
-        List<FieldMisListDao> result = fieldsAdminService.fieldList(fieldsSearchParam);
-        Long total = fieldsAdminService.fieldListCount(fieldsSearchParam);
-
-        KylinPagerVo<FieldMisListDao> kylinPagerVo = new KylinPagerVo();
-        kylinPagerVo.setRows(result);
-        kylinPagerVo.setTotal(total);
-
-        if (kylinPagerVo.getRows().size() > 0) {
-            return ResponseDto.success(kylinPagerVo);
-        } else {
-            return ResponseDto.failure("获取列表失败");
-        }
-    }
-
-//    @GetMapping(value = "details")
-//    @ApiOperation(value = "mis场地详情")
-//    @ApiResponse(response = FieldMisDetailsDao.class, code = 200, message = "接口返回对象参数")
-    public ResponseDto<FieldMisDetailsDao> fieldDetails(@RequestParam("fieldsId") String fieldsId) {
-        FieldMisDetailsDao result = null;
-        result = fieldsAdminService.fieldDetails(fieldsId);
-        if (null != result) {
-            return ResponseDto.success(result);
-        } else {
-            return ResponseDto.failure("获取场地详情失败");
-        }
-    }
-
-//    @PostMapping(value = "audit")
-//    @ApiOperation(value = "mis场地审核")
-//    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> fieldAudit(@RequestBody FieldsAuditParam fieldsAuditParam) {
-
-        boolean result = fieldsAdminService.fieldAudit(fieldsAuditParam);
-
-        if (result) {
-            return ResponseDto.success("审核成功");
-        } else {
-            return ResponseDto.failure("审核失败");
-        }
-    }
-
-//    @PostMapping(value = "status")
-//    @ApiOperation(value = "mis修改场地状态")
-//    @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<String> fieldStatus(@RequestBody FieldsStatusParam fieldsStatusParam) {
-        boolean result = fieldsAdminService.fieldStatus(fieldsStatusParam);
-        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/partner/KylinBuyNoticeParnterController.java

@@ -3,7 +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.KylinBuyNoticeVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.service.impl.partner.KylinBuyNoticePartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -5,8 +5,6 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dao.ChildDetailsDao;
 import com.liquidnet.service.kylin.dao.ChildListDao;
-import com.liquidnet.service.kylin.dto.vo.KylinBuyNoticeVo;
-import com.liquidnet.service.kylin.service.impl.partner.KylinBuyNoticePartnerServiceImpl;
 import com.liquidnet.service.kylin.service.impl.partner.KylinCheckUserPartnerServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.dto.param.KylinStationCheckOrderParam;
-import com.liquidnet.service.kylin.dto.vo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketEntitiesService;

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

@@ -16,7 +16,12 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
-import com.liquidnet.service.kylin.dto.vo.*;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.*;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.ExpressesMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;

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

@@ -4,10 +4,10 @@ import com.liquidnet.commons.lang.CommonConst;
 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.dto.vo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.dto.vo.KylinTicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
-import com.liquidnet.service.kylin.dto.vo.PayDetailVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;

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.KylinBuyNoticeVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
 import com.liquidnet.service.kylin.entity.KylinBuyNotice;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@@ -3,14 +3,12 @@ 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.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.ChildDetailsDao;
 import com.liquidnet.service.kylin.dao.ChildListDao;
-import com.liquidnet.service.kylin.dto.vo.KylinCheckUserVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserVo;
 import com.liquidnet.service.kylin.entity.KylinCheckUser;
 import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@@ -3,15 +3,13 @@ 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.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.ChildPerformanceDao;
 import com.liquidnet.service.kylin.dto.param.CheckPerformanceRelationParam;
 import com.liquidnet.service.kylin.dto.param.CheckUserParam;
-import com.liquidnet.service.kylin.dto.vo.KylinCheckUserPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinCheckUserPerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
 import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@@ -8,7 +8,7 @@ import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
 import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
-import com.liquidnet.service.kylin.dto.vo.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.ignore.KylinTicketIgnoreVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;

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

@@ -6,9 +6,9 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
-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.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.partner.*;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
@@ -282,23 +282,9 @@ public class PerformanceVoTask {
         kylinPerformanceMisVo.setStopSellTime(StringList.get(0));
         kylinPerformanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
 
-//        if (performanceMisVo.getStatus() != 0) {
-//            performanceMisVo.setStatus(null);
-//            performanceMisVo.setStatusSell(null);
-//            performanceMisVo.setRejectTxt("");
-//            performanceMisVo.setIsShow(1);
         kylinPerformanceMisVo.setIsDistribution(0);
         kylinPerformanceMisVo.setSyncAgent(0);
         kylinPerformanceMisVo.setAuditStatus(0);
-//        }
-
-//        boolean exists = mongoTemplate.exists(Query.query(Criteria.where("performancesId").is(performancesId)), PerformanceMisVo.class, PerformanceMisVo.class.getSimpleName());
-//
-//        if (!exists) {
-//            PerformanceMisVo data = mongoTemplate.insert(
-//                    performanceMisVo, PerformanceMisVo.class.getSimpleName()
-//            );
-//        }
 
         return kylinPerformanceMisVo;
     }

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

 package com.liquidnet.service.kylin.utils;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.google.zxing.common.detector.MathUtils;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.*;
-import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.*;
+import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -25,6 +27,8 @@ public class DataUtils {
     private MongoTemplate mongoTemplate;
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    private MongoVoUtils mongoVoUtils;
 
     /**
      * 根据 购票须知 id 获取 购票须知文案
@@ -122,15 +126,6 @@ public class DataUtils {
         return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
     }
 
-    /**
-     * 删除演出redis
-     *
-     * @param performanceId
-     */
-    public void delPerformanceRedis(String performanceId) {
-        redisUtil.del(KylinRedisConst.PERFORMANCES + performanceId);
-    }
-
     /**
      * 根据场次id 获取 场次vo 详情
      *
@@ -146,15 +141,6 @@ public class DataUtils {
         return (KylinTicketTimesVo) redisUtil.get(KylinRedisConst.TIMES + ticketTimeId);
     }
 
-    /**
-     * 删除场次redis
-     *
-     * @param ticketTimeId
-     */
-    public void delTicketTimesRedis(String ticketTimeId) {
-        redisUtil.del(KylinRedisConst.TIMES + ticketTimeId);
-    }
-
     /**
      * 根据票种id 获取 票种vo 详情
      *
@@ -170,15 +156,6 @@ public class DataUtils {
         return (KylinTicketVo) redisUtil.get(KylinRedisConst.TICKET + ticketId);
     }
 
-    /**
-     * 删除票种redis
-     *
-     * @param ticketId
-     */
-    public void delTicketRedis(String ticketId) {
-        redisUtil.del(KylinRedisConst.TICKET + ticketId);
-    }
-
     /**
      * 根据订单id 获取 订单vo 详情
      *
@@ -327,4 +304,17 @@ public class DataUtils {
         }
         return (String) redisUtil.get(KylinRedisConst.ENTER_INFO + enterInfoId);
     }
+
+
+    public void updatePerformanceMongo(String performanceIds){
+        //查询 mysql 数据
+        KylinPerformanceVo vo = mongoVoUtils.combinePerformanceVoData(performanceIds);
+        //删除 mongo数据
+        mongoTemplate.remove(Query.query(Criteria.where("performancesId").is(performanceIds)),KylinPerformanceVo.class,KylinPerformanceVo.class.getSimpleName());
+
+        //新增 mongo数据
+
+        //删除redis
+
+    }
 }

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

+package com.liquidnet.service.kylin.utils;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
+import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.mapper.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class MongoVoUtils {
+    @Autowired
+    private KylinPerformancesMapper performancesMapper;
+    @Autowired
+    private KylinPerformanceStatusMapper performanceStatusMapper;
+    @Autowired
+    private KylinPerformanceRelationsMapper performanceRelationsMapper;
+    @Autowired
+    private KylinTicketTimesMapper ticketTimesMapper;
+    @Autowired
+    private KylinTicketTimeRelationMapper ticketTimeRelationMapper;
+    @Autowired
+    private KylinTicketsMapper ticketsMapper;
+    @Autowired
+    private KylinTicketStatusMapper ticketStatusMapper;
+    @Autowired
+    private KylinTicketRelationsMapper ticketRelationsMapper;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private DataUtils dataUtils;
+
+
+    public KylinPerformanceVo combinePerformanceVoData(String performancesId) {
+        KylinPerformanceVo voData = new KylinPerformanceVo();
+
+        //演出数据
+        KylinPerformances p1 = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
+        KylinPerformanceStatus p2 = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+        KylinPerformanceRelations p3 = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
+        //场地相关数据
+        KylinFields fields = new KylinFields();
+        String cityName = (String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name");
+        fields.setCityId(null);
+        fields.setLatitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "latitude"));
+        fields.setLongitude((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "longitude"));
+        fields.setCityName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "city_name"));
+        fields.setName((String) redisUtil.hget(KylinRedisConst.FIELDS + ":" + p3.getFieldId(), "name"));
+
+        //相关状态时间初始变量
+        LocalDateTime stopSellTime = null;
+        LocalDateTime sellTime = null;
+        int isLackRegister = 0;
+        int isMember = 0;
+        int isExclusive = 0;
+        int isAdvance = 0;
+        int isDiscount = 0;
+        int payCountdownMinute = 15;
+        BigDecimal price = new BigDecimal("0.00");
+
+        //场次数据
+        List<KylinTicketTimeRelation> tt3 = ticketTimeRelationMapper.selectList(new UpdateWrapper<KylinTicketTimeRelation>().eq("performance_id", performancesId));
+        List<KylinTicketTimesVo> timeList = new ArrayList<>();
+        for (int x = 0; x < tt3.size(); x++) {
+            KylinTicketTimeRelation times = tt3.get(x);
+            KylinTicketTimes tt1 = ticketTimesMapper.selectOne(new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", times.getTimesId()));
+
+            //票种数据
+            List<KylinTicketRelations> t3 = ticketRelationsMapper.selectList(new UpdateWrapper<KylinTicketRelations>().eq("times_id", times.getTimesId()));
+            List<KylinTicketVo> ticketList = new ArrayList<>();
+            for (int y = 0; y < t3.size(); y++) {
+                KylinTicketRelations ticket = t3.get(y);
+                KylinTickets t1 = ticketsMapper.selectOne(new UpdateWrapper<KylinTickets>().eq("performances_id", ticket.getTicketId()));
+                KylinTicketStatus t2 = ticketStatusMapper.selectOne(new UpdateWrapper<KylinTicketStatus>().eq("performance_id", ticket.getTicketId()));
+                KylinTicketVo kylinTicketVo = new KylinTicketVo();
+                kylinTicketVo.setTimeId(ticket.getTimesId());
+                kylinTicketVo.setTicket(t1);
+                kylinTicketVo.setTicketStatus(t2);
+                ticketList.add(kylinTicketVo);
+
+                //票种 库存redis
+                if (!redisUtil.hHasKey(KylinRedisConst.PERFORMANCES_INVENTORY + kylinTicketVo.getTicketsId(), KylinRedisConst.SURPLUS_GENERAL)) {
+                    dataUtils.setSurplusGeneral(kylinTicketVo.getTicketsId(), t2.getTotalGeneral());
+                    dataUtils.setSurplusExchange(kylinTicketVo.getTicketsId(), t2.getSurplusExchange());
+                }
+
+                if (kylinTicketVo.getIsMember() == 1) {
+                    if (kylinTicketVo.getMemberPrice().compareTo(kylinTicketVo.getPrice()) != 0) {
+                        isDiscount = 1;
+                    }
+                    if (!kylinTicketVo.getTimeStart().equalsIgnoreCase(kylinTicketVo.getMemberTimeStart())) {
+                        isAdvance = 1;
+                    }
+                    if (kylinTicketVo.getIsMember() == 1) {
+                        isMember = 1;
+                    }
+                    if (kylinTicketVo.getIsExclusive() == 1) {
+                        isExclusive = 1;
+                    }
+                }
+                if (kylinTicketVo.getIsLackRegister() == 1) {
+                    isLackRegister = 1;
+                }
+                payCountdownMinute = t1.getPayCountdownMinute();
+                if (price.subtract(kylinTicketVo.getPrice()).compareTo(new BigDecimal("0.00")) < 0) {
+                    price = kylinTicketVo.getPrice();
+                }
+                if (stopSellTime == null || stopSellTime.isBefore(t1.getTimeEnd())) {
+                    stopSellTime = t1.getTimeEnd();
+                }
+                if (sellTime == null || sellTime.isAfter(t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember()))) {
+                    sellTime = t1.getTimeStart().plusMinutes(-t1.getAdvanceMinuteMember());
+                }
+            }
+
+            KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo();
+            kylinTicketTimesVo.setTicketTimes(tt1);
+            kylinTicketTimesVo.setPerformanceId(times.getPerformanceId());
+            kylinTicketTimesVo.setTimeId(times.getTimesId());
+            kylinTicketTimesVo.setTicketList(ticketList);
+            timeList.add(kylinTicketTimesVo);
+        }
+
+        voData.setPerformance(p1);
+        voData.setPerformanceStatus(p2);
+        voData.setPerformanceRelations(p3);
+        voData.setFieldsData(fields, cityName);
+        voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellTime, isAdvance, isDiscount,payCountdownMinute);
+        voData.setTicketTimeList(timeList);
+
+        return voData;
+    }
+}