diff --git a/db/810pjcloudx_wallet_act.sql b/db/810pjcloudx_wallet_act.sql index 66da835a7..f5a234a9b 100644 --- a/db/810pjcloudx_wallet_act.sql +++ b/db/810pjcloudx_wallet_act.sql @@ -1,26 +1,23 @@ --- ---------------------------- --- Table structure for act_cancel --- ---------------------------- -DROP TABLE IF EXISTS act_cancel; -CREATE TABLE 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 ='核销活动'; + id BIGINT(19) auto_increment comment '活动项id' + primary key, + mch_id BIGINT(19) not null comment '活动商户id', + notice_id BIGINT(19) not null comment '公告id', + active_org_price INT(10) null comment '活动原价', + active_cancel_price INT(10) not null comment '活动核销价', + start_time DATETIME 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) null comment '活动内容', + create_by VARCHAR(64) null comment '创建人', + create_time DATETIME null comment '创建时间', + update_by VARCHAR(64) null comment '修改人', + update_time DATETIME null comment '修改时间', + del_flag CHAR default '0' null comment '删除标记', + tenant_id BIGINT(19) null comment '租户ID' +); -- ---------------------------- -- Table structure for act_cancel_item diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java index 71ea4f00c..67963731e 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java @@ -61,6 +61,7 @@ public class ActCancelItemServiceImpl extends ServiceImpl pageList(Page page, ActCancelItemDto dto) { Page pageList = baseMapper.selectPage(page, new LambdaQueryWrapper() + .eq(ObjectUtil.isNotEmpty(dto.getActId()), ActCancelItemEntity::getActId, dto.getActId()) .eq(ObjectUtil.isNotEmpty(dto.getMchId()), ActCancelItemEntity::getMchId, dto.getMchId()) .eq(ObjectUtil.isNotEmpty(dto.getReceiverUserId()), ActCancelItemEntity::getReceiverUserId, dto.getReceiverUserId()) .like(ObjectUtil.isNotEmpty(dto.getReceiverUserName()), ActCancelItemEntity::getReceiverUserName, dto.getReceiverUserName())