feat:活动代码生成
This commit is contained in:
1 parent
24e4121c11
commit
069e329d9f
11 files changed
+453
-1
No files matched your search
@@ -1,3 +1,27 @@
|
||||
-- ----------------------------
|
||||
-- Table structure for act_cancel
|
||||
-- ----------------------------
|
||||
DROP TABLE IF EXISTS act_cancel;
|
||||
CREATE TABLE act_cancel
|
||||
(
|
||||
id bigint NOT NULL AUTO_INCREMENT COMMENT '活动项id',
|
||||
mch_id bigint NOT NULL COMMENT '活动商户id',
|
||||
notice_id bigint NOT NULL COMMENT '公告id',
|
||||
active_org_price int DEFAULT NULL COMMENT '活动原价',
|
||||
active_cancel_price int NOT NULL COMMENT '活动核销价',
|
||||
expire_time datetime NOT NULL COMMENT '到期时间',
|
||||
act_status char(32) NOT NULL COMMENT '活动状态(1:正常 2:关闭)',
|
||||
act_title char(32) NOT NULL COMMENT '活动标题',
|
||||
act_content char(32) DEFAULT NULL COMMENT '活动内容',
|
||||
create_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
|
||||
create_time datetime DEFAULT NULL COMMENT '创建时间',
|
||||
update_by varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
|
||||
update_time datetime DEFAULT NULL COMMENT '修改时间',
|
||||
del_flag char(1) COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标记',
|
||||
tenant_id bigint DEFAULT NULL COMMENT '租户ID',
|
||||
PRIMARY KEY (id)
|
||||
) ENGINE = InnoDB COMMENT ='核销活动';
|
||||
|
||||
-- ----------------------------
|
||||
-- Table structure for act_cancel_item
|
||||
-- ----------------------------
|
||||
|
||||
-1
@@ -18,7 +18,6 @@ public enum ActCancelStatusEnum {
|
||||
CANCEL_EXPIRE("3", "已过期"),
|
||||
;
|
||||
private final String code;
|
||||
|
||||
private final String desc;
|
||||
|
||||
public static ActCancelStatusEnum valueOfByType(String code) {
|
||||
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.bsd.pjcloud.wallet.api.constant.act;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 核销活动状体啊
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum ActStatusEnum {
|
||||
|
||||
ACT_OPEN("1", "开启"),
|
||||
ACT_CANCEL("2", "关闭活动"),
|
||||
;
|
||||
|
||||
private final String code;
|
||||
private final String desc;
|
||||
|
||||
public static ActStatusEnum valueOfByType(String code) {
|
||||
return Arrays.stream(ActStatusEnum.values())
|
||||
.filter(v -> ObjectUtil.equal(v.getCode(), code))
|
||||
.findFirst().get();
|
||||
}
|
||||
|
||||
public static ActStatusEnum descOf(String description) {
|
||||
return Arrays.stream(ActStatusEnum.values())
|
||||
.filter(v -> ObjectUtil.equal(v.getDesc(), description))
|
||||
.findFirst().get();
|
||||
}
|
||||
|
||||
}
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
package com.bsd.pjcloud.wallet.api.dto.act;
|
||||
|
||||
import com.bsd.pjcloud.wallet.api.entity.act.ActCancelEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ActCancelDto extends ActCancelEntity {
|
||||
|
||||
}
|
||||
+119
@@ -0,0 +1,119 @@
|
||||
package com.bsd.pjcloud.wallet.api.entity.act;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.baomidou.mybatisplus.extension.activerecord.Model;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import com.bsd.pjcloud.common.core.util.TenantTable;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 核销活动
|
||||
*/
|
||||
@Data
|
||||
@TenantTable
|
||||
@TableName("act_cancel")
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Schema(description = "核销活动")
|
||||
public class ActCancelEntity extends Model<ActCancelEntity> {
|
||||
|
||||
|
||||
/**
|
||||
* 活动项id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@Schema(description = "活动项id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 活动商户id
|
||||
*/
|
||||
@Schema(description = "活动商户id")
|
||||
private Long mchId;
|
||||
|
||||
/**
|
||||
* 公告id
|
||||
*/
|
||||
@Schema(description = "公告id")
|
||||
private Long noticeId;
|
||||
|
||||
/**
|
||||
* 活动原价
|
||||
*/
|
||||
@Schema(description = "活动原价")
|
||||
private Integer activeOrgPrice;
|
||||
|
||||
/**
|
||||
* 活动核销价
|
||||
*/
|
||||
@Schema(description = "活动核销价")
|
||||
private Integer activeCancelPrice;
|
||||
|
||||
/**
|
||||
* 到期时间
|
||||
*/
|
||||
@Schema(description = "到期时间")
|
||||
private LocalDateTime expireTime;
|
||||
|
||||
/**
|
||||
* 活动状态(1:正常 2:关闭)
|
||||
*/
|
||||
@Schema(description = "活动状态(1:正常 2:关闭)")
|
||||
private String actStatus;
|
||||
|
||||
/**
|
||||
* 活动标题
|
||||
*/
|
||||
@Schema(description = "活动标题")
|
||||
private String actTitle;
|
||||
|
||||
/**
|
||||
* 活动内容
|
||||
*/
|
||||
@Schema(description = "活动内容")
|
||||
private String actContent;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "创建时间")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 修改人
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改人")
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@TableField(fill = FieldFill.INSERT_UPDATE)
|
||||
@Schema(description = "修改时间")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 删除标记
|
||||
*/
|
||||
@TableLogic
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
@Schema(description = "删除标记")
|
||||
private String delFlag;
|
||||
|
||||
/**
|
||||
* 租户ID
|
||||
*/
|
||||
@Schema(description = "租户ID")
|
||||
private Long tenantId;
|
||||
}
|
||||
+21
@@ -0,0 +1,21 @@
|
||||
package com.bsd.pjcloud.wallet.api.vo.act;
|
||||
|
||||
import com.bsd.pjcloud.wallet.api.entity.act.ActCancelEntity;
|
||||
import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ActCancelVo extends ActCancelEntity implements BaseMchInterface {
|
||||
|
||||
/**
|
||||
* 商户相关
|
||||
*/
|
||||
private Long merchantId;
|
||||
|
||||
private String merchantName;
|
||||
|
||||
private String logoPic;
|
||||
|
||||
private String merchantType;
|
||||
|
||||
}
|
||||
+72
@@ -0,0 +1,72 @@
|
||||
package com.bsd.pjcloud.wallet.controller.act;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.bsd.pjcloud.common.core.util.R;
|
||||
import com.bsd.pjcloud.common.data.datascope.DataScope;
|
||||
import com.bsd.pjcloud.common.log.annotation.SysLog;
|
||||
import com.bsd.pjcloud.wallet.api.dto.act.ActCancelDto;
|
||||
import com.bsd.pjcloud.wallet.api.entity.act.ActCancelEntity;
|
||||
import com.bsd.pjcloud.wallet.service.ActCancelService;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
|
||||
import org.springdoc.core.annotations.ParameterObject;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
|
||||
/**
|
||||
* 核销活动
|
||||
*/
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
@RequestMapping("/act/act-cancel")
|
||||
@Tag(description = "act-cancel", name = "核销活动管理")
|
||||
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
|
||||
public class ActCancelController {
|
||||
|
||||
private final ActCancelService actCancelService;
|
||||
|
||||
@Operation(summary = "分页查询", description = "分页查询")
|
||||
@GetMapping("/page")
|
||||
@PreAuthorize("@pms.hasPermission('wallet_actCancel_view')")
|
||||
public R getActCancelPage(@ParameterObject Page page, @ParameterObject ActCancelDto dto) {
|
||||
return R.ok(actCancelService.scopePageJoin(page, dto, DataScope.of()));
|
||||
}
|
||||
|
||||
@Operation(summary = "通过id查询", description = "通过id查询")
|
||||
@GetMapping("/{id}")
|
||||
@PreAuthorize("@pms.hasPermission('wallet_actCancel_view')")
|
||||
public R getById(@PathVariable("id") Long id) {
|
||||
return R.ok(actCancelService.getById(id));
|
||||
}
|
||||
|
||||
@Operation(summary = "新增核销活动", description = "新增核销活动")
|
||||
@SysLog("新增核销活动")
|
||||
@PostMapping
|
||||
@PreAuthorize("@pms.hasPermission('wallet_actCancel_add')")
|
||||
public R<Long> save(@RequestBody ActCancelDto dto) {
|
||||
return R.ok(actCancelService.create(dto));
|
||||
}
|
||||
|
||||
@Operation(summary = "修改核销活动", description = "修改核销活动")
|
||||
@SysLog("修改核销活动")
|
||||
@PutMapping
|
||||
@PreAuthorize("@pms.hasPermission('wallet_actCancel_edit')")
|
||||
public R updateById(@RequestBody ActCancelEntity actCancel) {
|
||||
return R.ok(actCancelService.updateById(actCancel));
|
||||
}
|
||||
|
||||
@Operation(summary = "通过id删除核销活动", description = "通过id删除核销活动")
|
||||
@SysLog("通过id删除核销活动")
|
||||
@DeleteMapping
|
||||
@PreAuthorize("@pms.hasPermission('wallet_actCancel_del')")
|
||||
public R removeById(@RequestBody Long[] ids) {
|
||||
actCancelService.delByIds(CollUtil.toList(ids));
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package com.bsd.pjcloud.wallet.mapper.act;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.bsd.pjcloud.common.data.datascope.DataScope;
|
||||
import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
|
||||
import com.bsd.pjcloud.wallet.api.dto.act.ActCancelDto;
|
||||
import com.bsd.pjcloud.wallet.api.entity.act.ActCancelEntity;
|
||||
import com.bsd.pjcloud.wallet.api.vo.act.ActCancelVo;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface ActCancelMapper extends PjcloudBaseMapper<ActCancelEntity> {
|
||||
|
||||
List<ActCancelVo> scopePageJoin(Page page, @Param("dto") ActCancelDto dto, DataScope dataScope);
|
||||
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package com.bsd.pjcloud.wallet.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.bsd.pjcloud.common.data.datascope.DataScope;
|
||||
import com.bsd.pjcloud.wallet.api.dto.act.ActCancelDto;
|
||||
import com.bsd.pjcloud.wallet.api.entity.act.ActCancelEntity;
|
||||
import com.bsd.pjcloud.wallet.api.vo.act.ActCancelVo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public interface ActCancelService extends IService<ActCancelEntity> {
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*/
|
||||
List<ActCancelVo> scopePageJoin(Page page, ActCancelDto dto, DataScope dataScope);
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*/
|
||||
Long create(ActCancelDto dto);
|
||||
|
||||
/**
|
||||
* 根据ids删除
|
||||
*/
|
||||
void delByIds(ArrayList<Long> list);
|
||||
}
|
||||
+73
@@ -0,0 +1,73 @@
|
||||
package com.bsd.pjcloud.wallet.service.impl.act;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.bsd.pjcloud.common.core.util.BeanUtils;
|
||||
import com.bsd.pjcloud.common.data.datascope.DataScope;
|
||||
import com.bsd.pjcloud.wallet.api.constant.act.ActStatusEnum;
|
||||
import com.bsd.pjcloud.wallet.api.dto.act.ActCancelDto;
|
||||
import com.bsd.pjcloud.wallet.api.entity.act.ActCancelEntity;
|
||||
import com.bsd.pjcloud.wallet.api.entity.act.ActCancelItemEntity;
|
||||
import com.bsd.pjcloud.wallet.api.vo.act.ActCancelVo;
|
||||
import com.bsd.pjcloud.wallet.mapper.act.ActCancelItemMapper;
|
||||
import com.bsd.pjcloud.wallet.mapper.act.ActCancelMapper;
|
||||
import com.bsd.pjcloud.wallet.service.ActCancelService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 核销活动
|
||||
*/
|
||||
@Service
|
||||
@Slf4j
|
||||
@RequiredArgsConstructor
|
||||
public class ActCancelServiceImpl extends ServiceImpl<ActCancelMapper, ActCancelEntity> implements ActCancelService {
|
||||
|
||||
private final ActCancelItemMapper actCancelItemMapper;
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
*/
|
||||
@Override
|
||||
public List<ActCancelVo> scopePageJoin(Page page, ActCancelDto dto, DataScope dataScope) {
|
||||
return baseMapper.scopePageJoin(page, dto, dataScope);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*/
|
||||
@Override
|
||||
public Long create(ActCancelDto dto) {
|
||||
ActCancelEntity savObj = BeanUtils.toBean(dto, ActCancelEntity.class);
|
||||
if (ObjectUtil.isEmpty(savObj.getActStatus())) {
|
||||
savObj.setActStatus(ActStatusEnum.ACT_OPEN.getCode());
|
||||
}
|
||||
baseMapper.insert(savObj);
|
||||
return savObj.getId();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据ids删除
|
||||
*/
|
||||
@Override
|
||||
public void delByIds(ArrayList<Long> actIds) {
|
||||
if (ObjectUtil.isEmpty(actIds)) return;
|
||||
List<ActCancelEntity> list = baseMapper.selectList(new LambdaQueryWrapper<ActCancelEntity>().in(ActCancelEntity::getId, actIds));
|
||||
if (ObjectUtil.isEmpty(list)) return;
|
||||
for (ActCancelEntity v : list) {
|
||||
if (ObjectUtil.equals(v.getActStatus(), ActStatusEnum.ACT_OPEN.getCode())) {
|
||||
throw new RuntimeException("<" + v.getActTitle() + ">,该活动未关闭,无法删除!");
|
||||
}
|
||||
Long cout = actCancelItemMapper.selectCount(new LambdaQueryWrapper<ActCancelItemEntity>().eq(ActCancelItemEntity::getActId, v.getId()));
|
||||
if (ObjectUtil.isNotEmpty(cout) && cout > 0) {
|
||||
throw new RuntimeException("<" + v.getActTitle() + ">,该活动已有人参加活动,无法删除!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
<?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.bsd.pjcloud.wallet.mapper.act.ActCancelMapper">
|
||||
<sql id="selectA">
|
||||
select a.id,
|
||||
a.mch_id,
|
||||
a.notice_id,
|
||||
a.active_org_price,
|
||||
a.active_cancel_price,
|
||||
a.expire_time,
|
||||
a.act_status,
|
||||
a.act_title,
|
||||
a.act_content,
|
||||
a.create_by,
|
||||
a.create_time,
|
||||
a.update_by,
|
||||
a.update_time,
|
||||
a.del_flag,
|
||||
a.tenant_id
|
||||
</sql>
|
||||
|
||||
<sql id="whereA">
|
||||
a.del_flag = '0'
|
||||
<if test="dto.mchId != null">
|
||||
and a.mch_id = #{dto.mchId}
|
||||
</if>
|
||||
<if test="dto.noticeId != null">
|
||||
and a.notice_id = #{dto.noticeId}
|
||||
</if>
|
||||
<if test="dto.actStatus != null and dto.actStatus != '' ">
|
||||
and a.act_status = #{dto.noticeId}
|
||||
</if>
|
||||
<if test="dto.actTitle != null">
|
||||
and a.actTitle LIKE concat('%',#{dto.actTitle},'%')
|
||||
</if>
|
||||
</sql>
|
||||
|
||||
<select id="scopePageJoin" resultType="com.bsd.pjcloud.wallet.api.vo.act.ActCancelVo">
|
||||
<include refid="selectA"/>,
|
||||
m.id as merchantId,
|
||||
m.name merchantName,
|
||||
m.logo_pic as logoPic,
|
||||
m.types as merchantType
|
||||
from act_cancel a
|
||||
left join mch_manage m on m.id = a.mch_id
|
||||
<where>
|
||||
<include refid="whereA"/>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Reference in new issue
Block a user