记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
f35a76da
Commit
f35a76da
authored
Oct 29, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加图片字段
parent
4a8f7366
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
13 deletions
+25
-13
SweetIntegralActivityPrizeFormParam.java
.../dto/param/admin/SweetIntegralActivityPrizeFormParam.java
+9
-4
SweetIntegralActivityPrizeVo.java
...vice/sweet/dto/vo/admin/SweetIntegralActivityPrizeVo.java
+7
-5
SweetIntegralActivityPrize.java
...dnet/service/sweet/entity/SweetIntegralActivityPrize.java
+7
-2
db_sweet_integral_activity_20211020.sql
...ervice-sweet/docu/db_sweet_integral_activity_20211020.sql
+2
-1
SweetIntegralActivityDrawController.java
...sweet/controller/SweetIntegralActivityDrawController.java
+0
-1
No files found.
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetIntegralActivityPrizeFormParam.java
View file @
f35a76da
...
@@ -35,9 +35,13 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
...
@@ -35,9 +35,13 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
@NotBlank
(
message
=
"prizeTitle不能为空"
)
@NotBlank
(
message
=
"prizeTitle不能为空"
)
private
String
prizeTitle
;
private
String
prizeTitle
;
@ApiModelProperty
(
required
=
true
,
value
=
"奖品图片"
,
example
=
"test.png"
)
@ApiModelProperty
(
required
=
true
,
value
=
"初始展示奖品图片"
,
example
=
"test.png"
)
@NotBlank
(
message
=
"prizeImg不能为空"
)
@NotBlank
(
message
=
"prizeImgInit不能为空"
)
private
String
prizeImg
;
private
String
prizeImgInit
;
@ApiModelProperty
(
required
=
true
,
value
=
"中奖选中奖品图片"
,
example
=
"test.png"
)
@NotBlank
(
message
=
"prizeImgSelect不能为空"
)
private
String
prizeImgSelect
;
@ApiModelProperty
(
required
=
true
,
value
=
"奖品类型 1谢谢惠顾 2积分 3优惠券 4实物"
,
example
=
"1"
)
@ApiModelProperty
(
required
=
true
,
value
=
"奖品类型 1谢谢惠顾 2积分 3优惠券 4实物"
,
example
=
"1"
)
@NotNull
(
message
=
"prizeType不能为空"
)
@NotNull
(
message
=
"prizeType不能为空"
)
...
@@ -77,7 +81,8 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
...
@@ -77,7 +81,8 @@ public class SweetIntegralActivityPrizeFormParam implements Serializable,Cloneab
sweetIntegralActivityPrize
.
setIntegralActivityId
(
source
.
getIntegralActivityId
());
sweetIntegralActivityPrize
.
setIntegralActivityId
(
source
.
getIntegralActivityId
());
sweetIntegralActivityPrize
.
setPrizeId
(
source
.
getPrizeId
());
sweetIntegralActivityPrize
.
setPrizeId
(
source
.
getPrizeId
());
sweetIntegralActivityPrize
.
setPrizeTitle
(
source
.
getPrizeTitle
());
sweetIntegralActivityPrize
.
setPrizeTitle
(
source
.
getPrizeTitle
());
sweetIntegralActivityPrize
.
setPrizeImg
(
source
.
getPrizeImg
());
sweetIntegralActivityPrize
.
setPrizeImgInit
(
source
.
getPrizeImgInit
());
sweetIntegralActivityPrize
.
setPrizeImgSelect
(
source
.
getPrizeImgSelect
());
sweetIntegralActivityPrize
.
setPrizeType
(
source
.
getPrizeType
());
sweetIntegralActivityPrize
.
setPrizeType
(
source
.
getPrizeType
());
sweetIntegralActivityPrize
.
setPrizeTypeNum
(
source
.
getPrizeTypeNum
());
sweetIntegralActivityPrize
.
setPrizeTypeNum
(
source
.
getPrizeTypeNum
());
sweetIntegralActivityPrize
.
setRelationId
(
source
.
getRelationId
());
sweetIntegralActivityPrize
.
setRelationId
(
source
.
getRelationId
());
...
...
liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/admin/SweetIntegralActivityPrizeVo.java
View file @
f35a76da
...
@@ -2,7 +2,6 @@ package com.liquidnet.service.sweet.dto.vo.admin;
...
@@ -2,7 +2,6 @@ package com.liquidnet.service.sweet.dto.vo.admin;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivity
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityPrize
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -11,7 +10,6 @@ import lombok.Data;
...
@@ -11,7 +10,6 @@ import lombok.Data;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.List
;
/**
/**
* <p>
* <p>
...
@@ -37,8 +35,11 @@ public class SweetIntegralActivityPrizeVo implements Serializable, Cloneable {
...
@@ -37,8 +35,11 @@ public class SweetIntegralActivityPrizeVo implements Serializable, Cloneable {
@ApiModelProperty
(
value
=
"奖品名称"
)
@ApiModelProperty
(
value
=
"奖品名称"
)
private
String
prizeTitle
;
private
String
prizeTitle
;
@ApiModelProperty
(
value
=
"奖品图片"
)
@ApiModelProperty
(
required
=
true
,
value
=
"初始展示奖品图片"
)
private
String
prizeImg
;
private
String
prizeImgInit
;
@ApiModelProperty
(
required
=
true
,
value
=
"中奖选中奖品图片"
)
private
String
prizeImgSelect
;
@ApiModelProperty
(
value
=
"奖品类型 1谢谢惠顾 2积分 3优惠券 4实物"
)
@ApiModelProperty
(
value
=
"奖品类型 1谢谢惠顾 2积分 3优惠券 4实物"
)
private
Integer
prizeType
;
private
Integer
prizeType
;
...
@@ -84,7 +85,8 @@ public class SweetIntegralActivityPrizeVo implements Serializable, Cloneable {
...
@@ -84,7 +85,8 @@ public class SweetIntegralActivityPrizeVo implements Serializable, Cloneable {
this
.
setPrizeId
(
source
.
getPrizeId
());
this
.
setPrizeId
(
source
.
getPrizeId
());
this
.
setIntegralActivityId
(
source
.
getIntegralActivityId
());
this
.
setIntegralActivityId
(
source
.
getIntegralActivityId
());
this
.
setPrizeTitle
(
source
.
getPrizeTitle
());
this
.
setPrizeTitle
(
source
.
getPrizeTitle
());
this
.
setPrizeImg
(
source
.
getPrizeImg
());
this
.
setPrizeImgInit
(
source
.
getPrizeImgInit
());
this
.
setPrizeImgSelect
(
source
.
getPrizeImgSelect
());
this
.
setPrizeType
(
source
.
getPrizeType
());
this
.
setPrizeType
(
source
.
getPrizeType
());
this
.
setPrizeTypeNum
(
source
.
getPrizeTypeNum
());
this
.
setPrizeTypeNum
(
source
.
getPrizeTypeNum
());
this
.
setRelationId
(
source
.
getRelationId
());
this
.
setRelationId
(
source
.
getRelationId
());
...
...
liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivityPrize.java
View file @
f35a76da
...
@@ -44,9 +44,14 @@ public class SweetIntegralActivityPrize implements Serializable, Cloneable {
...
@@ -44,9 +44,14 @@ public class SweetIntegralActivityPrize implements Serializable, Cloneable {
private
String
prizeTitle
;
private
String
prizeTitle
;
/**
/**
* 奖品图片
*
初始展示
奖品图片
*/
*/
private
String
prizeImg
;
private
String
prizeImgInit
;
/**
* 中奖选中奖品图片
*/
private
String
prizeImgSelect
;
/**
/**
* 奖品类型 1谢谢惠顾 2积分 3优惠券 4实物
* 奖品类型 1谢谢惠顾 2积分 3优惠券 4实物
...
...
liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweet_integral_activity_20211020.sql
View file @
f35a76da
...
@@ -36,7 +36,8 @@ CREATE TABLE `sweet_integral_activity_prize`
...
@@ -36,7 +36,8 @@ CREATE TABLE `sweet_integral_activity_prize`
`prize_id`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'奖品id'
,
`prize_id`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'奖品id'
,
`integral_activity_id`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'关联活动id'
,
`integral_activity_id`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'关联活动id'
,
`prize_title`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'奖品名称'
,
`prize_title`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'奖品名称'
,
`prize_img`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'奖品图片'
,
`prize_img_init`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'初始展示奖品图片'
,
`prize_img_select`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'中奖选中奖品图片'
,
`prize_type`
tinyint
NOT
NULL
DEFAULT
0
COMMENT
'奖品类型 1谢谢惠顾 2积分 3优惠券 4实物'
,
`prize_type`
tinyint
NOT
NULL
DEFAULT
0
COMMENT
'奖品类型 1谢谢惠顾 2积分 3优惠券 4实物'
,
`relation_id`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'关联id 如商品id 券id'
,
`relation_id`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'关联id 如商品id 券id'
,
`prize_type_num`
int
NOT
NULL
DEFAULT
0
COMMENT
'单次奖励数量如积分 中奖给多少'
,
`prize_type_num`
int
NOT
NULL
DEFAULT
0
COMMENT
'单次奖励数量如积分 中奖给多少'
,
...
...
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetIntegralActivityDrawController.java
View file @
f35a76da
...
@@ -5,7 +5,6 @@ import com.liquidnet.service.base.PagedResult;
...
@@ -5,7 +5,6 @@ import com.liquidnet.service.base.PagedResult;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo
;
import
com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo
;
import
com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo
;
import
com.liquidnet.service.sweet.dto.vo.admin.SweetIntegralActivityPrizeVo
;
import
com.liquidnet.service.sweet.entity.SweetIntegralActivityDraw
;
import
com.liquidnet.service.sweet.service.ISweetIntegralActivityDrawService
;
import
com.liquidnet.service.sweet.service.ISweetIntegralActivityDrawService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment