记得上下班打卡 | 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
ad802524
Commit
ad802524
authored
Apr 16, 2026
by
wangyifan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
草莓护照- 添加分享文案字段
parent
f5cb95d4
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
46 additions
and
1 deletion
+46
-1
zhengzai-caomeihuizhang.sql
docu/zhengzai-caomeihuizhang.sql
+4
-1
AdamCaomeiBadgeParam.java
...iquidnet/service/adam/dto/param/AdamCaomeiBadgeParam.java
+3
-0
AdamCaomeiBadgeVo.java
.../com/liquidnet/service/adam/dto/vo/AdamCaomeiBadgeVo.java
+3
-0
AdamCaomeiPassportBadgeShelfItemVo.java
...rvice/adam/dto/vo/AdamCaomeiPassportBadgeShelfItemVo.java
+3
-0
AdamCaomeiPassportUserClaimedBadgeVo.java
...ice/adam/dto/vo/AdamCaomeiPassportUserClaimedBadgeVo.java
+3
-0
AdamCaomeiBadgeController.java
...b/controller/zhengzai/adam/AdamCaomeiBadgeController.java
+2
-0
badge_add.html
...urces/templates/zhengzai/adam/caomei/badge/badge_add.html
+6
-0
badge_detail.html
...es/templates/zhengzai/adam/caomei/badge/badge_detail.html
+6
-0
badge_edit.html
...rces/templates/zhengzai/adam/caomei/badge/badge_edit.html
+6
-0
AdamCaomeiPassportUserBadgeDto.java
...dnet/service/adam/dto/AdamCaomeiPassportUserBadgeDto.java
+1
-0
AdamCaomeiBadge.java
...va/com/liquidnet/service/adam/entity/AdamCaomeiBadge.java
+5
-0
AdamCaomeiPassportMapper.xml
...iquidnet/service/adam/mapper/AdamCaomeiPassportMapper.xml
+1
-0
AdamCaomeiPassportUserServiceImpl.java
.../adam/service/impl/AdamCaomeiPassportUserServiceImpl.java
+3
-0
No files found.
docu/zhengzai-caomeihuizhang.sql
View file @
ad802524
...
...
@@ -72,4 +72,7 @@ CREATE TABLE `adam_caomei_badge_apply_record` (
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8mb4
COLLATE
=
utf8mb4_unicode_ci
COMMENT
=
'草莓护照-徽章补签申请记录表'
;
-- 2026-04-13 新增排序字段
ALTER
TABLE
`adam_caomei_badge`
ADD
COLUMN
`sort`
int
(
11
)
NOT
NULL
DEFAULT
0
COMMENT
'排序值,数值越大越靠前'
AFTER
`display_status`
;
\ No newline at end of file
ALTER
TABLE
`adam_caomei_badge`
ADD
COLUMN
`sort`
int
(
11
)
NOT
NULL
DEFAULT
0
COMMENT
'排序值,数值越大越靠前'
AFTER
`display_status`
;
-- 2026-04-16 新增分享文案字段
ALTER
TABLE
`adam_caomei_badge`
ADD
COLUMN
`share_text`
varchar
(
255
)
NOT
NULL
DEFAULT
''
COMMENT
'徽章分享文案'
AFTER
`sort`
;
\ No newline at end of file
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/param/AdamCaomeiBadgeParam.java
View file @
ad802524
...
...
@@ -34,4 +34,7 @@ public class AdamCaomeiBadgeParam {
@ApiModelProperty
(
value
=
"排序值,数值越大越靠前"
)
private
Integer
sort
;
@ApiModelProperty
(
value
=
"徽章分享文案"
)
private
String
shareText
;
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCaomeiBadgeVo.java
View file @
ad802524
...
...
@@ -37,6 +37,9 @@ public class AdamCaomeiBadgeVo {
@ApiModelProperty
(
value
=
"排序值,数值越大越靠前"
)
private
Integer
sort
;
@ApiModelProperty
(
value
=
"徽章分享文案"
)
private
String
shareText
;
@ApiModelProperty
(
value
=
"添加时间"
)
private
Date
createdAt
;
...
...
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCaomeiPassportBadgeShelfItemVo.java
View file @
ad802524
...
...
@@ -21,6 +21,9 @@ public class AdamCaomeiPassportBadgeShelfItemVo {
@ApiModelProperty
(
"图标"
)
private
String
icon
;
@ApiModelProperty
(
"分享文案"
)
private
String
shareText
;
@ApiModelProperty
(
"类型 1护照 2演出 3特殊"
)
private
Integer
type
;
...
...
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCaomeiPassportUserClaimedBadgeVo.java
View file @
ad802524
...
...
@@ -21,6 +21,9 @@ public class AdamCaomeiPassportUserClaimedBadgeVo {
@ApiModelProperty
(
"图标"
)
private
String
icon
;
@ApiModelProperty
(
"分享文案"
)
private
String
shareText
;
@ApiModelProperty
(
"类型 1护照类型徽章 2演出类型徽章 3特殊徽章"
)
private
Integer
type
;
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamCaomeiBadgeController.java
View file @
ad802524
...
...
@@ -61,6 +61,7 @@ public class AdamCaomeiBadgeController extends BaseController {
public
AjaxResult
addSave
(
AdamCaomeiBadgeParam
param
)
{
AdamCaomeiBadge
badge
=
new
AdamCaomeiBadge
();
BeanUtils
.
copyProperties
(
param
,
badge
);
badge
.
setShareText
(
StringUtils
.
defaultString
(
badge
.
getShareText
()));
badge
.
setBadgeId
(
IDGenerator
.
nextSnowId
());
badge
.
setDisplayStatus
(
0
);
// 默认下架
if
(
badge
.
getSort
()
==
null
)
{
...
...
@@ -130,6 +131,7 @@ public class AdamCaomeiBadgeController extends BaseController {
}
AdamCaomeiBadge
badge
=
new
AdamCaomeiBadge
();
BeanUtils
.
copyProperties
(
param
,
badge
);
badge
.
setShareText
(
StringUtils
.
defaultString
(
badge
.
getShareText
()));
badge
.
setMid
(
oldBadge
.
getMid
());
badge
.
setUpdatedAt
(
new
java
.
util
.
Date
());
if
(
badge
.
getType
()
!=
null
&&
badge
.
getType
()
!=
2
)
{
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/badge/badge_add.html
View file @
ad802524
...
...
@@ -35,6 +35,12 @@
<input
name=
"sort"
class=
"form-control"
type=
"number"
min=
"0"
value=
"0"
placeholder=
"数值越大越靠前"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
分享文案:
</label>
<div
class=
"col-sm-8"
>
<textarea
name=
"shareText"
class=
"form-control"
rows=
"3"
maxlength=
"255"
placeholder=
"请输入徽章分享文案"
></textarea>
</div>
</div>
<div
class=
"form-group"
id=
"ticketTimesDiv"
style=
"display: none;"
>
<label
class=
"col-sm-3 control-label is-required"
>
关联演出:
</label>
<div
class=
"col-sm-8"
>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/badge/badge_detail.html
View file @
ad802524
...
...
@@ -48,6 +48,12 @@
<div
class=
"form-control-static"
th:text=
"*{sort}"
></div>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
分享文案:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"form-control-static"
th:text=
"*{shareText}"
></div>
</div>
</div>
</form>
</div>
<th:block
th:include=
"include :: footer"
/>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/caomei/badge/badge_edit.html
View file @
ad802524
...
...
@@ -36,6 +36,12 @@
<input
name=
"sort"
th:field=
"*{sort}"
class=
"form-control"
type=
"number"
min=
"0"
placeholder=
"数值越大越靠前"
>
</div>
</div>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
分享文案:
</label>
<div
class=
"col-sm-8"
>
<textarea
name=
"shareText"
th:field=
"*{shareText}"
class=
"form-control"
rows=
"3"
maxlength=
"255"
placeholder=
"请输入徽章分享文案"
></textarea>
</div>
</div>
<div
class=
"form-group"
id=
"ticketTimesDiv"
th:style=
"${badge.type == 2 ? 'display:block;' : 'display:none;'}"
>
<label
class=
"col-sm-3 control-label is-required"
>
关联演出:
</label>
<div
class=
"col-sm-8"
>
...
...
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/dto/AdamCaomeiPassportUserBadgeDto.java
View file @
ad802524
...
...
@@ -9,6 +9,7 @@ public class AdamCaomeiPassportUserBadgeDto {
private
String
badgeId
;
private
String
badgeName
;
private
String
icon
;
private
String
shareText
;
private
Integer
type
;
private
Date
claimedAt
;
private
Integer
source
;
...
...
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamCaomeiBadge.java
View file @
ad802524
...
...
@@ -58,6 +58,11 @@ public class AdamCaomeiBadge implements Serializable {
*/
private
Integer
sort
;
/**
* 徽章分享文案
*/
private
String
shareText
;
/**
* 添加时间
*/
...
...
liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamCaomeiPassportMapper.xml
View file @
ad802524
...
...
@@ -64,6 +64,7 @@
ub.badge_id AS badgeId,
IFNULL(b.name, '') AS badgeName,
IFNULL(b.icon, '') AS icon,
IFNULL(b.share_text, '') AS shareText,
IFNULL(b.type, 0) AS type,
ub.created_at AS claimedAt,
ub.source AS source
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCaomeiPassportUserServiceImpl.java
View file @
ad802524
...
...
@@ -107,6 +107,7 @@ public class AdamCaomeiPassportUserServiceImpl implements IAdamCaomeiPassportUse
v
.
setBadgeId
(
b
.
getBadgeId
());
v
.
setName
(
StringUtils
.
defaultString
(
b
.
getName
()));
v
.
setIcon
(
StringUtils
.
defaultString
(
b
.
getIcon
()));
v
.
setShareText
(
StringUtils
.
defaultString
(
b
.
getShareText
()));
v
.
setType
(
b
.
getType
());
v
.
setClaimedAt
(
grantAt
);
v
.
setSource
(
1
);
...
...
@@ -235,6 +236,7 @@ public class AdamCaomeiPassportUserServiceImpl implements IAdamCaomeiPassportUse
v
.
setBadgeId
(
r
.
getBadgeId
());
v
.
setName
(
StringUtils
.
defaultString
(
r
.
getBadgeName
()));
v
.
setIcon
(
StringUtils
.
defaultString
(
r
.
getIcon
()));
v
.
setShareText
(
StringUtils
.
defaultString
(
r
.
getShareText
()));
v
.
setType
(
r
.
getType
());
v
.
setClaimedAt
(
r
.
getClaimedAt
());
v
.
setSource
(
r
.
getSource
());
...
...
@@ -275,6 +277,7 @@ public class AdamCaomeiPassportUserServiceImpl implements IAdamCaomeiPassportUse
v
.
setBadgeId
(
b
.
getBadgeId
());
v
.
setName
(
StringUtils
.
defaultString
(
b
.
getName
()));
v
.
setIcon
(
StringUtils
.
defaultString
(
b
.
getIcon
()));
v
.
setShareText
(
StringUtils
.
defaultString
(
b
.
getShareText
()));
v
.
setType
(
b
.
getType
());
v
.
setPerformanceId
(
StringUtils
.
defaultString
(
b
.
getPerformanceId
()));
v
.
setApplyPending
(
false
);
...
...
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