Merge remote-tracking branch 'origin/dev' into dev

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

+package com.liquidnet.service.kylin.service.partner;
+
+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.entity.KylinCheckUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 验票用户表 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-21
+ */
+public interface IKylinCheckUserPartnerService extends IService<KylinCheckUser> {
+
+    // 子账号列表
+    PageInfo<ChildListDao> getCheckUserList(String merchantId, String mobile, int page, int size);
+
+    // 子账号删除
+    ResponseDto<String> del(String merchantId,String checkUserId);
+
+    // 子账号创建
+    ResponseDto<String> create(String merchantId,String name,String pwd,String mobile);
+
+    // 子账号修改
+    ResponseDto<String> change(String merchantId,String checkUserId,String name,String pwd,String mobile);
+
+    // 子账号详情
+    ResponseDto<ChildDetailsDao> details(String merchantId, String checkUserId);
+}

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

+package com.liquidnet.service.kylin.service.partner;
+
+import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 验票用户可看演出表 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-21
+ */
+public interface IKylinCheckUserPerformancesPartnerService extends IService<KylinCheckUserPerformances> {
+
+    // 已配置列表
+
+    // 未配置列表
+
+    // 添加配置
+
+    // 删除配置
+
+}

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

@@ -89,7 +89,7 @@ public class MybatisPlusCodeGenerator {
         DataSourceConfig dsc = new DataSourceConfig();
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
-        dsc.setUrl("jdbc:mysql://39.106.122.201:3308/ln_kylin?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
+        dsc.setUrl("jdbc:mysql://39.106.122.201:3308/dev_ln_scene?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=CST");
         dsc.setUsername("testmall");
         dsc.setPassword("zhengzai!mYT");
 
@@ -100,8 +100,8 @@ public class MybatisPlusCodeGenerator {
 //        String[] dbTableArray = new String[]{"kylin_ticket_status","kylin_ticket_time_relation","kylin_ticket_times","kylin_ticket_relations","kylin_tickets"};
 //        String[] dbTableArray = new String[]{"kylin_road_shows"};
 //        String[] dbTableArray = new String[]{"kylin_buy_notice"};
-        String[] dbTableArray = new String[]{"kylin_order_tickets","kylin_order_ticket_relations","kylin_order_ticket_status","kylin_order_ticket_entities"};
-
+//        String[] dbTableArray = new String[]{"kylin_order_tickets","kylin_order_ticket_relations","kylin_order_ticket_status","kylin_order_ticket_entities"};
+        String[] dbTableArray = new String[]{"kylin_check_user","kylin_check_user_performances"};
 
         doGenerator(resourcePath, dsc, directory, dbTableArray);
     }

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

+package com.liquidnet.service.kylin.dao;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ChildDetailsDao {
+
+    @ApiModelProperty(value = "主键id")
+    private String checkUserId;
+
+    @ApiModelProperty(value = "姓名/昵称")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "可用状态 0否 1是")
+    private String status;
+}

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

+package com.liquidnet.service.kylin.dao;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class ChildListDao {
+
+    @ApiModelProperty(value = "主键id")
+    private String checkUserId;
+
+    @ApiModelProperty(value = "姓名/昵称")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinCheckUser.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-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinCheckUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * check_user_id
+     */
+    private String checkUserId;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+    /**
+     * 密码
+     */
+    private String pwd;
+
+    /**
+     * 状态0可用 1不可
+     */
+    private Integer status;
+
+    /**
+     * merchantId 第三方id
+     */
+    private String merchantId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinCheckUserPerformances.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-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinCheckUserPerformances implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * check_user_performance_id
+     */
+    private String checkUserPerformanceId;
+
+    /**
+     * 演出id
+     */
+    private String performanceId;
+
+    /**
+     * check_user_id
+     */
+    private String checkUserId;
+
+    /**
+     * 状态 1可用 0不可
+     */
+    private Integer status;
+
+    /**
+     * 可下载时间
+     */
+    private LocalDateTime canDownTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

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

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.dao.ChildDetailsDao;
+import com.liquidnet.service.kylin.dao.ChildListDao;
+import com.liquidnet.service.kylin.entity.KylinCheckUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 验票用户表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-21
+ */
+public interface KylinCheckUserMapper extends BaseMapper<KylinCheckUser> {
+
+    List<ChildListDao> childSimpleList(String merchantId,String name);
+
+    ChildDetailsDao childDetails(String merchantId, String checkUserId);
+}

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

+package com.liquidnet.service.kylin.mapper;
+
+import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 验票用户可看演出表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-21
+ */
+public interface KylinCheckUserPerformancesMapper extends BaseMapper<KylinCheckUserPerformances> {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserMapper.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.KylinCheckUserMapper">
+
+    <resultMap id="simpleList" type="com.liquidnet.service.kylin.dao.ChildListDao">
+        <result column="check_user_id" property="checkUserId"/>
+        <result column="name" property="name"/>
+        <result column="mobile" property="mobile"/>
+    </resultMap>
+
+    <resultMap id="simpleDetails" type="com.liquidnet.service.kylin.dao.ChildDetailsDao">
+        <result column="check_user_id" property="checkUserId"/>
+        <result column="name" property="name"/>
+        <result column="mobile" property="mobile"/>
+        <result column="status" property="status"/>
+    </resultMap>
+
+    <select id="childSimpleList" parameterType="java.lang.String" resultMap="simpleList">
+        SELECT
+        check_user_id,
+        `name`,
+        mobile
+        FROM kylin_check_user
+        <where>
+            merchant_id=#{merchantId}
+            <if test="title !=''">
+                AND `name` LIKE concat('%', #{name}, '%')
+            </if>
+        </where>
+    </select>
+
+    <select id="childDetails" parameterType="java.lang.String" resultMap="simpleDetails">
+        SELECT
+        check_user_id,
+        `name`,
+        mobile,
+        status
+        FROM kylin_check_user
+        <where>
+            merchant_id=#{merchantId} AND `check_user_id` = #{checkUserId}
+        </where>
+    </select>
+
+</mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserPerformancesMapper.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.KylinCheckUserPerformancesMapper">
+
+</mapper>

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

@@ -543,11 +543,46 @@ CREATE TABLE `kylin_buy_notice`
     `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`),
+    KEY `kylin_buy_notice_uid_index` (`buy_notice_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT '购票须知表';
 
+-- 验票用户表
+drop TABLE if exists `kylin_check_user`;
+CREATE TABLE `kylin_check_user`
+(
+    `mid`           int(10) unsigned NOT NULL AUTO_INCREMENT,
+    `check_user_id` varchar(255)     NOT NULL DEFAULT '' COMMENT 'check_user_id',
+    `name`          varchar(255)     NOT NULL DEFAULT '' COMMENT '姓名',
+    `mobile`        varchar(255)     NOT NULL DEFAULT '' COMMENT '手机号',
+    `pwd`           varchar(255)     NOT NULL DEFAULT '' COMMENT '密码',
+    `status`        tinyint          NOT NULL DEFAULT 1 COMMENT '是否可用 0否 1是',
+    `merchant_id`   varchar(255)     NOT NULL DEFAULT '' COMMENT 'merchantId 第三方id',
+    `created_at`    datetime         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`    datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    KEY `kylin_check_user_uid_index` (`check_user_id`),
+    PRIMARY KEY (`mid`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT '验票用户表';
+
+-- 验票用户可看演出表
+drop TABLE if exists `kylin_check_user_performances`;
+CREATE TABLE `kylin_check_user_performances`
+(
+    `mid`                       int(10) unsigned NOT NULL AUTO_INCREMENT,
+    `check_user_performance_id` varchar(255)     NOT NULL DEFAULT '' COMMENT 'check_user_performance_id',
+    `performance_id`            varchar(255)     NOT NULL DEFAULT '' COMMENT '演出id',
+    `check_user_id`             varchar(255)     NOT NULL DEFAULT '' COMMENT 'check_user_id',
+    `status`                    tinyint          NOT NULL DEFAULT 1 COMMENT '状态 1可用 0不可',
+    `can_down_time`             datetime         NULL     DEFAULT NULL COMMENT '可下载时间',
+    `created_at`                datetime         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`                datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    KEY `kylin_check_user_uid_index` (`check_user_id`),
+    PRIMARY KEY (`mid`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT '验票用户可看演出表';
+
 insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
                                 `updated_at`, `title`)
 values ('1', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png',

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

+package com.liquidnet.service.kylin.controller.partner;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 验票用户表 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-21
+ */
+@RestController
+@RequestMapping("partner/checkUser")
+public class KylinCheckUserPartnerController {
+
+}

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

+package com.liquidnet.service.kylin.controller.partner;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 验票用户可看演出表 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-21
+ */
+@RestController
+@RequestMapping("partner/checkUser/performance")
+public class KylinCheckUserPerformancesPartnerController {
+
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/partner/KylinCheckUserPartnerServiceImpl.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.base.ErrorMapping;
+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.entity.KylinCheckUser;
+import com.liquidnet.service.kylin.mapper.KylinCheckUserMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPartnerService;
+import org.apache.tomcat.jni.Local;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.DigestUtils;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 验票用户表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-21
+ */
+@Service
+public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUserMapper, KylinCheckUser> implements IKylinCheckUserPartnerService {
+
+    @Autowired
+    private KylinCheckUserMapper checkUserMapper;
+
+    @Override
+    public PageInfo<ChildListDao> getCheckUserList(String merchantId, String mobile, int page, int size) {
+        PageInfo<ChildListDao> pageInfo = null;
+        try {
+            PageHelper.startPage(page, size);
+            List<ChildListDao> data = checkUserMapper.childSimpleList(merchantId, mobile);
+            pageInfo = new PageInfo(data);
+            return pageInfo;
+        } catch (Exception e) {
+            return pageInfo;
+        }
+    }
+
+    @Override
+    public ResponseDto<String> del(String merchantId, String checkUserId) {
+        try {
+            KylinCheckUser checkUser = new KylinCheckUser();
+            checkUser.setUpdatedAt(LocalDateTime.now());
+            checkUser.setStatus(0);
+            checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("checkUserId", checkUserId));
+            return ResponseDto.success("删除成功");
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get(20102));
+        }
+    }
+
+    @Override
+    public ResponseDto<String> create(String merchantId, String name, String pwd, String mobile) {
+        try {
+            KylinCheckUser checkUser = new KylinCheckUser();
+            checkUser.setName(name);
+            checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
+            checkUser.setMobile(mobile);
+            checkUser.setCreatedAt(LocalDateTime.now());
+            checkUser.setMerchantId(merchantId);
+            checkUser.setStatus(1);
+            checkUserMapper.insert(checkUser);
+            return ResponseDto.success("添加成功");
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get(20101));
+        }
+    }
+
+    @Override
+    public ResponseDto<String> change(String merchantId, String checkUserId, String name, String pwd, String mobile) {
+        try {
+            KylinCheckUser checkUser = new KylinCheckUser();
+            checkUser.setName(name);
+            checkUser.setPwd(DigestUtils.md5DigestAsHex(pwd.getBytes()));
+            checkUser.setMobile(mobile);
+            checkUser.setUpdatedAt(LocalDateTime.now());
+            checkUserMapper.update(checkUser, new UpdateWrapper<KylinCheckUser>().eq("checkUserId", checkUserId).eq("merchantId", merchantId));
+            return ResponseDto.success("修改成功");
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get(20103));
+        }
+    }
+
+    @Override
+    public ResponseDto<ChildDetailsDao> details(String merchantId, String checkUserId) {
+        try {
+            ChildDetailsDao data = checkUserMapper.childDetails(merchantId, checkUserId);
+            return ResponseDto.success(data);
+        } catch (Exception e) {
+            return ResponseDto.failure(ErrorMapping.get(20104));
+        }
+    }
+}

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

+package com.liquidnet.service.kylin.service.impl.partner;
+
+import com.liquidnet.service.kylin.entity.KylinCheckUserPerformances;
+import com.liquidnet.service.kylin.mapper.KylinCheckUserPerformancesMapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.kylin.service.partner.IKylinCheckUserPerformancesPartnerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 验票用户可看演出表 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-21
+ */
+@Service
+public class KylinCheckUserPerformancesPartnerServiceImpl extends ServiceImpl<KylinCheckUserPerformancesMapper, KylinCheckUserPerformances> implements IKylinCheckUserPerformancesPartnerService {
+
+}