记得上下班打卡 | 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
b7c01c85
Commit
b7c01c85
authored
Dec 06, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~api:商品列表+ERP托管状态;
parent
a088638e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
GoblinStoreMgtGoodsListVo.java
...rvice/goblin/dto/manage/vo/GoblinStoreMgtGoodsListVo.java
+2
-0
GoblinStoreMgtGoodsServiceImpl.java
...n/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
+4
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinStoreMgtGoodsListVo.java
View file @
b7c01c85
...
@@ -50,4 +50,6 @@ public class GoblinStoreMgtGoodsListVo implements Serializable, Cloneable {
...
@@ -50,4 +50,6 @@ public class GoblinStoreMgtGoodsListVo implements Serializable, Cloneable {
private
Integer
warningStock
;
private
Integer
warningStock
;
@ApiModelProperty
(
position
=
25
,
value
=
"关联活动标记[0-未关联|1-已关联],用于下架提示'商品正在参与活动,是否确认下架?'"
)
@ApiModelProperty
(
position
=
25
,
value
=
"关联活动标记[0-未关联|1-已关联],用于下架提示'商品正在参与活动,是否确认下架?'"
)
private
Integer
relateMarket
;
private
Integer
relateMarket
;
@ApiModelProperty
(
position
=
26
,
value
=
"ERP托管状态[0-未托管|1-已托管]"
)
private
Integer
erpHostingStatus
;
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
View file @
b7c01c85
...
@@ -77,6 +77,10 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
...
@@ -77,6 +77,10 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
if
(!
CollectionUtils
.
isEmpty
(
skuReList
))
if
(!
CollectionUtils
.
isEmpty
(
skuReList
))
for
(
String
skuRe
:
skuReList
)
for
(
String
skuRe
:
skuReList
)
surplusStock
+=
goblinRedisUtils
.
getSkuStock
(
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
skuRe
),
skuRe
);
surplusStock
+=
goblinRedisUtils
.
getSkuStock
(
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
skuRe
),
skuRe
);
if
(
mgtGoodsSkuInfoVo
.
getErpHosting
()
==
1
)
{
vo
.
setErpHostingStatus
(
1
);
}
}
}
}
}
vo
.
setTotalStock
(
totalStock
);
vo
.
setTotalStock
(
totalStock
);
...
...
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