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

Commit 3c954e1c authored by 张国柄's avatar 张国柄

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

parents 79f16905 292a2946
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);
}
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> {
// 已配置列表
// 未配置列表
// 添加配置
// 删除配置
}
......@@ -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);
}
......
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;
}
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;
}
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;
}
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;
}
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);
}
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> {
}
<?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>
<?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>
......@@ -543,63 +543,98 @@ 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`)
`updated_at`, `title`)
values ('1', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c45722882a13.png',
'门票为有价证券,并非商品,一经售出不予退换。因“不可抗力”导致的演出取消或延期除外。', '1', '0', '2019-01-29 13:51:42', '2019-01-29 13:51:42', '门票不退不换');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('2', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e93db0b9.png',
'本场演出不设座位,均为站席观演。', '1', '0', '2019-01-29 13:51:42', '2019-01-29 13:51:42', '仅设站席');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('3', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e5c27644.png',
'为防止不法分子利用票务转让诈骗钱款,建议广大乐迷不要进行个人间票务买卖,不要轻易相信来源不明的转票,以免自身利益受到侵害。', '1', '0', '2019-01-29 13:51:42',
'2019-01-29 13:51:42', '禁止个人票务买卖');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('4', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png',
'本场演出凭纸质票验票入场,不支持选座,根据支付顺序择优安排。', '1', '0', '2019-01-29 13:51:42', '2019-01-29 13:51:42', '凭票入场');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('5', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456e163f0e5.png',
'本场演出请按照票面标注对号入座。', '1', '0', '2019-01-29 13:51:42', '2019-01-29 13:51:42', '对号入座');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('6', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png',
'凭订单二维码或手机号兑票入场,二维码或手机号请勿泄露,以免影响入场。个人原因导致的信息泄露,主办方/平台方不承担任何责任。', '1', '0', '2019-01-29 13:51:42',
'2019-01-29 13:51:42', '电子票');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('7', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png',
'电子票购票人须持本人身份证原件兑换实体票后验票入场。请不要将身份证信息提供给他人,因此导致的损失,主办方/平台方不承担任何责任。', '1', '0', '2019-01-29 13:51:42',
'2019-01-29 13:51:42', '凭身份证原件兑票');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('8', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d0763c262a30.png',
'凭实体票验票入场的演出,门票请妥善保管,忘带、丢失、损坏等情况,主办方/平台方无法办理补票。', '1', '0', '2019-06-17 18:06:06', '2019-06-17 18:06:06',
'门票丢失不补');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('9', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d0764a613742.png',
'请通过官方平台【正在现场】购买门票。通过个人转让购买的门票,若遇到假票、一票多卖等情况,导致的损失,主办方/平台方不承担任何责任。', '1', '0', '2019-06-17 18:06:06',
'2019-06-17 18:06:06', '购买官方门票');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('10', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d0764c565d9e.png',
'学生票仅适用于年龄在25周岁以下的在校生。学生票购票人须持本人学生证或校园卡等有效学生证件兑换实体票后验票入场,无法提供有效学生证件则需补全差价。', '1', '0', '2019-06-17 18:06:06',
'2019-06-17 18:06:06', '学生票');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('11', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/06/17/5d07647eaa55f.png',
'每场现场票数量由场地方决定,具体请到现场询问。', '1', '0', '2019-06-17 18:06:06', '2019-06-17 18:06:06', '现场票');
insert into `kylin_buy_notice` (`buy_notice_id`, `img_url`, `message`, `status`, `sort`, `created_at`,
`updated_at`, `title`)
`updated_at`, `title`)
values ('12', 'http://img-zhengzai-tv.oss-cn-hangzhou.aliyuncs.com/partner/2019/01/21/5c456d9482fb9.png',
'电子票购票人须持本人身份证原件和订单二维码验票入场。请不要将身份证信息和订单二维码提供给他人,因此导致的损失,主办方/平台方不承担任何责任。', '1', '0', '2019-01-29 13:51:42',
'2019-01-29 13:51:42', '凭身份证原件兑票');
\ No newline at end of file
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 {
}
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 {
}
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));
}
}
}
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 {
}
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