From 7614ecc4f541d4b4b1ba72961970fc370475d7e5 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Fri, 8 Apr 2022 17:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E7=BA=A2=E5=8C=85=E6=B4=BB=E5=8A=A8=E7=9A=84=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/v2.1.sql | 10 ++++++---- .../main/java/com/xhpc/activity/task/AutoCashTask.java | 1 + .../main/resources/mapper/XhpcActivityCashMapper.xml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sql/v2.1.sql b/sql/v2.1.sql index 5df0f16c..15caf122 100644 --- a/sql/v2.1.sql +++ b/sql/v2.1.sql @@ -807,8 +807,10 @@ CREATE TABLE `xhpc_activity_cash` `activity_name` varchar(200) DEFAULT NULL COMMENT '活动名称', `start_time` datetime DEFAULT NULL COMMENT '开始时间', `end_time` datetime DEFAULT NULL COMMENT '结束时间', - `receive_count` int(9) DEFAULT NULL COMMENT '领取次数', - `amount` decimal(4, 2) DEFAULT NULL COMMENT '红包金额', + `receive_count` int(9) DEFAULT '0' COMMENT '领取次数', + `auto_receive` smallint(2) DEFAULT '0' COMMENT '是否自动领取（0-否，1-是）', + `auto_status` smallint(2) DEFAULT '0' COMMENT '是否自动发送完成（0-未完成，1-已完成）', + `amount` decimal(4, 2) DEFAULT '0' COMMENT '红包金额', `app_user_list` text COMMENT 'C端用户ID（-1表示全部）', `com_user_list` text COMMENT '社区用户ID列表（-1表示全部）', `cus_user_list` text COMMENT 'B端用户ID列表（-1表示全部）', @@ -835,8 +837,8 @@ CREATE TABLE `xhpc_activity_template` `discount_rate` decimal(4, 2) DEFAULT NULL COMMENT '优惠比率', `start_time` datetime DEFAULT NULL COMMENT '开始时间', `end_time` datetime DEFAULT NULL COMMENT '结束时间', - `discount_count` smallint(4) DEFAULT NULL COMMENT '折扣次数', - `mini_display` smallint(2) DEFAULT NULL COMMENT '小程序弹出次数', + `discount_count` smallint(4) DEFAULT '0' COMMENT '折扣次数', + `mini_display` smallint(2) DEFAULT '0' COMMENT '小程序弹出次数', `background_url` varchar(255) DEFAULT NULL COMMENT '活动背景图', `status` smallint(2) DEFAULT '0' COMMENT '状态（0-编辑未发布,1-已发布，2-已失效）', `del_flag` smallint(2) DEFAULT '0' COMMENT '删除标识（0-正常，2-删除）', diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoCashTask.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoCashTask.java index 515f9863..08143558 100644 --- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoCashTask.java +++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/AutoCashTask.java @@ -123,6 +123,7 @@ public class AutoCashTask { } cashDomain.setReceiveCount(recordDomainList.size()); + cashDomain.setAutoStatus(1); cashMapper.updateReceiveCountByActivityId(cashDomain); } diff --git a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityCashMapper.xml b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityCashMapper.xml index d0813f61..77606808 100644 --- a/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityCashMapper.xml +++ b/xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcActivityCashMapper.xml @@ -127,7 +127,7 @@ update xhpc_activity_cash - set receive_count = #{receiveCount} + set receive_count = #{receiveCount}, auto_status=#{autoStatus} where activity_id = #{activityId,jdbcType=INTEGER}