Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
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
haoban3.0
haoban-manage3.0
Commits
d8cf8971
Commit
d8cf8971
authored
Jul 25, 2023
by
songyinghui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 内容支持自建商品
parent
4691457a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
GoodsInfoAdaptor.java
.../haoban/manage/web/controller/goods/GoodsInfoAdaptor.java
+0
-2
ContentMaterialInfoVO.java
...c/haoban/manage/web/vo/content/ContentMaterialInfoVO.java
+15
-0
SimpleGoodsInfoVO.java
...m/gic/haoban/manage/web/vo/content/SimpleGoodsInfoVO.java
+6
-0
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/goods/GoodsInfoAdaptor.java
View file @
d8cf8971
...
...
@@ -47,8 +47,6 @@ public class GoodsInfoAdaptor {
GoodsListQDTO
searchQdto
=
new
GoodsListQDTO
();
searchQdto
.
setEnterpriseId
(
enterpriseId
);
searchQdto
.
setGoodsNameText
(
search
);
// 只查询ERP的
searchQdto
.
setSourceType
(
1
);
searchQdto
.
setPageNum
(
1
);
searchQdto
.
setPageSize
(
1000
);
ServiceResponse
<
Page
<
GoodsSpuInfoDTO
>>
serviceResponse
=
goodsInfoOutApiService
.
queryGoodsInfoList
(
searchQdto
);
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java
View file @
d8cf8971
...
...
@@ -99,6 +99,13 @@ public class ContentMaterialInfoVO implements Serializable {
private
Integer
duration
;
/**
* 商品来源
* @see com.gic.store.goods.enums.GoodsSourceTypeEnum
*/
private
Integer
sourceType
;
public
Long
getContentMaterialId
()
{
return
contentMaterialId
;
}
...
...
@@ -226,4 +233,12 @@ public class ContentMaterialInfoVO implements Serializable {
public
void
setDuration
(
Integer
duration
)
{
this
.
duration
=
duration
;
}
public
Integer
getSourceType
()
{
return
sourceType
;
}
public
void
setSourceType
(
Integer
sourceType
)
{
this
.
sourceType
=
sourceType
;
}
}
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/SimpleGoodsInfoVO.java
View file @
d8cf8971
...
...
@@ -66,5 +66,11 @@ public class SimpleGoodsInfoVO implements Serializable {
*/
private
BigDecimal
commission
;
/**
* 商品来源
* @see com.gic.store.goods.enums.GoodsSourceTypeEnum
*/
private
Integer
sourceType
;
}
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