记得上下班打卡 | 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
b0026567
Commit
b0026567
authored
Jan 25, 2024
by
zhangguobing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~api:券商品业务-商品详情页及商品订单详情页新增关联人信息及券类商品判定属性;
parent
ea4f634a
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
7 deletions
+11
-7
GoblinStoreMgtGoodsCouponAddSkuParam.java
...blin/dto/manage/GoblinStoreMgtGoodsCouponAddSkuParam.java
+1
-1
GoblinStoreMgtGoodsCouponEditSkuParam.java
...lin/dto/manage/GoblinStoreMgtGoodsCouponEditSkuParam.java
+1
-1
GoblinGoodsInfoDetailVo.java
...uidnet/service/goblin/dto/vo/GoblinGoodsInfoDetailVo.java
+2
-0
GoblinGoodsSkuInfoVo.java
...liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java
+1
-1
GoblinOrderSkuVo.java
...com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java
+2
-0
CandyCoupon.java
.../java/com/liquidnet/service/candy/entity/CandyCoupon.java
+1
-1
GoblinGoodsSkuCoupon.java
...liquidnet/service/goblin/entity/GoblinGoodsSkuCoupon.java
+1
-1
db_ln_candy_initialdata.sql
...idnet-service-candy-impl/docu/db_ln_candy_initialdata.sql
+1
-1
db_ln_goblin_initialdata.sql
...net-service-goblin-impl/docu/db_ln_goblin_initialdata.sql
+1
-1
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsCouponAddSkuParam.java
View file @
b0026567
...
...
@@ -76,7 +76,7 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
* ---------------------------- 券类商品-代金券属性 ----------------------------
*/
@ApiModelProperty
(
position
=
28
,
required
=
true
,
value
=
"是否实名[0-否|1-是]"
,
example
=
"1"
)
@ApiModelProperty
(
position
=
28
,
required
=
true
,
value
=
"是否实名[0-否|1-是
,表示该商品需要实名关联
]"
,
example
=
"1"
)
@Pattern
(
regexp
=
"\\b(0|1)\\b"
,
message
=
"参数'是否实名'无效"
)
private
Integer
isTrueName
;
@ApiModelProperty
(
position
=
29
,
required
=
true
,
value
=
"适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]"
)
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsCouponEditSkuParam.java
View file @
b0026567
...
...
@@ -41,7 +41,7 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
* ---------------------------- 券类商品-代金券属性 ----------------------------
*/
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"是否实名[0-否|1-是]"
,
example
=
"1"
)
@ApiModelProperty
(
position
=
15
,
required
=
true
,
value
=
"是否实名[0-否|1-是
,表示该商品需要实名关联
]"
,
example
=
"1"
)
@Pattern
(
regexp
=
"\\b(0|1)\\b"
,
message
=
"参数'是否实名'无效"
)
private
Integer
isTrueName
;
@ApiModelProperty
(
position
=
16
,
required
=
true
,
value
=
"适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演]"
)
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoDetailVo.java
View file @
b0026567
...
...
@@ -14,6 +14,8 @@ import java.util.List;
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
GoblinGoodsInfoDetailVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
-
4712015317981742851L
;
@ApiModelProperty
(
position
=
1
,
value
=
"商品类型[0-常规|1-数字藏品|2-券类商品]"
)
private
int
spuType
;
@ApiModelProperty
(
position
=
22
,
value
=
"规格展现方式[1-常规|2-组合]"
)
private
String
specMode
;
@ApiModelProperty
(
position
=
51
,
value
=
"规格信息"
)
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java
View file @
b0026567
...
...
@@ -140,7 +140,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
/**
* ---------------------------- 券类商品-代金券属性 ----------------------------
*/
@ApiModelProperty
(
position
=
33
,
value
=
"是否实名[0-否|1-是]"
)
@ApiModelProperty
(
position
=
33
,
value
=
"是否实名[0-否|1-是
,表示该商品需要实名关联
]"
)
private
Integer
isTrueName
;
@ApiModelProperty
(
position
=
33
,
value
=
"业务类别[0-全场|1-演出|2-商品|3-优先购]"
)
private
Integer
busiType
;
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java
View file @
b0026567
...
...
@@ -78,6 +78,8 @@ public class GoblinOrderSkuVo implements Serializable, Cloneable {
@ApiModelProperty
(
value
=
"erp-仓库号"
)
private
String
erpWarehouseNo
;
@ApiModelProperty
(
value
=
"是否实名[0-否|1-是,表示该商品需要实名关联],这里默认0"
)
private
int
isTrueName
;
@ApiModelProperty
(
value
=
"关联人证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证"
)
private
Integer
idType
;
@ApiModelProperty
(
value
=
"关联人姓名"
)
...
...
liquidnet-bus-do/liquidnet-service-candy-do/src/main/java/com/liquidnet/service/candy/entity/CandyCoupon.java
View file @
b0026567
...
...
@@ -105,7 +105,7 @@ public class CandyCoupon implements Serializable {
private
Integer
validity
;
/**
* 是否实名[0-否|1-是,表示该
券需要实名使用
]
* 是否实名[0-否|1-是,表示该
商品需要实名关联
]
*/
private
Integer
isTrueName
;
...
...
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinGoodsSkuCoupon.java
View file @
b0026567
...
...
@@ -31,7 +31,7 @@ public class GoblinGoodsSkuCoupon implements Serializable {
private
String
skuId
;
/**
* 是否实名[0-否|1-是,表示该
券需要实名使用
]
* 是否实名[0-否|1-是,表示该
商品需要实名关联
]
*/
private
Integer
isTrueName
;
...
...
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql
View file @
b0026567
...
...
@@ -182,7 +182,7 @@ create table candy_coupon_relate
)
engine
InnoDB
comment
'券适用关联配置'
;
create
index
idx_ccr_coupon_id
on
candy_coupon_relate
(
coupon_id
);
#
-- >>------------------------------------------------------------------------------------ |20240123 商品券业务
alter
table
candy_coupon
add
is_true_name
smallint
default
0
comment
'是否实名[0-否|1-是,表示该
券需要实名使用
]'
after
validity
;
alter
table
candy_coupon
add
is_true_name
smallint
default
0
comment
'是否实名[0-否|1-是,表示该
商品需要实名关联
]'
after
validity
;
alter
table
candy_coupon_rule
modify
use_scope
smallint
null
comment
'适用范围[101-音乐节|102-小型演出(livehouse演出)|103-巡演|100-全场|90-演出|91-场次|92-票|80-商品|81-款式]'
;
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql
View file @
b0026567
...
...
@@ -1256,7 +1256,7 @@ create table goblin_goods_sku_coupon
val_face
decimal
(
8
,
2
)
comment
'面值'
,
is_true_name
smallint
default
0
comment
'是否实名[0-否|1-是,表示该
券需要实名使用
]'
,
is_true_name
smallint
default
0
comment
'是否实名[0-否|1-是,表示该
商品需要实名关联
]'
,
validity
int
default
0
comment
'购买后(单位天)有效期,与生效/过期时间二选一'
,
effect_at
datetime
(
3
)
null
comment
'生效时间'
,
expire_at
datetime
(
3
)
null
comment
'过期时间'
,
...
...
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