记得上下班打卡 | git大法好,push需谨慎

Commit 66e044fa authored by 胡佳晨's avatar 胡佳晨

上票 单一流流程

parent 7e633f3f
......@@ -96,7 +96,7 @@ public class PerformancePartnerDto implements Serializable {
/**
* 演出简介
*/
private String describe;
private String describes;
/**
* 演出详情
......
......@@ -21,10 +21,10 @@ public class CreateTicketTimesParam implements Serializable {
private String title;
@ApiModelProperty(value = "场次适用开始时间", example = "2020-12-01T12:00:00")
private LocalDateTime timeStart;
private LocalDateTime useStart;
@ApiModelProperty(value = "场次适用结束时间", example = "2020-12-01T12:00:00")
private LocalDateTime timeEnd;
private LocalDateTime useEnd;
@ApiModelProperty(value = "类型 1单日票 2通票", example = "1")
private int type;
......
......@@ -20,7 +20,7 @@ public class PerformanceCreateParam implements Serializable {
private String title;
@ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
private String type;
private int type;
@ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
private String timeStart;
......@@ -31,6 +31,9 @@ public class PerformanceCreateParam implements Serializable {
@ApiModelProperty(value = "场地id", example = "1")
private String fieldId;
@ApiModelProperty(value = "场地id", example = "1")
private String fieldName;
@ApiModelProperty(value = "演出公告", example = "这是演出公告")
private String notice;
......@@ -73,6 +76,12 @@ public class PerformanceCreateParam implements Serializable {
@ApiModelProperty(value = "状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "0")
private int status;
@ApiModelProperty(value = "第三方id", example = "0")
private String merchantId;
@ApiModelProperty(value = "演出简介", example = "0")
private String describes;
@ApiModelProperty(value = "", example = "")
private String createdAt;
}
......@@ -20,7 +20,7 @@ public class PerformanceStep1Param implements Serializable {
private String title;
@ApiModelProperty(value = "演出类型 1音乐节 2演唱会 3小型演出 4展览 6舞台剧", example = "3")
private String type;
private int type;
@ApiModelProperty(value = "演出开始时间", example = "2021-05-01 12:00:00")
private String timeStart;
......@@ -31,6 +31,9 @@ public class PerformanceStep1Param implements Serializable {
@ApiModelProperty(value = "场地id", example = "1")
private String fieldId;
@ApiModelProperty(value = "场地名称", example = "")
private String fieldName;
@ApiModelProperty(value = "演出公告", example = "这是演出公告")
private String notice;
......@@ -61,6 +64,9 @@ public class PerformanceStep1Param implements Serializable {
@ApiModelProperty(value = "购票须知", example = "[{\"id\":1,\"title\":\"\\u95e8\\u7968\\u4e0d\\u9000\\u4e0d\\u6362\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c45722882a13.png\",\"text\":\"\\u95e8\\u7968\\u4e3a\\u6709\\u4ef7\\u8bc1\\u5238\\uff0c\\u5e76\\u975e\\u5546\\u54c1\\uff0c\\u4e00\\u7ecf\\u552e\\u51fa\\u4e0d\\u4e88\\u9000\\u6362\\u3002\\u56e0\\u201c\\u4e0d\\u53ef\\u6297\\u529b\\u201d\\u5bfc\\u81f4\\u7684\\u6f14\\u51fa\\u53d6\\u6d88\\u6216\\u5ef6\\u671f\\u9664\\u5916\\u3002\",\"sort\":1},{\"id\":3,\"title\":\"\\u4ec5\\u8bbe\\u7ad9\\u5e2d\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e93db0b9.png\",\"text\":\"\\u672c\\u573a\\u6f14\\u51fa\\u4e0d\\u8bbe\\u5ea7\\u4f4d\\uff0c\\u5747\\u4e3a\\u7ad9\\u5e2d\\u89c2\\u6f14\\u3002\",\"sort\":2},{\"id\":4,\"title\":\"\\u7981\\u6b62\\u4e2a\\u4eba\\u7968\\u52a1\\u4e70\\u5356\",\"type\":\"image\",\"url\":\"http:\\/\\/img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com\\/partner\\/2019\\/01\\/21\\/5c456e5c27644.png\",\"text\":\"\\u4e3a\\u9632\\u6b62\\u4e0d\\u6cd5\\u5206\\u5b50\\u5229\\u7528\\u7968\\u52a1\\u8f6c\\u8ba9\\u8bc8\\u9a97\\u94b1\\u6b3e\\uff0c\\u5efa\\u8bae\\u5e7f\\u5927\\u4e50\\u8ff7\\u4e0d\\u8981\\u8fdb\\u884c\\u4e2a\\u4eba\\u95f4\\u7968\\u52a1\\u4e70\\u5356\\uff0c\\u4e0d\\u8981\\u8f7b\\u6613\\u76f8\\u4fe1\\u6765\\u6e90\\u4e0d\\u660e\\u7684\\u8f6c\\u7968\\uff0c\\u4ee5\\u514d\\u81ea\\u8eab\\u5229\\u76ca\\u53d7\\u5230\\u4fb5\\u5bb3\\u3002\",\"sort\":3}]")
private String noticeImage;
@ApiModelProperty(value = "演出简介", example = "")
private String describes;
@ApiModelProperty(value = "", example = "")
@JsonIgnore
private String createdAt;
......
......@@ -20,4 +20,7 @@ public class PerformanceStep2Param implements Serializable {
@ApiModelProperty(value = "是否提交 1提交 0不提交(不验证参数)", example = "0")
private int isSubmit;
@ApiModelProperty(value = "第三方id", example = "0")
private String merchantId;
}
......@@ -27,7 +27,7 @@ public class TicketCreateParam implements Serializable {
private String title;
@ApiModelProperty(value = "类型", example = "2")
private int types;
private int type;
@ApiModelProperty(value = "是否学生票 0否 1是", example = "0")
private int isStudent;
......
package com.liquidnet.service.kylin.dto.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class PerformanceVo {
//演出数据
@ApiModelProperty(value = "主键id")
private String performancesId;
@ApiModelProperty(value = "标题")
private String title;
@ApiModelProperty(value = "开始时间")
private String timeStart;
@ApiModelProperty(value = "结束时间")
private String timeEnd;
@ApiModelProperty(value = "封面图")
private String imgPoster;
@ApiModelProperty(value = "类型")
private int type;
@ApiModelProperty(value = "场地id")
private String fieldId;
@ApiModelProperty(value = "场地名称")
private String fieldName;
@ApiModelProperty(value = "价格")
private String price;
@ApiModelProperty(value = "停售时间")
private String stopSellTime;
@ApiModelProperty(value = "主办方")
private String sponsor;
@ApiModelProperty(value = "联系人")
private String contacts;
@ApiModelProperty(value = "手机号")
private String mobile;
@ApiModelProperty(value = "批文地址")
private String approvalUrl;
@ApiModelProperty(value = "演出详情")
private String details;
@ApiModelProperty(value = "购票须知")
private String noticeImage;
@ApiModelProperty(value = "状态")
private int status;
@ApiModelProperty(value = "拒绝理由")
private String rejectTxt;
@ApiModelProperty(value = "是否展示")
private int isShow;
@ApiModelProperty(value = "是否销售")
private int statusSell;
@ApiModelProperty(value = "是否分销")
private int isDistribution;
@ApiModelProperty(value = "是否同步小家伙")
private int syncAgent;
@ApiModelProperty(value = "-1未提交审核,0提交审核,1审核通过,2审核拒绝")
private int auditStatus;
@ApiModelProperty(value = "是否实名")
private int isTrueName;
@ApiModelProperty(value = "限购数量")
private int limitCount;
@ApiModelProperty(value = "限购数量")
private String createdAt;
@ApiModelProperty(value = "限购数量")
private String updatedAt;
@ApiModelProperty(value = "权重")
private int sort;
@ApiModelProperty(value = "权重")
private String describes;
@ApiModelProperty(value = "主办方类型")
private String sponsorType;
@ApiModelProperty(value = "主办方id")
private String sponsorId;
@ApiModelProperty(value = "演出公告")
private String notice;
@ApiModelProperty(value = "订单可支付时间")
private int payCountdownMinute;
@ApiModelProperty(value = "第三方id")
private String merchantId;
//场次数据
@ApiModelProperty(value = "场次数据")
private List<TicketTimesTicketVo> ticketTimes;
}
package com.liquidnet.service.kylin.dto.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
//包含 票
@Data
public class TicketTimesTicketVo implements Serializable {
@ApiModelProperty(value = "主键id")
private String ticketTimesId;
@ApiModelProperty(value = "演出Id", example = "")
private String performancesId;
@ApiModelProperty(value = "场次名称")
private String title;
@ApiModelProperty(value = "场次适用开始时间")
private String useStart;
@ApiModelProperty(value = "场次适用结束时间")
private String useSEnd;
@ApiModelProperty(value = "状态 0不可见 1可见")
private int status;
@ApiModelProperty(value = "状态 1单日票 2通票")
private int type;
@ApiModelProperty(value = "创建时间")
private String createdAt;
@ApiModelProperty(value = "修改时间")
private String updatedAt;
//票
@ApiModelProperty(value = "票数据")
private List<TicketVo> ticket;
}
......@@ -13,16 +13,16 @@ public class TicketTimesVo implements Serializable {
private String ticketTimesId;
@ApiModelProperty(value = "演出Id", example = "")
private String PerformancesId;
private String performancesId;
@ApiModelProperty(value = "场次名称")
private String title;
@ApiModelProperty(value = "场次适用开始时间")
private String timeStart;
private String useStart;
@ApiModelProperty(value = "场次适用结束时间")
private String timeEnd;
private String useEnd;
@ApiModelProperty(value = "状态 0不可见 1可见")
private int status;
......@@ -30,6 +30,10 @@ public class TicketTimesVo implements Serializable {
@ApiModelProperty(value = "状态 1单日票 2通票")
private int type;
@ApiModelProperty(value = "是否开启缺票登记")
private int isLackRegister;
@ApiModelProperty(value = "创建时间")
private String createdAt;
......
package com.liquidnet.service.kylin.dto.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -28,7 +29,7 @@ public class TicketVo implements Serializable {
private int isExpress;
@ApiModelProperty(value = "类型", example = "2")
private int types;
private int type;
@ApiModelProperty(value = "价格", example = "100.00")
private BigDecimal price;
......@@ -51,6 +52,12 @@ public class TicketVo implements Serializable {
@ApiModelProperty(value = "票种结售时间", example = "2020-12-01T14:00:00")
private String timeEnd;
@ApiModelProperty(value = "票种适用开始时间", example = "2020-12-01T12:00:00")
private String useStart;
@ApiModelProperty(value = "票种适用结束时间", example = "2020-12-01T14:00:00")
private String useEnd;
@ApiModelProperty(value = "票种说明", example = "这是票种说明")
private String describes;
......@@ -66,9 +73,36 @@ public class TicketVo implements Serializable {
@ApiModelProperty(value = "场次id")
private String timesId;
@ApiModelProperty(value = "剩余库存", example = "100")
private int surplusGeneral;
@ApiModelProperty(value = "剩余兑换库存", example = "100")
private int surplusExchange;
@ApiModelProperty(value = "快递类型 1寄付 2到付", example = "100")
private int expressType;
@ApiModelProperty(value = "是否开启转赠", example = "100")
private int isTransfer;
@ApiModelProperty(value = "是否 会员", example = "100")
private int isMember;
@ApiModelProperty(value = "是否专属", example = "100")
private int isExclusive;
@ApiModelProperty(value = "")
private String createdAt;
@ApiModelProperty(value = "")
private String updatedAt;
public void setDefault(){
this.setExpressType(2);
this.setIsMember(0);
this.setIsTransfer(0);
this.setIsExclusive(0);
this.setSurplusExchange(this.getTotalExchange());
this.setSurplusGeneral(this.getTotalExchange());
}
}
\ No newline at end of file
package com.liquidnet.service.kylin.service.admin;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
import com.liquidnet.service.kylin.entity.KylinPerformances;
/**
* <p>
* 演出 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-05
*/
public interface IKylinPerformancesAdminService extends IService<KylinPerformances> {
PerformanceVo performanceDetails(String performancesId);
boolean performanceAudit(String performancesId,int status ,String rejectTxt);
}
......@@ -42,7 +42,7 @@ public class KylinPerformanceStatus implements Serializable {
/**
* 状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退
*/
private String status;
private int status;
/**
* 是否售卖 0停止 1正常
......
......@@ -112,7 +112,7 @@ public class KylinPerformances implements Serializable {
/**
* 演出简介
*/
private String describe;
private String describes;
/**
* 演出详情
......
......@@ -47,12 +47,12 @@ public class KylinTicketTimes implements Serializable {
/**
* 售票开始时间
*/
private LocalDateTime timeStart;
private LocalDateTime useStart;
/**
* 售票结束时间
*/
private LocalDateTime timeEnd;
private LocalDateTime useEnd;
/**
* comment
......
......@@ -38,7 +38,7 @@ public class KylinTickets implements Serializable {
/**
* 票类型 1单日票 2通票
*/
private Integer types;
private Integer type;
/**
* 票单价
......
......@@ -94,7 +94,7 @@ CREATE TABLE `kylin_performances`
`mid` int(11) NOT NULL AUTO_INCREMENT,
`performances_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'performances_id',
`title` varchar(255) NOT NULL DEFAULT '' COMMENT '演出名称',
`type` tinyint NOT NULL DEFAULT 3 COMMENT '1音乐节 2演唱会 3小型演出 4展览 6舞台剧',
`type` tinyint NOT NULL DEFAULT 3 COMMENT '1音乐节 2演唱会 3小型演出 4展览 6舞台剧',
`img_poster` varchar(255) NOT NULL DEFAULT '' COMMENT '演出海报',
`province_id` varchar(255) NOT NULL DEFAULT '' COMMENT '省id',
`province_name` varchar(255) NOT NULL DEFAULT '' COMMENT '省名称',
......@@ -109,7 +109,7 @@ CREATE TABLE `kylin_performances`
`sponsor` varchar(255) NOT NULL DEFAULT '' COMMENT '主办方',
`contacts` varchar(255) NOT NULL DEFAULT '' COMMENT '联系人',
`mobile` varchar(255) NOT NULL DEFAULT '' COMMENT '联系电话',
`describe` varchar(255) NOT NULL DEFAULT '' COMMENT '演出简介',
`describes` varchar(255) NOT NULL DEFAULT '' COMMENT '演出简介',
`details` longtext DEFAULT NULL COMMENT '演出详情',
`notice_image` text DEFAULT NULL COMMENT '购票须知',
`time_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '演出开始时间',
......@@ -131,7 +131,7 @@ CREATE TABLE `kylin_performance_status`
`performance_status_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'performance_status_id',
`performance_id` varchar(255) NOT NULL DEFAULT '' COMMENT '演出关联id',
`is_show` tinyint NOT NULL DEFAULT 1 COMMENT '是否显示 0全部用户可见 1白名单可见 2任何不显示',
`status` varchar(10) NOT NULL DEFAULT 0 COMMENT '状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退',
`status` int NOT NULL DEFAULT 0 COMMENT '状态:-1删除;0未提交;1审核中;2审核中(自动上线);3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退',
`status_sell` tinyint NOT NULL DEFAULT 1 COMMENT '是否售卖 0停止 1正常',
`is_distribution` tinyint NOT NULL DEFAULT 0 COMMENT '是否开启分销 0关闭 1开启',
`sync_agent` tinyint NOT NULL DEFAULT 0 COMMENT '是否关联小程序 0不关联 1关联',
......@@ -192,10 +192,10 @@ CREATE TABLE `kylin_ticket_times`
`mid` int(11) NOT NULL AUTO_INCREMENT,
`ticket_times_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'ticket_times_id',
`title` varchar(255) NOT NULL DEFAULT '' COMMENT '标题',
`type` tinyint NOT NULL DEFAULT 1 COMMENT '状态 1单日票 2通票',
`type` tinyint NOT NULL DEFAULT 1 COMMENT '状态 1单日票 2通票',
`status` tinyint NOT NULL DEFAULT 1 COMMENT '状态 0不可用 1可用',
`time_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
`time_end` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
`use_start` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
`use_end` datetime NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
`comment` varchar(255) NOT NULL DEFAULT '' COMMENT 'comment',
`created_at` datetime NULL DEFAULT NULL COMMENT '创建时间',
`updated_at` datetime NULL DEFAULT NULL COMMENT '修改时间',
......@@ -231,7 +231,7 @@ CREATE TABLE `kylin_tickets`
`price_express` decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '快递费',
`price_discount_member` decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '会员优惠价格',
`price_discount` decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '优惠价格',
`describe` varchar(500) NOT NULL DEFAULT '' COMMENT '票种描述',
`describes` varchar(500) NOT NULL DEFAULT '' COMMENT '票种描述',
`describe_express` varchar(500) NOT NULL DEFAULT '' COMMENT '快递票类型说明',
`describe_electronic` varchar(500) NOT NULL DEFAULT '' COMMENT '电子票票类型说明',
`advance_minute_member` int(11) NOT NULL DEFAULT 5 COMMENT '会员提前购买分钟数',
......
......@@ -17,9 +17,9 @@ public class FieldsController {
@Autowired
private FieldsServiceImpl fieldsService;
@GetMapping(value = "details")
@ApiOperation(value = "获取场地详情")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
// @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;
result = fieldsService.fieldDetails(fieldId);
......@@ -30,9 +30,9 @@ public class FieldsController {
}
}
@GetMapping(value = "list")
@ApiOperation(value = "获取场地列表")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
// @GetMapping(value = "list")
// @ApiOperation(value = "获取场地列表")
// @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap<String, Object>> fieldList(@RequestParam(value = "page", defaultValue = "1") int page,@RequestParam(value = "size", defaultValue = "10") int size,@RequestParam(value = "city_id", defaultValue = "1") int city_id) {
HashMap<String, Object> result = null;
result = fieldsService.fieldList(page-1,size,city_id);
......
......@@ -27,9 +27,9 @@ public class FieldsAdminController {
@Autowired
private FieldsAdminServiceImpl fieldsAdminService;
@PostMapping(value = "")
@ApiOperation(value = "创建场地")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
// @PostMapping(value = "")
// @ApiOperation(value = "创建场地")
// @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<FieldsVo> createFields(@RequestBody FieldsParam fieldsParam) {
boolean result = fieldsAdminService.fieldCreate(fieldsParam);
if (result) {
......@@ -39,9 +39,9 @@ public class FieldsAdminController {
}
}
@PutMapping(value = "")
@ApiOperation(value = "mis修改场地全部数据")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
// @PutMapping(value = "")
// @ApiOperation(value = "mis修改场地全部数据")
// @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<FieldsVo> fieldUpdate(@RequestBody FieldsParam fieldsParam) {
boolean result = fieldsAdminService.fieldUpdateMessage(fieldsParam);
if (result) {
......@@ -51,9 +51,9 @@ public class FieldsAdminController {
}
}
@PostMapping(value = "list")
@ApiOperation(value = "mis获取场地列表")
@ApiResponse(response = PagerVo.class, code = 200, message = "接口返回对象参数")
// @PostMapping(value = "list")
// @ApiOperation(value = "mis获取场地列表")
// @ApiResponse(response = PagerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PagerVo<FieldMisListDao>> fieldList(@RequestBody FieldsSearchParam fieldsSearchParam) {
List<FieldMisListDao> result = fieldsAdminService.fieldList(fieldsSearchParam);
Long total = fieldsAdminService.fieldListCount(fieldsSearchParam);
......@@ -69,9 +69,9 @@ public class FieldsAdminController {
}
}
@GetMapping(value = "details")
@ApiOperation(value = "mis场地详情")
@ApiResponse(response = FieldMisDetailsDao.class, code = 200, message = "接口返回对象参数")
// @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);
......@@ -82,9 +82,9 @@ public class FieldsAdminController {
}
}
@PostMapping(value = "audit")
@ApiOperation(value = "mis场地审核")
@ApiResponse(code = 200, message = "接口返回对象参数")
// @PostMapping(value = "audit")
// @ApiOperation(value = "mis场地审核")
// @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> fieldAudit(@RequestBody FieldsAuditParam fieldsAuditParam) {
boolean result = fieldsAdminService.fieldAudit(fieldsAuditParam);
......@@ -96,9 +96,9 @@ public class FieldsAdminController {
}
}
@PostMapping(value = "status")
@ApiOperation(value = "mis修改场地状态")
@ApiResponse(code = 200, message = "接口返回对象参数")
// @PostMapping(value = "status")
// @ApiOperation(value = "mis修改场地状态")
// @ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> fieldStatus(@RequestBody FieldsStatusParam fieldsStatusParam) {
boolean result = fieldsAdminService.fieldStatus(fieldsStatusParam);
if (result) {
......
package com.liquidnet.service.kylin.controller.admin;
import com.liquidnet.service.ResponseDto;
import com.liquidnet.service.kylin.dao.FieldMisDetailsDao;
import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
import com.liquidnet.service.kylin.service.impl.admin.FieldsAdminServiceImpl;
import com.liquidnet.service.kylin.service.impl.admin.KylinPerformancesAdminServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 演出 前端控制器
* </p>
*
* @author liquidnet
* @since 2021-05-05
*/
@Api("后端-演出")
@RestController
@RequestMapping("admin/performance")
public class KylinPerformancesAdminController {
@Autowired
private KylinPerformancesAdminServiceImpl performancesAdminService;
@GetMapping(value = "details")
@ApiOperation(value = "获取演出详情")
@ApiResponse(response = PerformanceVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
PerformanceVo result = null;
result = performancesAdminService.performanceDetails(performancesId);
if (null != result) {
return ResponseDto.success(result);
} else {
return ResponseDto.failure("获取演出详情失败");
}
}
@GetMapping(value = "audit")
@ApiOperation(value = "演出审核")
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> performanceDetails(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam("rejectTxt") String rejectTxt) {
boolean result = performancesAdminService.performanceAudit(performancesId, status, rejectTxt);
if (result) {
return ResponseDto.success("审核完成");
} else {
return ResponseDto.failure("审核失败");
}
}
}
......@@ -17,15 +17,15 @@ import java.util.HashMap;
@Api
@RestController
@RequestMapping("kylin/partner/fields")
@RequestMapping("partner/fields")
public class FieldsPartnerController {
@Autowired
private FieldsPartnerServiceImpl fieldsPartnerService;
@GetMapping(value = "details")
@ApiOperation(value = "获取场地详情")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
// @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;
result = fieldsPartnerService.fieldDetails(fieldId);
......@@ -36,9 +36,9 @@ public class FieldsPartnerController {
}
}
@GetMapping(value = "list")
@ApiOperation(value = "获取场地列表")
@ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
// @GetMapping(value = "list")
// @ApiOperation(value = "获取场地列表")
// @ApiResponse(response = FieldsVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap<String, Object>> fieldList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "size", defaultValue = "10") int size, @RequestParam(value = "name", defaultValue = "") String name) {
HashMap<String, Object> result = null;
result = fieldsPartnerService.fieldList(page-1,size,name);
......
......@@ -6,6 +6,7 @@ import com.liquidnet.service.kylin.dto.param.CreateTicketTimesParam;
import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
import com.liquidnet.service.kylin.service.impl.partner.KylinTicketTimesPartnerServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -19,8 +20,9 @@ import org.springframework.web.bind.annotation.*;
* @author liquidnet
* @since 2021-05-06
*/
@Api("第三方-场次")
@RestController
@RequestMapping("kylin/partner/times")
@RequestMapping("partner/times")
public class KylinTicketTimesPartnerController {
@Autowired
......
......@@ -23,9 +23,9 @@ import org.springframework.web.bind.annotation.*;
* @author liquidnet
* @since 2021-05-06
*/
@Api
@Api("第三方-票")
@RestController
@RequestMapping("kylin/partner/ticket")
@RequestMapping("partner/ticket")
public class KylinTicketsPartnerController {
@Autowired
......
......@@ -10,9 +10,9 @@ import io.swagger.annotations.ApiResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@Api
@Api("第三方-演出")
@RestController
@RequestMapping("kylin/partner/performance")
@RequestMapping("partner/performance")
public class PerformancePartnerController {
@Autowired
......
......@@ -87,6 +87,8 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
performanceCreateParam.setLimitCount(step2Param.getLimitCount());
performanceCreateParam.setCreatedAt(createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
performanceCreateParam.setStatus(1);
performanceCreateParam.setIsSubmit(step2Param.getIsSubmit());
performanceCreateParam.setMerchantId(step2Param.getMerchantId());
PerformanceCreateParam data = mongoTemplate.insert(
performanceCreateParam, PerformanceCreateParam.class.getSimpleName()
);
......
......@@ -68,32 +68,32 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
// 标题
String title = "";
if (createTicketTimesParam.getType() == 1) {
title = createTicketTimesParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
} else {
title = createTicketTimesParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
}
// mysql 操作
KylinTicketTimes ticketTimes = new KylinTicketTimes();
BeanUtils.copyProperties(createTicketTimesParam, ticketTimes);
ticketTimes.setTicketTimesId(ticketTimesId);
ticketTimes.setCreatedAt(createdAt);
ticketTimes.setStatus(1);
ticketTimes.setTitle(title);
ticketTimesMapper.insert(ticketTimes);
KylinTicketTimeRelation ticketTimeRelation = new KylinTicketTimeRelation();
ticketTimeRelation.setTicketTimeRelationId(IDGenerator.nextSnowId().toString());
ticketTimeRelation.setTimesId(ticketTimesId);
ticketTimeRelation.setPerformanceId(createTicketTimesParam.getPerformancesId());
ticketTimeRelation.setCreatedAt(createdAt);
ticketTimeRelationMapper.insert(ticketTimeRelation);
// KylinTicketTimes ticketTimes = new KylinTicketTimes();
// BeanUtils.copyProperties(createTicketTimesParam, ticketTimes);
// ticketTimes.setTicketTimesId(ticketTimesId);
// ticketTimes.setCreatedAt(createdAt);
// ticketTimes.setStatus(1);
// ticketTimes.setTitle(title);
// ticketTimesMapper.insert(ticketTimes);
//
// KylinTicketTimeRelation ticketTimeRelation = new KylinTicketTimeRelation();
// ticketTimeRelation.setTicketTimeRelationId(IDGenerator.nextSnowId().toString());
// ticketTimeRelation.setTimesId(ticketTimesId);
// ticketTimeRelation.setPerformanceId(createTicketTimesParam.getPerformancesId());
// ticketTimeRelation.setCreatedAt(createdAt);
// ticketTimeRelationMapper.insert(ticketTimeRelation);
// mongo 操作
TicketTimesVo ticketTimesVo = new TicketTimesVo();
ticketTimesVo.setTicketTimesId(ticketTimesId);
ticketTimesVo.setTimeStart(createTicketTimesParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setTimeEnd(createTicketTimesParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setStatus(1);
ticketTimesVo.setTitle(title);
ticketTimesVo.setPerformancesId(createTicketTimesParam.getPerformancesId());
......@@ -114,11 +114,11 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
try {
LocalDateTime updatedAt = LocalDateTime.now();
KylinTicketTimes ticketTimes = new KylinTicketTimes();
ticketTimes.setUpdatedAt(updatedAt);
ticketTimes.setStatus(0);
ticketTimesMapper.update(ticketTimes
, new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimesId));
// KylinTicketTimes ticketTimes = new KylinTicketTimes();
// ticketTimes.setUpdatedAt(updatedAt);
// ticketTimes.setStatus(0);
// ticketTimesMapper.update(ticketTimes
// , new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", ticketTimesId));
// mongo 操作
HashMap<String, Object> map = new HashMap<>();
......@@ -147,18 +147,18 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
LocalDateTime updatedAt = LocalDateTime.now();
String title = "";
if (createTicketTimesParam.getType() == 1) {
title = createTicketTimesParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
} else {
title = createTicketTimesParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
title = createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")) + "-" + createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
}
createTicketTimesParam.setTitle(title);
// mysql 操作
KylinTicketTimes ticketTimes = new KylinTicketTimes();
BeanUtils.copyProperties(createTicketTimesParam, ticketTimes);
ticketTimes.setUpdatedAt(updatedAt);
ticketTimes.setStatus(1);
ticketTimesMapper.update(ticketTimes, new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", createTicketTimesParam.getTicketTimesId()));
// KylinTicketTimes ticketTimes = new KylinTicketTimes();
// BeanUtils.copyProperties(createTicketTimesParam, ticketTimes);
// ticketTimes.setUpdatedAt(updatedAt);
// ticketTimes.setStatus(1);
// ticketTimesMapper.update(ticketTimes, new UpdateWrapper<KylinTicketTimes>().eq("ticket_times_id", createTicketTimesParam.getTicketTimesId()));
// mongo 操作
......@@ -166,8 +166,8 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
BeanUtils.copyProperties(createTicketTimesParam, ticketTimesVo);
ticketTimesVo.setTicketTimesId(createTicketTimesParam.getTicketTimesId());
ticketTimesVo.setUpdatedAt(updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setTimeStart(createTicketTimesParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setTimeEnd(createTicketTimesParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setUseStart(createTicketTimesParam.getUseStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setUseEnd(createTicketTimesParam.getUseEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketTimesVo.setStatus(1);
BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(ticketTimesVo)));
......
......@@ -8,6 +8,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.param.TicketCreateParam;
import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.TicketVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.KylinTicketRelationsMapper;
......@@ -82,6 +83,13 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
ticketVo.setTimeEndExpress(ticketCreateParam.getTimeEndExpress().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
TicketTimesVo ticketTimesVo = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketCreateParam.getTimesId())), TicketTimesVo.class, TicketTimesVo.class.getSimpleName());
ticketVo.setUseStart(ticketTimesVo.getUseStart());
ticketVo.setUseEnd(ticketTimesVo.getUseEnd());
ticketVo.setDefault();
ticketVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
TicketVo data = mongoTemplate.insert(
ticketVo, TicketVo.class.getSimpleName()
......@@ -111,8 +119,10 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
ticketVo.setTimeStart(ticketCreateParam.getTimeStart().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketVo.setTimeEnd(ticketCreateParam.getTimeEnd().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketVo.setQrCodeShowTime(ticketCreateParam.getQrCodeShowTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
ticketVo.setTimesId(null);
ticketVo.setDefault();
BasicDBObject object = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(ticketVo)));
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(ticketVo));
Document doc = mongoTemplate.getCollection(TicketVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("ticketsId").is(ticketId)).getQueryObject(),
object,
......@@ -208,15 +218,15 @@ public class KylinTicketsPartnerServiceImpl extends ServiceImpl<KylinTicketsMapp
// ticketStatusMapper.update(ticketStatus
// , new UpdateWrapper<KylinTicketStatus>().eq("time_id", timesId));
HashMap<String, Object> map = new HashMap<>();
map.put("status", 1);
map.put("updatedAt",updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(TicketVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("timesId").is(timesId)).getQueryObject(),
object
);
return true;
HashMap<String, Object> map = new HashMap<>();
map.put("status", 1);
map.put("updatedAt", updatedAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
BasicDBObject object = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));
mongoTemplate.getCollection(TicketVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("timesId").is(timesId)).getQueryObject(),
object
);
return true;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment