记得上下班打卡 | 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
8cb1eaa9
Commit
8cb1eaa9
authored
Dec 31, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~商品添加;
parent
f9c4c2ad
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
193 additions
and
145 deletions
+193
-145
GoblinStoreMgtGoodsAddParam.java
...ervice/goblin/dto/manage/GoblinStoreMgtGoodsAddParam.java
+6
-3
GoblinGoodsExtagVo.java
...m/liquidnet/service/goblin/dto/vo/GoblinGoodsExtagVo.java
+10
-10
GoblinGoodsInfoVo.java
...om/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoVo.java
+2
-2
GoblinGoodsTagVo.java
...com/liquidnet/service/goblin/dto/vo/GoblinGoodsTagVo.java
+12
-6
GoblinSelfTagVo.java
.../com/liquidnet/service/goblin/dto/vo/GoblinSelfTagVo.java
+37
-0
GoblinGoodsTag.java
...a/com/liquidnet/service/goblin/entity/GoblinGoodsTag.java
+2
-2
GoblinSelfGoodsTag.java
...m/liquidnet/service/goblin/entity/GoblinSelfGoodsTag.java
+0
-59
GoblinSelfTag.java
...va/com/liquidnet/service/goblin/entity/GoblinSelfTag.java
+3
-3
GoblinSelfGoodsTagMapper.java
...idnet/service/goblin/mapper/GoblinSelfGoodsTagMapper.java
+0
-16
GoblinSelfTagMapper.java
.../liquidnet/service/goblin/mapper/GoblinSelfTagMapper.java
+2
-2
GoblinSelfGoodsTagMapper.xml
...uidnet.service.goblin.mapper/GoblinSelfGoodsTagMapper.xml
+0
-5
GoblinSelfTagMapper.xml
...m.liquidnet.service.goblin.mapper/GoblinSelfTagMapper.xml
+1
-1
db_ln_goblin_initialdata.sql
...net-service-goblin-impl/docu/db_ln_goblin_initialdata.sql
+44
-28
GoblinStoreMgtGoodsServiceImpl.java
...n/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
+35
-6
GoblinMongoUtils.java
...a/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
+19
-2
ObjectUtil.java
...in/java/com/liquidnet/service/goblin/util/ObjectUtil.java
+20
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsAddParam.java
View file @
8cb1eaa9
...
@@ -167,9 +167,9 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
...
@@ -167,9 +167,9 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
/**
/**
* 生成SKU列表以及SPU规格等信息
* 生成SKU列表以及SPU规格等信息
*
*
* @param goodsInfoVo
* @param goodsInfoVo
GoblinGoodsInfoVo
* @param vos
* @param vos
List<GoblinGoodsSkuInfoVo>
* @param goodsSpecVos
* @param goodsSpecVos
List<GoblinGoodsSpecVo>
*/
*/
public
void
initGoodsSkuInfoVo
(
GoblinGoodsInfoVo
goodsInfoVo
,
List
<
GoblinGoodsSkuInfoVo
>
vos
,
public
void
initGoodsSkuInfoVo
(
GoblinGoodsInfoVo
goodsInfoVo
,
List
<
GoblinGoodsSkuInfoVo
>
vos
,
List
<
GoblinGoodsSpecVo
>
goodsSpecVos
)
{
List
<
GoblinGoodsSpecVo
>
goodsSpecVos
)
{
...
@@ -224,6 +224,9 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
...
@@ -224,6 +224,9 @@ public class GoblinStoreMgtGoodsAddParam implements Serializable {
vos
.
add
(
vo
);
vos
.
add
(
vo
);
skuIdList
.
add
(
vo
.
getSkuId
());
skuIdList
.
add
(
vo
.
getSkuId
());
priceGe
=
priceGe
.
compareTo
(
vo
.
getPrice
())
>
0
?
vo
.
getPrice
()
:
priceGe
;
priceLe
=
priceLe
.
compareTo
(
vo
.
getPrice
())
<
0
?
vo
.
getPrice
()
:
priceLe
;
int
specSize
=
skuSpecList
.
size
();
// SKU包含的规格数量
int
specSize
=
skuSpecList
.
size
();
// SKU包含的规格数量
for
(
int
j
=
0
;
j
<
specSize
;
j
++)
{
for
(
int
j
=
0
;
j
<
specSize
;
j
++)
{
GoblinGoodsSpecDto
specDto
=
skuSpecList
.
get
(
j
);
GoblinGoodsSpecDto
specDto
=
skuSpecList
.
get
(
j
);
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/Goblin
Self
ExtagVo.java
→
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/Goblin
Goods
ExtagVo.java
View file @
8cb1eaa9
...
@@ -6,27 +6,27 @@ import lombok.Data;
...
@@ -6,27 +6,27 @@ import lombok.Data;
import
java.io.Serializable
;
import
java.io.Serializable
;
@ApiModel
(
value
=
"Goblin
SelfExtagVo"
,
description
=
"
音乐人、艺人、IP信息"
)
@ApiModel
(
value
=
"Goblin
GoodsExtagVo"
,
description
=
"商品关联
音乐人、艺人、IP信息"
)
@Data
@Data
public
class
Goblin
Self
ExtagVo
implements
Serializable
,
Cloneable
{
public
class
Goblin
Goods
ExtagVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
367926424789690081L
;
private
static
final
long
serialVersionUID
=
367926424789690081L
;
@ApiModelProperty
(
position
=
10
,
value
=
"标签ID"
)
@ApiModelProperty
(
position
=
10
,
value
=
"标签ID"
)
private
String
tagId
;
private
String
tagId
;
@ApiModelProperty
(
position
=
11
,
value
=
"标签名称"
)
@ApiModelProperty
(
position
=
11
,
value
=
"标签名称"
)
private
String
tagName
;
private
String
tagName
;
@ApiModelProperty
(
position
=
12
,
value
=
"排序[数值越小,排序越前]"
)
@ApiModelProperty
(
position
=
12
,
value
=
"标签说明"
)
private
Integer
sort
;
@ApiModelProperty
(
position
=
13
,
value
=
"标签说明"
)
private
String
tagDesc
;
private
String
tagDesc
;
@ApiModelProperty
(
position
=
1
4
,
value
=
"标签图片"
)
@ApiModelProperty
(
position
=
1
3
,
value
=
"标签图片"
)
private
String
tagPic
;
private
String
tagPic
;
@ApiModelProperty
(
position
=
14
,
value
=
"排序[数值越小,排序越前]"
)
private
Integer
sort
;
private
static
final
Goblin
SelfExtagVo
obj
=
new
GoblinSelf
ExtagVo
();
private
static
final
Goblin
GoodsExtagVo
obj
=
new
GoblinGoods
ExtagVo
();
public
static
Goblin
Self
ExtagVo
getNew
()
{
public
static
Goblin
Goods
ExtagVo
getNew
()
{
try
{
try
{
return
(
Goblin
Self
ExtagVo
)
obj
.
clone
();
return
(
Goblin
Goods
ExtagVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
}
catch
(
CloneNotSupportedException
e
)
{
return
new
Goblin
Self
ExtagVo
();
return
new
Goblin
Goods
ExtagVo
();
}
}
}
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoVo.java
View file @
8cb1eaa9
...
@@ -85,11 +85,11 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
...
@@ -85,11 +85,11 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
51
,
value
=
"规格信息"
)
@ApiModelProperty
(
position
=
51
,
value
=
"规格信息"
)
private
List
<
GoblinGoodsSpecVo
>
specVoList
;
private
List
<
GoblinGoodsSpecVo
>
specVoList
;
@ApiModelProperty
(
position
=
52
,
value
=
"商品标签列表"
)
@ApiModelProperty
(
position
=
52
,
value
=
"商品标签列表"
)
private
List
<
Goblin
Self
GoodsTagVo
>
tagVoList
;
private
List
<
GoblinGoodsTagVo
>
tagVoList
;
@ApiModelProperty
(
position
=
53
,
value
=
"商品服务支持列表"
)
@ApiModelProperty
(
position
=
53
,
value
=
"商品服务支持列表"
)
private
List
<
GoblinServiceSupportVo
>
serviceSupportVoList
;
private
List
<
GoblinServiceSupportVo
>
serviceSupportVoList
;
@ApiModelProperty
(
position
=
54
,
value
=
"音乐人、艺术家、IP列表"
)
@ApiModelProperty
(
position
=
54
,
value
=
"音乐人、艺术家、IP列表"
)
private
List
<
Goblin
Self
ExtagVo
>
extagVoList
;
private
List
<
Goblin
Goods
ExtagVo
>
extagVoList
;
@ApiModelProperty
(
position
=
55
,
value
=
"活动Id"
)
@ApiModelProperty
(
position
=
55
,
value
=
"活动Id"
)
private
String
marketId
;
private
String
marketId
;
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/Goblin
Self
GoodsTagVo.java
→
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsTagVo.java
View file @
8cb1eaa9
...
@@ -6,9 +6,9 @@ import lombok.Data;
...
@@ -6,9 +6,9 @@ import lombok.Data;
import
java.io.Serializable
;
import
java.io.Serializable
;
@ApiModel
(
value
=
"Goblin
SelfGoodsTagVo"
,
description
=
"
标签信息"
)
@ApiModel
(
value
=
"Goblin
GoodsTagVo"
,
description
=
"商品关联
标签信息"
)
@Data
@Data
public
class
Goblin
Self
GoodsTagVo
implements
Serializable
,
Cloneable
{
public
class
GoblinGoodsTagVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
-
2342407105969740471L
;
private
static
final
long
serialVersionUID
=
-
2342407105969740471L
;
@ApiModelProperty
(
position
=
11
,
value
=
"标签ID"
)
@ApiModelProperty
(
position
=
11
,
value
=
"标签ID"
)
private
String
tagId
;
private
String
tagId
;
...
@@ -17,12 +17,18 @@ public class GoblinSelfGoodsTagVo implements Serializable, Cloneable {
...
@@ -17,12 +17,18 @@ public class GoblinSelfGoodsTagVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
13
,
value
=
"排序[数值越小,排序越前]"
)
@ApiModelProperty
(
position
=
13
,
value
=
"排序[数值越小,排序越前]"
)
private
Integer
sort
;
private
Integer
sort
;
private
static
final
Goblin
SelfGoodsTagVo
obj
=
new
GoblinSelf
GoodsTagVo
();
private
static
final
Goblin
GoodsTagVo
obj
=
new
Goblin
GoodsTagVo
();
public
static
Goblin
Self
GoodsTagVo
getNew
()
{
public
static
GoblinGoodsTagVo
getNew
()
{
try
{
try
{
return
(
Goblin
Self
GoodsTagVo
)
obj
.
clone
();
return
(
GoblinGoodsTagVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
}
catch
(
CloneNotSupportedException
e
)
{
return
new
Goblin
Self
GoodsTagVo
();
return
new
GoblinGoodsTagVo
();
}
}
}
}
public
GoblinGoodsTagVo
copy
(
GoblinSelfTagVo
source
)
{
if
(
null
==
source
)
return
this
;
return
this
;
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinSelfTagVo.java
0 → 100644
View file @
8cb1eaa9
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
@ApiModel
(
value
=
"GoblinSelfTagVo"
,
description
=
"平台标签库"
)
@Data
public
class
GoblinSelfTagVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
972558538207500034L
;
@ApiModelProperty
(
position
=
10
,
value
=
"标签ID"
)
private
String
tagId
;
@ApiModelProperty
(
position
=
11
,
value
=
"标签名称"
)
private
String
tagName
;
@ApiModelProperty
(
position
=
12
,
value
=
"标签描述"
)
private
String
tagDesc
;
@ApiModelProperty
(
position
=
13
,
value
=
"标签图片"
)
private
String
tagPic
;
@ApiModelProperty
(
position
=
14
,
value
=
"标签类型[1-音乐人|2-艺术家|3-IP]"
)
private
String
tagType
;
@ApiModelProperty
(
position
=
15
,
value
=
"标签所属[0-普通标签|1-专属标签]"
)
private
String
tagBelong
;
@ApiModelProperty
(
position
=
16
,
value
=
"排序[数值越小,排序越前]"
)
private
Integer
sort
;
private
static
final
GoblinSelfTagVo
obj
=
new
GoblinSelfTagVo
();
public
static
GoblinSelfTagVo
getNew
()
{
try
{
return
(
GoblinSelfTagVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GoblinSelfTagVo
();
}
}
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinGoodsTag.java
View file @
8cb1eaa9
...
@@ -34,9 +34,9 @@ public class GoblinGoodsTag implements Serializable {
...
@@ -34,9 +34,9 @@ public class GoblinGoodsTag implements Serializable {
private
String
tagId
;
private
String
tagId
;
/**
/**
*
标签所属[0-普通标签|1-专属标签
]
*
排序[数值越小,排序越前
]
*/
*/
private
String
tagBelong
;
private
Integer
sort
;
/**
/**
* 删除标记[0-未删除|1-删除]
* 删除标记[0-未删除|1-删除]
...
...
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinSelfGoodsTag.java
deleted
100644 → 0
View file @
f9c4c2ad
package
com
.
liquidnet
.
service
.
goblin
.
entity
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
java.io.Serializable
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
/**
* <p>
* 平台商品标签
* </p>
*
* @author liquidnet
* @since 2021-12-27
*/
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
GoblinSelfGoodsTag
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
@TableId
(
value
=
"mid"
,
type
=
IdType
.
AUTO
)
private
Long
mid
;
/**
* 标签id
*/
private
String
tagId
;
/**
* 标签名称
*/
private
String
tagName
;
/**
* 标签说明
*/
private
String
tagDesc
;
/**
* 保留字段
*/
private
String
tagType
;
/**
* 排序[数值越小,排序越前]
*/
private
Integer
sort
;
/**
* 删除标记[0-未删除|1-删除]
*/
private
String
delFlg
;
private
String
comment
;
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinSelf
Ext
ag.java
→
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinSelf
T
ag.java
View file @
8cb1eaa9
...
@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
...
@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
*/
*/
@Data
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@EqualsAndHashCode
(
callSuper
=
false
)
public
class
GoblinSelf
Ext
ag
implements
Serializable
{
public
class
GoblinSelf
T
ag
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
@@ -49,9 +49,9 @@ public class GoblinSelfExtag implements Serializable {
...
@@ -49,9 +49,9 @@ public class GoblinSelfExtag implements Serializable {
private
String
tagType
;
private
String
tagType
;
/**
/**
*
排序[数值越小,排序越前
]
*
标签所属[0-普通标签|1-专属标签
]
*/
*/
private
Integer
sort
;
private
String
tagBelong
;
/**
/**
* 删除标记[0-未删除|1-删除]
* 删除标记[0-未删除|1-删除]
...
...
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinSelfGoodsTagMapper.java
deleted
100644 → 0
View file @
f9c4c2ad
package
com
.
liquidnet
.
service
.
goblin
.
mapper
;
import
com.liquidnet.service.goblin.entity.GoblinSelfGoodsTag
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
* <p>
* 平台商品标签 Mapper 接口
* </p>
*
* @author liquidnet
* @since 2021-12-27
*/
public
interface
GoblinSelfGoodsTagMapper
extends
BaseMapper
<
GoblinSelfGoodsTag
>
{
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinSelf
Ext
agMapper.java
→
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinSelf
T
agMapper.java
View file @
8cb1eaa9
package
com
.
liquidnet
.
service
.
goblin
.
mapper
;
package
com
.
liquidnet
.
service
.
goblin
.
mapper
;
import
com.liquidnet.service.goblin.entity.GoblinSelf
Ext
ag
;
import
com.liquidnet.service.goblin.entity.GoblinSelf
T
ag
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
/**
/**
...
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
...
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author liquidnet
* @author liquidnet
* @since 2021-12-27
* @since 2021-12-27
*/
*/
public
interface
GoblinSelf
ExtagMapper
extends
BaseMapper
<
GoblinSelfExt
ag
>
{
public
interface
GoblinSelf
TagMapper
extends
BaseMapper
<
GoblinSelfT
ag
>
{
}
}
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelfGoodsTagMapper.xml
deleted
100644 → 0
View file @
f9c4c2ad
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.liquidnet.service.goblin.mapper.GoblinSelfGoodsTagMapper"
>
</mapper>
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelf
Ext
agMapper.xml
→
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelf
T
agMapper.xml
View file @
8cb1eaa9
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.liquidnet.service.goblin.mapper.GoblinSelf
Ext
agMapper"
>
<mapper
namespace=
"com.liquidnet.service.goblin.mapper.GoblinSelf
T
agMapper"
>
</mapper>
</mapper>
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql
View file @
8cb1eaa9
...
@@ -20,36 +20,52 @@ create table goblin_service_support
...
@@ -20,36 +20,52 @@ create table goblin_service_support
create
unique
index
uidx_gss_service_support_id
on
goblin_service_support
(
ssid
);
create
unique
index
uidx_gss_service_support_id
on
goblin_service_support
(
ssid
);
#
-- >>------------------------------------------------------------------------------------
#
-- >>------------------------------------------------------------------------------------
drop
table
if
exists
goblin_self_
ex
tag
;
drop
table
if
exists
goblin_self_tag
;
create
table
goblin_self_
ex
tag
create
table
goblin_self_tag
(
(
mid
bigint
auto_increment
primary
key
,
mid
bigint
auto_increment
primary
key
,
tag_id
varchar
(
30
)
not
null
comment
'标签id'
,
tag_id
varchar
(
30
)
not
null
comment
'标签id'
,
tag_name
varchar
(
50
)
not
null
comment
'标签名称'
,
tag_name
varchar
(
50
)
not
null
comment
'标签名称'
,
tag_desc
varchar
(
128
)
null
comment
'标签描述'
,
tag_desc
varchar
(
128
)
null
comment
'标签描述'
,
tag_pic
varchar
(
256
)
null
comment
'标签图片'
,
tag_pic
varchar
(
256
)
null
comment
'标签图片'
,
tag_type
char
null
comment
'标签类型[
1-音乐人|2-艺术家|3-IP]'
,
tag_type
char
null
comment
'标签类型[0-商品标签|
1-音乐人|2-艺术家|3-IP]'
,
sort
int
default
0
comment
'排序[数值越小,排序越前
]'
,
tag_belong
char
default
'0'
comment
'标签所属[0-普通标签|1-专属标签
]'
,
del_flg
char
default
'0'
comment
'删除标记[0-未删除|1-删除]'
,
del_flg
char
default
'0'
comment
'删除标记[0-未删除|1-删除]'
,
comment
varchar
(
255
)
comment
varchar
(
255
)
)
engine
=
InnoDB
comment
'平台
专属标签
'
;
)
engine
=
InnoDB
comment
'平台
标签库
'
;
create
unique
index
uidx_gs
e_tag_id
on
goblin_self_ex
tag
(
tag_id
);
create
unique
index
uidx_gs
t_tag_id
on
goblin_self_
tag
(
tag_id
);
#
-- >>------------------------------------------------------------------------------------
#
-- >>------------------------------------------------------------------------------------
drop
table
if
exists
goblin_self_goods_tag
;
#
drop
table
if
exists
goblin_self_extag
;
create
table
goblin_self_goods_tag
#
create
table
goblin_self_extag
(
#
(
mid
bigint
auto_increment
primary
key
,
#
mid
bigint
auto_increment
primary
key
,
tag_id
varchar
(
30
)
not
null
comment
'标签id'
,
#
tag_id
varchar
(
30
)
not
null
comment
'标签id'
,
tag_name
varchar
(
30
)
not
null
comment
'标签名称'
,
#
tag_name
varchar
(
50
)
not
null
comment
'标签名称'
,
tag_desc
varchar
(
50
)
null
comment
'标签说明'
,
#
tag_desc
varchar
(
128
)
null
comment
'标签描述'
,
tag_type
char
default
'0'
comment
'保留字段'
,
#
tag_pic
varchar
(
256
)
null
comment
'标签图片'
,
sort
int
default
0
comment
'排序[数值越小,排序越前]'
,
#
tag_type
char
null
comment
'标签类型[1-音乐人|2-艺术家|3-IP]'
,
del_flg
char
default
'0'
comment
'删除标记[0-未删除|1-删除]'
,
#
sort
int
default
0
comment
'排序[数值越小,排序越前]'
,
comment
varchar
(
255
)
#
del_flg
char
default
'0'
comment
'删除标记[0-未删除|1-删除]'
,
)
engine
=
InnoDB
comment
'平台商品标签'
;
#
comment
varchar
(
255
)
#
)
engine
=
InnoDB
comment
'平台专属标签'
;
create
unique
index
uidx_gsgt_tag_id
on
goblin_self_goods_tag
(
tag_id
);
#
#
create
unique
index
uidx_gse_tag_id
on
goblin_self_extag
(
tag_id
);
#
#
-- >>------------------------------------------------------------------------------------
#
drop
table
if
exists
goblin_self_goods_tag
;
#
create
table
goblin_self_goods_tag
#
(
#
mid
bigint
auto_increment
primary
key
,
#
tag_id
varchar
(
30
)
not
null
comment
'标签id'
,
#
tag_name
varchar
(
30
)
not
null
comment
'标签名称'
,
#
tag_desc
varchar
(
50
)
null
comment
'标签说明'
,
#
tag_type
char
default
'0'
comment
'保留字段'
,
#
sort
int
default
0
comment
'排序[数值越小,排序越前]'
,
#
del_flg
char
default
'0'
comment
'删除标记[0-未删除|1-删除]'
,
#
comment
varchar
(
255
)
#
)
engine
=
InnoDB
comment
'平台商品标签'
;
#
#
create
unique
index
uidx_gsgt_tag_id
on
goblin_self_goods_tag
(
tag_id
);
#
-- >>------------------------------------------------------------------------------------
#
-- >>------------------------------------------------------------------------------------
drop
table
if
exists
goblin_self_goods_category
;
drop
table
if
exists
goblin_self_goods_category
;
create
table
goblin_self_goods_category
create
table
goblin_self_goods_category
...
@@ -207,7 +223,7 @@ create table goblin_goods_tag
...
@@ -207,7 +223,7 @@ create table goblin_goods_tag
mid
bigint
auto_increment
primary
key
,
mid
bigint
auto_increment
primary
key
,
spu_id
varchar
(
64
)
not
null
comment
'商品id'
,
spu_id
varchar
(
64
)
not
null
comment
'商品id'
,
tag_id
varchar
(
30
)
not
null
comment
'标签id,对应 goblin_self_goods_tag.tag_id | goblin_self_extag.tag_id'
,
tag_id
varchar
(
30
)
not
null
comment
'标签id,对应 goblin_self_goods_tag.tag_id | goblin_self_extag.tag_id'
,
tag_belong
char
default
'0'
comment
'标签所属[0-普通标签|1-专属标签
]'
,
sort
int
default
0
comment
'排序[数值越小,排序越前
]'
,
del_flg
char
default
'0'
comment
'删除标记[0-未删除|1-删除]'
,
del_flg
char
default
'0'
comment
'删除标记[0-未删除|1-删除]'
,
comment
varchar
(
255
)
comment
varchar
(
255
)
)
engine
=
InnoDB
comment
'商品关联标签'
;
)
engine
=
InnoDB
comment
'商品关联标签'
;
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
View file @
8cb1eaa9
package
com
.
liquidnet
.
service
.
goblin
.
service
.
impl
.
manage
;
package
com
.
liquidnet
.
service
.
goblin
.
service
.
impl
.
manage
;
import
com.liquidnet.commons.lang.util.CollectionUtil
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.base.PagedResult
;
import
com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsActionParam
;
import
com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsActionParam
;
...
@@ -7,9 +8,7 @@ import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsAddParam;
...
@@ -7,9 +8,7 @@ import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsAddParam;
import
com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsFilterParam
;
import
com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsFilterParam
;
import
com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsInfoVo
;
import
com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsInfoVo
;
import
com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo
;
import
com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo
;
import
com.liquidnet.service.goblin.dto.vo.*
;
import
com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinGoodsSpecVo
;
import
com.liquidnet.service.goblin.service.manage.IGoblinstoreMgtGoodsService
;
import
com.liquidnet.service.goblin.service.manage.IGoblinstoreMgtGoodsService
;
import
com.liquidnet.service.goblin.util.GoblinMongoUtils
;
import
com.liquidnet.service.goblin.util.GoblinMongoUtils
;
import
com.liquidnet.service.goblin.util.GoblinRedisUtils
;
import
com.liquidnet.service.goblin.util.GoblinRedisUtils
;
...
@@ -50,9 +49,39 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
...
@@ -50,9 +49,39 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
List
<
GoblinGoodsSkuInfoVo
>
goodsSkuInfoVoList
=
ObjectUtil
.
getGoblinGoodsSkuInfoVoArrayList
();
List
<
GoblinGoodsSkuInfoVo
>
goodsSkuInfoVoList
=
ObjectUtil
.
getGoblinGoodsSkuInfoVoArrayList
();
storeMgtGoodsAddParam
.
initGoodsSkuInfoVo
(
vo
,
goodsSkuInfoVoList
,
goodsSpecVoList
);
storeMgtGoodsAddParam
.
initGoodsSkuInfoVo
(
vo
,
goodsSkuInfoVoList
,
goodsSpecVoList
);
// vo.setTagVoList();
{
// 标签处理
// vo.setServiceSupportVoList();
List
<
String
>
goodsTagIdList
=
storeMgtGoodsAddParam
.
getTagList
();
// vo.setExtagVoList();
List
<
String
>
goodsExtagIdList
=
storeMgtGoodsAddParam
.
getExtagList
();
boolean
goodsTagIsEmpty
=
CollectionUtils
.
isEmpty
(
goodsTagIdList
);
boolean
goodsExtagIsEmpty
=
CollectionUtils
.
isEmpty
(
goodsExtagIdList
);
ArrayList
<
String
>
tagIdList
=
CollectionUtil
.
arrayListString
();
tagIdList
.
addAll
(
goodsTagIdList
);
tagIdList
.
addAll
(
goodsExtagIdList
);
if
(!
CollectionUtils
.
isEmpty
(
tagIdList
))
{
List
<
GoblinSelfTagVo
>
selfTagVoList
=
goblinMongoUtils
.
getSelfTagVos
(
tagIdList
);
if
(!
goodsTagIsEmpty
)
{
for
(
int
i
=
0
;
i
<
tagIdList
.
size
();
i
++)
{
String
tagId
=
tagIdList
.
get
(
i
);
selfTagVoList
.
forEach
(
r
->
{
if
(
r
.
getTagId
().
equals
(
tagId
))
{
GoblinGoodsTagVo
.
getNew
();
}
});
}
// vo.setTagVoList();
}
if
(!
goodsExtagIsEmpty
)
{
// vo.setExtagVoList();
}
}
}
vo
.
setServiceSupportVoList
(
goblinMongoUtils
.
getServiceSupportVo
(
storeMgtGoodsAddParam
.
getSsidList
()));
goblinMongoUtils
.
setGoodsInfoVo
(
vo
);
goblinMongoUtils
.
setGoodsInfoVo
(
vo
);
goblinMongoUtils
.
setGoodsSkuInfoVos
(
goodsSkuInfoVoList
);
goblinMongoUtils
.
setGoodsSkuInfoVos
(
goodsSkuInfoVoList
);
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @
8cb1eaa9
...
@@ -19,6 +19,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
...
@@ -19,6 +19,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Criteria
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.data.mongodb.core.query.Query
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.util.CollectionUtils
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
import
java.util.HashMap
;
import
java.util.HashMap
;
...
@@ -34,15 +35,31 @@ public class GoblinMongoUtils {
...
@@ -34,15 +35,31 @@ public class GoblinMongoUtils {
/* ---------------------------------------- 标签数据源 ---------------------------------------- */
/* ---------------------------------------- 标签数据源 ---------------------------------------- */
//
public
List
<
GoblinSelfTagVo
>
getSelfTagVos
(
List
<
String
>
tagIds
)
{
public
List
<
GoblinSelfGoodsTagVo
>
getGoodsTagVos
(
List
<
String
>
tagIds
)
{
if
(
CollectionUtils
.
isEmpty
(
tagIds
))
return
ObjectUtil
.
getGoblinSelfTagVoArrayList
();
return
null
;
}
public
List
<
GoblinGoodsTagVo
>
getGoodsTagVos
(
List
<
String
>
tagIds
)
{
if
(
CollectionUtils
.
isEmpty
(
tagIds
))
return
ObjectUtil
.
getGoblinGoodsTagVoArrayList
();
return
null
;
}
public
List
<
GoblinGoodsExtagVo
>
getGoodsExtagVos
(
List
<
String
>
tagIds
)
{
if
(
CollectionUtils
.
isEmpty
(
tagIds
))
return
ObjectUtil
.
getGoblinGoodsExtagVoArrayList
();
return
null
;
return
null
;
}
}
/* ---------------------------------------- 服务保障数据源 ---------------------------------------- */
/* ---------------------------------------- 服务保障数据源 ---------------------------------------- */
public
List
<
GoblinServiceSupportVo
>
getServiceSupportVo
(
List
<
String
>
ssids
)
{
if
(
CollectionUtils
.
isEmpty
(
ssids
))
return
ObjectUtil
.
getGoblinServiceSupportVoArrayList
();
return
null
;
}
/* ---------------------------------------- 店铺数据源 ---------------------------------------- */
/* ---------------------------------------- 店铺数据源 ---------------------------------------- */
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/ObjectUtil.java
View file @
8cb1eaa9
...
@@ -18,6 +18,10 @@ public class ObjectUtil {
...
@@ -18,6 +18,10 @@ public class ObjectUtil {
private
static
final
ArrayList
<
GoblinStoreMgtThumbVo
>
goblinStoreMgtThumbVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinStoreMgtThumbVo
>
goblinStoreMgtThumbVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinGoodsSkuInfoVo
>
goblinGoodsSkuInfoVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinGoodsSkuInfoVo
>
goblinGoodsSkuInfoVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinGoodsSpecVo
>
goblinGoodsSpecVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinGoodsSpecVo
>
goblinGoodsSpecVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinServiceSupportVo
>
goblinServiceSupportVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinSelfTagVo
>
goblinSelfTagVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinGoodsTagVo
>
goblinGoodsTagVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinGoodsExtagVo
>
goblinGoodsExtagVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinMarketSpuListVo
>
goblinMarketSpuListVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinMarketSpuListVo
>
goblinMarketSpuListVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinStorePurchaseSkuVo
>
goblinStorePurchaseSkuVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinStorePurchaseSkuVo
>
goblinStorePurchaseSkuVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinSelfZhengzaiSkuVo
>
goblinSelfZhengzaiSkuVoArrayList
=
new
ArrayList
<>();
private
static
final
ArrayList
<
GoblinSelfZhengzaiSkuVo
>
goblinSelfZhengzaiSkuVoArrayList
=
new
ArrayList
<>();
...
@@ -52,6 +56,22 @@ public class ObjectUtil {
...
@@ -52,6 +56,22 @@ public class ObjectUtil {
return
(
ArrayList
<
GoblinGoodsSpecVo
>)
goblinGoodsSpecVoArrayList
.
clone
();
return
(
ArrayList
<
GoblinGoodsSpecVo
>)
goblinGoodsSpecVoArrayList
.
clone
();
}
}
public
static
ArrayList
<
GoblinServiceSupportVo
>
getGoblinServiceSupportVoArrayList
()
{
return
(
ArrayList
<
GoblinServiceSupportVo
>)
goblinServiceSupportVoArrayList
.
clone
();
}
public
static
ArrayList
<
GoblinSelfTagVo
>
getGoblinSelfTagVoArrayList
()
{
return
(
ArrayList
<
GoblinSelfTagVo
>)
goblinSelfTagVoArrayList
.
clone
();
}
public
static
ArrayList
<
GoblinGoodsTagVo
>
getGoblinGoodsTagVoArrayList
()
{
return
(
ArrayList
<
GoblinGoodsTagVo
>)
goblinGoodsTagVoArrayList
.
clone
();
}
public
static
ArrayList
<
GoblinGoodsExtagVo
>
getGoblinGoodsExtagVoArrayList
()
{
return
(
ArrayList
<
GoblinGoodsExtagVo
>)
goblinGoodsExtagVoArrayList
.
clone
();
}
public
static
ArrayList
<
GoblinMarketSpuListVo
>
getGoblinMarketSpuListVoArrayList
()
{
public
static
ArrayList
<
GoblinMarketSpuListVo
>
getGoblinMarketSpuListVoArrayList
()
{
return
(
ArrayList
<
GoblinMarketSpuListVo
>)
goblinMarketSpuListVoArrayList
.
clone
();
return
(
ArrayList
<
GoblinMarketSpuListVo
>)
goblinMarketSpuListVoArrayList
.
clone
();
}
}
...
...
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