提交 购票须知

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

@@ -5,7 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class PerformanceParam implements Serializable {
@@ -101,6 +103,9 @@ public class PerformanceParam implements Serializable {
     @ApiModelProperty(value = "搭售id", example = "0",hidden = true)
     private String projectId;
 
+    @ApiModelProperty(value = "购票须知 Id 数组")
+    private List<Integer> noticeIds;
+
     @ApiModelProperty(value = "", example = "")
     private String createdAt;
 

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class PerformanceStep1Param implements Serializable {
@@ -77,10 +78,13 @@ public class PerformanceStep1Param implements Serializable {
     @NotNull(message = "不能为空")
     private int payCountdownMinute;
 
-    @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}]")
-    @NotNull(message = "不能为空")
+    @ApiModelProperty(value = "购票须知",hidden = true,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 = "购票须知 Id 数组")
+    @NotNull(message = "不能为空")
+    private List<Integer> noticeIds;
+
     @ApiModelProperty(value = "演出简介", example = "")
     private String describes;
 

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

+package com.liquidnet.service.kylin.dto.vo;
+
+import lombok.Data;
+
+@Data
+public class BuyNoticeVo {
+
+    private String buyNoticeId;
+
+    private String title;
+
+    private String imgUrl;
+
+    private String message;
+
+    private Integer sort;
+}

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

+package com.liquidnet.service.kylin.service.partner;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 购票须知表 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+public interface IKylinBuyNoticePartnerService extends IService<KylinBuyNotice> {
+
+    /**
+     * 购票须知列表
+     * @return 分页 mysql 数据
+     */
+    PageInfo<BuyNoticeVo> getBuyNotice();
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
 import com.liquidnet.service.kylin.dto.param.*;
+import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
 import com.liquidnet.service.kylin.dto.vo.partner.PerformancePartnerVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 

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

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

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

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 购票须知表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinBuyNotice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * buy_notice_id
+     */
+    private String buyNoticeId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 图片地址
+     */
+    private String imgUrl;
+
+    /**
+     * 内容
+     */
+    private String message;
+
+    /**
+     * 状态 1可用 0弃用
+     */
+    private Integer status;
+
+    /**
+     * 排序 大在上
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

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

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 购票须知表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+public interface KylinBuyNoticeMapper extends BaseMapper<KylinBuyNotice> {
+
+}

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

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

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -521,4 +521,22 @@ CREATE TABLE `kylin_order_tickets_refund`
     KEY `kylin_order_tickets_refund_uid_index` (`order_tickets_refund_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT '订单退款';
\ No newline at end of file
+  DEFAULT CHARSET = utf8mb4 COMMENT '订单退款';
+
+-- 购票须知表
+drop TABLE if exists `kylin_buy_notice`;
+CREATE TABLE `kylin_buy_notice`
+(
+    `mid`           int(10) unsigned NOT NULL AUTO_INCREMENT,
+    `buy_notice_id` varchar(255)     NOT NULL DEFAULT '' COMMENT 'buy_notice_id',
+    `title`         varchar(255)     NOT NULL DEFAULT '' COMMENT '标题',
+    `img_url`       varchar(255)     NOT NULL DEFAULT '' COMMENT '图片地址',
+    `message`       varchar(255)     NOT NULL DEFAULT '' COMMENT '内容',
+    `status`        tinyint          NOT NULL DEFAULT 1 COMMENT '状态 1可用 0弃用',
+    `sort`          int(10)          NOT NULL DEFAULT 0 COMMENT '排序 大在上',
+    `created_at`    datetime         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`    datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    KEY `kylin_order_tickets_refund_uid_index` (`buy_notice_id`),
+    PRIMARY KEY (`mid`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT '购票须知表';
\ No newline at end of file

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

+package com.liquidnet.service.kylin.controller.partner;
+
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.service.impl.partner.KylinBuyNoticePartnerServiceImpl;
+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.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <p>
+ * 购票须知表 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Api(tags = "第三方-购票须知")
+@RestController
+@RequestMapping("partner/buyNotice")
+public class KylinBuyNoticeParnterController {
+
+    @Autowired
+    private KylinBuyNoticePartnerServiceImpl buyNoticePartnerService;
+
+    @GetMapping(value = "")
+    @ApiOperation(value = "购票须知列表")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<PageInfo<BuyNoticeVo>> copyPerformance() {
+        PageInfo<BuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
+        if (null == result) {
+            return ResponseDto.failure("查询失败");
+        } else {
+            return ResponseDto.success(result);
+        }
+    }
+
+}

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

+package com.liquidnet.service.kylin.service.impl.partner;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.kylin.dto.vo.BuyNoticeVo;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.kylin.service.partner.IKylinBuyNoticePartnerService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 购票须知表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-18
+ */
+@Service
+public class KylinBuyNoticePartnerServiceImpl extends ServiceImpl<KylinBuyNoticeMapper, KylinBuyNotice> implements IKylinBuyNoticePartnerService {
+
+    @Autowired
+    private KylinBuyNoticeMapper kylinBuyNoticeMapper;
+
+    @Override
+    public PageInfo<BuyNoticeVo> getBuyNotice() {
+        PageInfo<BuyNoticeVo> pageInfoTmp = null;
+
+        PageHelper.startPage(1, 20);
+        List<KylinBuyNotice> buyNoticeList = kylinBuyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().eq("status", 1).orderByDesc("sort").orderByDesc("mid"));
+
+        List<BuyNoticeVo> buyNoticeVoList = new ArrayList<>();
+        for (KylinBuyNotice item : buyNoticeList) {
+            BuyNoticeVo buyNoticeVo = new BuyNoticeVo();
+            BeanUtils.copyProperties(item, buyNoticeVo);
+            buyNoticeVoList.add(buyNoticeVo);
+        }
+        pageInfoTmp = new PageInfo(buyNoticeVoList);
+
+        return pageInfoTmp;
+    }
+
+}

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

@@ -22,6 +22,7 @@ import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.partner.IKylinPerformancesPartnerService;
 import com.liquidnet.service.kylin.timerTask.PerformanceVoTask;
+import com.liquidnet.service.kylin.utils.DataUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -33,7 +34,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -42,7 +42,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -66,7 +65,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
     private RedisUtil redisUtil;
 
     @Autowired
-    private RedisTemplate redisTemplate;
+    private DataUtils dataUtils;
 
     @Autowired
     private PerformanceVoTask performanceVoTask;
@@ -142,6 +141,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performanceParam.setProjectId("0");
             performanceParam.setIsShow(1);
             performanceParam.setFieldName((String)redisUtil.hget(KylinRedisConst.FIELDS + ":" + performanceParam.getFieldId(), "name"));
+            performanceParam.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
 
 
             mongoTemplate.insert(
@@ -168,6 +168,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             performanceParam.setUpdatedAt(timeNow.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             performanceParam.setIsSubmit(0);
             performanceParam.setStatus(0);
+            performanceParam.setNoticeImage(dataUtils.getBuyNoticeJsonString(step1Param.getNoticeIds()));
             PerformanceParam data = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)),
                     PerformanceParam.class, PerformanceParam.class.getSimpleName());
             if (data != null) { // 有修改记录

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

@@ -144,6 +144,11 @@ public class KylinTicketTimesPartnerServiceImpl extends ServiceImpl<KylinTicketT
     public Boolean deleteTimes(String ticketTimesId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();
+
+            TicketTimesPartnerVo data = mongoTemplate.findOne(Query.query(Criteria.where("ticketTimesId").is(ticketTimesId)), TicketTimesPartnerVo.class, TicketTimesPartnerVo.class.getSimpleName());
+            if (data.getStatus() == 0) {
+                return false;
+            }
             KylinTicketTimeRelation ticketTimeRelation = ticketTimeRelationMapper.selectOne(
                     new UpdateWrapper<KylinTicketTimeRelation>().eq("times_id", ticketTimesId));
             if (ticketTimeRelation != null) {

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.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.kylin.entity.KylinBuyNotice;
+import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class DataUtils {
+
+    @Autowired
+    private KylinBuyNoticeMapper buyNoticeMapper;
+
+    public String getBuyNoticeJsonString(List<Integer> buyNoticeIds){
+        List<KylinBuyNotice> data = buyNoticeMapper.selectList(new UpdateWrapper<KylinBuyNotice>().in("buy_notice_id",buyNoticeIds));
+        return  JsonUtils.toJson(data);
+    }
+
+}