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

Commit 2bf210c1 authored by wangyifan's avatar wangyifan

doudou二期需求-增加活动说明参数

parent ce0f09fa
...@@ -11,12 +11,21 @@ import java.io.Serializable; ...@@ -11,12 +11,21 @@ import java.io.Serializable;
@ApiModel("SweetDouDouActiveVo") @ApiModel("SweetDouDouActiveVo")
public class SweetDouDouActiveVo implements Serializable, Cloneable { public class SweetDouDouActiveVo implements Serializable, Cloneable {
@ApiModelProperty("doudou_id")
private String doudouId;
@ApiModelProperty("user_id")
private String userId;
@ApiModelProperty("活动ID") @ApiModelProperty("活动ID")
private String activeId; private String activeId;
@ApiModelProperty("标题") @ApiModelProperty("标题")
private String title; private String title;
@ApiModelProperty("活动详情")
private String details;
@ApiModelProperty("卡片背景图") @ApiModelProperty("卡片背景图")
private String cardImages; private String cardImages;
......
...@@ -26,6 +26,11 @@ public class SweetDoudouActive { ...@@ -26,6 +26,11 @@ public class SweetDoudouActive {
*/ */
private String title; private String title;
/**
* 活动详情
*/
private String details;
/** /**
* 卡片背景图 * 卡片背景图
*/ */
......
...@@ -3,6 +3,7 @@ CREATE TABLE `sweet_doudou_active` ( ...@@ -3,6 +3,7 @@ CREATE TABLE `sweet_doudou_active` (
`mid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `mid` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
`active_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'active_id', `active_id` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'active_id',
`title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '标题', `title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '标题',
`details` varchar(1000) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动详情/兑换说明',
`card_images` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '卡片背景图', `card_images` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '卡片背景图',
`detail_images` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动详情背景图', `detail_images` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动详情背景图',
`target_url` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动详情URL', `target_url` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '活动详情URL',
......
...@@ -223,6 +223,8 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet ...@@ -223,6 +223,8 @@ public class SweetDoudouServiceImpl extends ServiceImpl<SweetDoudouMapper, Sweet
douDouActiveVo.setStatus(0); douDouActiveVo.setStatus(0);
}else { }else {
douDouActiveVo.setStatus(sweetDouDou.getStatus()); douDouActiveVo.setStatus(sweetDouDou.getStatus());
douDouActiveVo.setUserId(sweetDouDou.getUserId());
douDouActiveVo.setDoudouId(sweetDouDou.getDoudouId());
} }
} }
return douDouActiveVo; return douDouActiveVo;
......
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