记得上下班打卡 | 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
e7cae9dd
Commit
e7cae9dd
authored
Jan 04, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~vo;
parent
63bc233a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
46 additions
and
3 deletions
+46
-3
GoblinStoreCertificationVo.java
...vice/goblin/dto/manage/vo/GoblinStoreCertificationVo.java
+3
-0
GoblinGoodsInfoVo.java
...om/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoVo.java
+5
-0
GoblinGoodsSkuInfoVo.java
...liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java
+6
-0
GoblinStoreMgtGoodsServiceImpl.java
...n/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
+2
-2
GoblinMongoUtils.java
...a/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
+12
-0
GoblinOrderUtils.java
...a/com/liquidnet/service/goblin/util/GoblinOrderUtils.java
+0
-1
GoblinRedisUtils.java
...a/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
+18
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinStoreCertificationVo.java
View file @
e7cae9dd
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
manage
.
vo
;
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
manage
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -56,6 +58,7 @@ public class GoblinStoreCertificationVo implements Serializable, Cloneable {
...
@@ -56,6 +58,7 @@ public class GoblinStoreCertificationVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
32
,
value
=
"资质证书照片[256]"
)
@ApiModelProperty
(
position
=
32
,
value
=
"资质证书照片[256]"
)
private
String
busQualityPic
;
private
String
busQualityPic
;
private
String
updatedBy
;
private
String
updatedBy
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
updatedAt
;
private
LocalDateTime
updatedAt
;
private
static
final
GoblinStoreCertificationVo
obj
=
new
GoblinStoreCertificationVo
();
private
static
final
GoblinStoreCertificationVo
obj
=
new
GoblinStoreCertificationVo
();
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoVo.java
View file @
e7cae9dd
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -71,6 +73,7 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
...
@@ -71,6 +73,7 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
37
,
value
=
"自定义展示[0-默认展示|1-隐藏不可购买]"
)
@ApiModelProperty
(
position
=
37
,
value
=
"自定义展示[0-默认展示|1-隐藏不可购买]"
)
private
String
spuAppear
;
private
String
spuAppear
;
@ApiModelProperty
(
position
=
38
,
value
=
"上架时间"
)
@ApiModelProperty
(
position
=
38
,
value
=
"上架时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
shelvesAt
;
private
LocalDateTime
shelvesAt
;
@ApiModelProperty
(
position
=
39
,
value
=
"商品图片列表"
)
@ApiModelProperty
(
position
=
39
,
value
=
"商品图片列表"
)
private
List
<
String
>
imageList
;
private
List
<
String
>
imageList
;
...
@@ -78,8 +81,10 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
...
@@ -78,8 +81,10 @@ public class GoblinGoodsInfoVo implements Serializable, Cloneable {
private
String
logisticsTemplate
;
private
String
logisticsTemplate
;
private
String
createdBy
;
private
String
createdBy
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
createdAt
;
private
LocalDateTime
createdAt
;
private
String
updatedBy
;
private
String
updatedBy
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
updatedAt
;
private
LocalDateTime
updatedAt
;
@ApiModelProperty
(
position
=
51
,
value
=
"规格信息"
)
@ApiModelProperty
(
position
=
51
,
value
=
"规格信息"
)
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java
View file @
e7cae9dd
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
vo
;
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.liquidnet.commons.lang.util.DateUtil
;
import
com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto
;
import
com.liquidnet.service.goblin.dto.GoblinGoodsSpecDto
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -51,6 +53,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
...
@@ -51,6 +53,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
27
,
value
=
"商品的店铺ID,如果是平台的则为0"
)
@ApiModelProperty
(
position
=
27
,
value
=
"商品的店铺ID,如果是平台的则为0"
)
private
String
storeId
;
private
String
storeId
;
@ApiModelProperty
(
position
=
28
,
value
=
"单品有效期"
)
@ApiModelProperty
(
position
=
28
,
value
=
"单品有效期"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
skuValidity
;
private
LocalDateTime
skuValidity
;
@ApiModelProperty
(
position
=
29
,
value
=
"是否是虚拟商品[0-否|1-是]"
)
@ApiModelProperty
(
position
=
29
,
value
=
"是否是虚拟商品[0-否|1-是]"
)
private
String
virtualFlg
;
private
String
virtualFlg
;
...
@@ -63,12 +66,15 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
...
@@ -63,12 +66,15 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
@ApiModelProperty
(
position
=
33
,
value
=
"自定义展示[0-默认展示|1-隐藏不可购买]"
)
@ApiModelProperty
(
position
=
33
,
value
=
"自定义展示[0-默认展示|1-隐藏不可购买]"
)
private
String
skuAppear
;
private
String
skuAppear
;
@ApiModelProperty
(
position
=
34
,
value
=
"上架时间"
)
@ApiModelProperty
(
position
=
34
,
value
=
"上架时间"
)
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
shelvesAt
;
private
LocalDateTime
shelvesAt
;
@ApiModelProperty
(
position
=
34
,
value
=
"活动Id"
)
@ApiModelProperty
(
position
=
34
,
value
=
"活动Id"
)
private
String
marketId
;
private
String
marketId
;
private
String
createdBy
;
private
String
createdBy
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
createdAt
;
private
LocalDateTime
createdAt
;
private
String
updatedBy
;
private
String
updatedBy
;
@JsonFormat
(
shape
=
JsonFormat
.
Shape
.
STRING
,
pattern
=
DateUtil
.
DATE_FULL_STR
)
private
LocalDateTime
updatedAt
;
private
LocalDateTime
updatedAt
;
@ApiModelProperty
(
position
=
35
,
value
=
"物流模版ID"
)
@ApiModelProperty
(
position
=
35
,
value
=
"物流模版ID"
)
private
String
logisticsTemplate
;
private
String
logisticsTemplate
;
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java
View file @
e7cae9dd
...
@@ -90,13 +90,13 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
...
@@ -90,13 +90,13 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
@Override
@Override
public
GoblinStoreMgtGoodsInfoVo
goodsInfo
(
String
spuId
)
{
public
GoblinStoreMgtGoodsInfoVo
goodsInfo
(
String
spuId
)
{
GoblinStoreMgtGoodsInfoVo
vo
=
GoblinStoreMgtGoodsInfoVo
.
getNew
();
GoblinStoreMgtGoodsInfoVo
vo
=
GoblinStoreMgtGoodsInfoVo
.
getNew
();
GoblinGoodsInfoVo
goodsInfoVo
=
goblinRedisUtils
.
getGoodsInfoVo
(
spuId
);
GoblinGoodsInfoVo
goodsInfoVo
=
goblinRedisUtils
.
get
Mgt
GoodsInfoVo
(
spuId
);
if
(
null
!=
goodsInfoVo
)
{
if
(
null
!=
goodsInfoVo
)
{
vo
.
setGoodsInfoVo
(
goodsInfoVo
);
vo
.
setGoodsInfoVo
(
goodsInfoVo
);
List
<
String
>
skuIdList
=
goodsInfoVo
.
getSkuIdList
();
List
<
String
>
skuIdList
=
goodsInfoVo
.
getSkuIdList
();
if
(!
CollectionUtils
.
isEmpty
(
skuIdList
))
{
if
(!
CollectionUtils
.
isEmpty
(
skuIdList
))
{
List
<
GoblinGoodsSkuInfoVo
>
goodsSkuInfoVoList
=
ObjectUtil
.
getGoblinGoodsSkuInfoVoArrayList
();
List
<
GoblinGoodsSkuInfoVo
>
goodsSkuInfoVoList
=
ObjectUtil
.
getGoblinGoodsSkuInfoVoArrayList
();
skuIdList
.
forEach
(
skuId
->
goodsSkuInfoVoList
.
add
(
goblinRedisUtils
.
getGoodsSkuInfoVo
(
skuId
)));
skuIdList
.
forEach
(
skuId
->
goodsSkuInfoVoList
.
add
(
goblinRedisUtils
.
get
Mgt
GoodsSkuInfoVo
(
skuId
)));
vo
.
setGoodsSkuInfoVoList
(
goodsSkuInfoVoList
);
vo
.
setGoodsSkuInfoVoList
(
goodsSkuInfoVoList
);
}
}
}
}
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @
e7cae9dd
...
@@ -157,6 +157,12 @@ public class GoblinMongoUtils {
...
@@ -157,6 +157,12 @@ public class GoblinMongoUtils {
GoblinGoodsInfoVo
.
class
,
GoblinGoodsInfoVo
.
class
.
getSimpleName
());
GoblinGoodsInfoVo
.
class
,
GoblinGoodsInfoVo
.
class
.
getSimpleName
());
}
}
// SPU信息
public
GoblinGoodsInfoVo
getMgtGoodsInfoVo
(
String
spuId
)
{
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"spuId"
).
is
(
spuId
)),
GoblinGoodsInfoVo
.
class
,
GoblinGoodsInfoVo
.
class
.
getSimpleName
());
}
// SPU信息
// SPU信息
public
boolean
updateGoodsInfoVo
(
GoblinGoodsInfoVo
vo
)
{
public
boolean
updateGoodsInfoVo
(
GoblinGoodsInfoVo
vo
)
{
return
mongoTemplate
.
getCollection
(
GoblinGoodsInfoVo
.
class
.
getSimpleName
())
return
mongoTemplate
.
getCollection
(
GoblinGoodsInfoVo
.
class
.
getSimpleName
())
...
@@ -187,6 +193,12 @@ public class GoblinMongoUtils {
...
@@ -187,6 +193,12 @@ public class GoblinMongoUtils {
GoblinGoodsSkuInfoVo
.
class
,
GoblinGoodsSkuInfoVo
.
class
.
getSimpleName
());
GoblinGoodsSkuInfoVo
.
class
,
GoblinGoodsSkuInfoVo
.
class
.
getSimpleName
());
}
}
// SKU信息
public
GoblinGoodsSkuInfoVo
getMgtGoodsSkuInfoVo
(
String
skuId
)
{
return
mongoTemplate
.
findOne
(
Query
.
query
(
Criteria
.
where
(
"skuId"
).
is
(
skuId
)),
GoblinGoodsSkuInfoVo
.
class
,
GoblinGoodsSkuInfoVo
.
class
.
getSimpleName
());
}
// SKU信息
// SKU信息
public
boolean
updateGoodsSkuInfoVo
(
GoblinGoodsSkuInfoVo
vo
)
{
public
boolean
updateGoodsSkuInfoVo
(
GoblinGoodsSkuInfoVo
vo
)
{
return
mongoTemplate
.
getCollection
(
GoblinGoodsSkuInfoVo
.
class
.
getSimpleName
())
return
mongoTemplate
.
getCollection
(
GoblinGoodsSkuInfoVo
.
class
.
getSimpleName
())
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinOrderUtils.java
View file @
e7cae9dd
...
@@ -8,7 +8,6 @@ import com.liquidnet.commons.lang.util.JsonUtils;
...
@@ -8,7 +8,6 @@ import com.liquidnet.commons.lang.util.JsonUtils;
import
com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo
;
import
com.liquidnet.service.adam.dto.vo.AdamRscPolymer01Vo
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.candy.vo.CandyUseResultVo
;
import
com.liquidnet.service.candy.vo.CandyUseResultVo
;
import
com.liquidnet.service.goblin.constant.GoblinStatusConst
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.beans.factory.annotation.Value
;
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
View file @
e7cae9dd
...
@@ -124,6 +124,15 @@ public class GoblinRedisUtils {
...
@@ -124,6 +124,15 @@ public class GoblinRedisUtils {
return
vo
;
return
vo
;
}
}
public
GoblinGoodsInfoVo
getMgtGoodsInfoVo
(
String
spuId
)
{
String
rk
=
GoblinRedisConst
.
BASIC_GOODS
.
concat
(
spuId
);
GoblinGoodsInfoVo
vo
=
(
GoblinGoodsInfoVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getMgtGoodsInfoVo
(
spuId
)))
{
redisUtil
.
set
(
rk
,
vo
);
}
return
vo
;
}
public
boolean
setGoodsSkuInfoVo
(
GoblinGoodsSkuInfoVo
vo
)
{
public
boolean
setGoodsSkuInfoVo
(
GoblinGoodsSkuInfoVo
vo
)
{
return
redisUtil
.
set
(
GoblinRedisConst
.
BASIC_GOODS_SKU
.
concat
(
vo
.
getSkuId
()),
vo
);
return
redisUtil
.
set
(
GoblinRedisConst
.
BASIC_GOODS_SKU
.
concat
(
vo
.
getSkuId
()),
vo
);
}
}
...
@@ -147,6 +156,15 @@ public class GoblinRedisUtils {
...
@@ -147,6 +156,15 @@ public class GoblinRedisUtils {
return
vo
;
return
vo
;
}
}
public
GoblinGoodsSkuInfoVo
getMgtGoodsSkuInfoVo
(
String
skuId
)
{
String
rk
=
GoblinRedisConst
.
BASIC_GOODS_SKU
.
concat
(
skuId
);
GoblinGoodsSkuInfoVo
vo
=
(
GoblinGoodsSkuInfoVo
)
redisUtil
.
get
(
rk
);
if
(
null
==
vo
&&
null
!=
(
vo
=
goblinMongoUtils
.
getMgtGoodsSkuInfoVo
(
skuId
)))
{
redisUtil
.
set
(
rk
,
vo
);
}
return
vo
;
}
/* ---------------------------------------- ---------------------------------------- */
/* ---------------------------------------- ---------------------------------------- */
...
...
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