记得上下班打卡 | 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
2680fd66
Commit
2680fd66
authored
Jan 28, 2024
by
zhangguobing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~api:券商品业务-完善skuType;
parent
f870e7a9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
GoblinGoodsSkuInfoVo.java
...liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java
+1
-1
GoblinOrderServiceImpl.java
...et/service/order/service/impl/GoblinOrderServiceImpl.java
+2
-1
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java
View file @
2680fd66
...
...
@@ -35,7 +35,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
12
,
value
=
"ERP仓库编号"
)
private
String
erpWarehouseNo
;
@ApiModelProperty
(
position
=
12
,
value
=
"商品类型[0-常规|1-数字藏品|2-券类商品]"
)
private
Integer
skuType
;
private
int
skuType
;
@ApiModelProperty
(
position
=
13
,
value
=
"单品的名称[100]"
)
private
String
name
;
@ApiModelProperty
(
position
=
14
,
value
=
"单品的副标题[128]"
)
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java
View file @
2680fd66
...
...
@@ -258,7 +258,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
if
(!(
skuVo
.
getStatus
().
equals
(
"3"
)
&&
skuVo
.
getShelvesStatus
().
equals
(
"3"
))
||
skuVo
.
getDelFlg
().
equals
(
"1"
))
{
throw
new
Exception
(
"不可购买"
);
}
if
(
2
==
skuVo
.
getSkuType
(
))
{
// 券类商品
if
(
Objects
.
equals
(
skuVo
.
getSkuType
(),
2
))
{
// 券类商品
if
(
Objects
.
equals
(
skuVo
.
getIsTrueName
(),
1
))
{
// 需要实名关联
if
(
Objects
.
isNull
(
skuParam
.
getIdType
())
||
Objects
.
isNull
(
skuParam
.
getIdName
())
||
Objects
.
isNull
(
skuParam
.
getIdNo
()))
{
throw
new
LiquidnetServiceException
(
"-1"
,
"关联人信息缺失,请核实"
);
...
...
@@ -690,6 +690,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
}
else
{
GoblinGoodsSkuInfoVo
goodsSkuInfoVo
=
redisUtils
.
getGoodsSkuInfoVo
(
orderSku
.
getSkuId
());
orderSkuVo
.
setSkuType
(
goodsSkuInfoVo
.
getSkuType
());
orderSkuVo
.
setIsTrueName
(
goodsSkuInfoVo
.
getIsTrueName
());
}
redisUtils
.
setGoblinOrderSku
(
orderSkuVo
.
getOrderSkuId
(),
orderSkuVo
);
goblinOrderSkuIdList
.
add
(
orderSkuVo
.
getOrderSkuId
());
...
...
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