记得上下班打卡 | 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
3d13fbc1
Commit
3d13fbc1
authored
May 18, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 分批购时间配置
parent
ef21fc64
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
GoblinStoreMgtGoodsSkuListVo.java
...ce/goblin/dto/manage/vo/GoblinStoreMgtGoodsSkuListVo.java
+2
-0
GoblinMongoUtils.java
...a/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
+2
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinStoreMgtGoodsSkuListVo.java
View file @
3d13fbc1
...
@@ -48,6 +48,8 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable {
...
@@ -48,6 +48,8 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable {
private
Integer
upchain
;
private
Integer
upchain
;
@ApiModelProperty
(
position
=
38
,
value
=
"盲盒命中率"
)
@ApiModelProperty
(
position
=
38
,
value
=
"盲盒命中率"
)
private
BigDecimal
hitRatio
;
private
BigDecimal
hitRatio
;
@ApiModelProperty
(
position
=
39
,
value
=
"系统时间"
)
private
String
sysTime
;
public
String
getSaleStartTime
()
{
public
String
getSaleStartTime
()
{
return
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
saleStartTime
);
return
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
format
(
saleStartTime
);
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @
3d13fbc1
...
@@ -1613,6 +1613,7 @@ public class GoblinMongoUtils {
...
@@ -1613,6 +1613,7 @@ public class GoblinMongoUtils {
}
}
public
PagedResult
<
GoblinStoreMgtGoodsSkuListVo
>
getSkuSearch
(
GoblinStoreMgtGoodsSkuFilterParam
filterParam
)
{
public
PagedResult
<
GoblinStoreMgtGoodsSkuListVo
>
getSkuSearch
(
GoblinStoreMgtGoodsSkuFilterParam
filterParam
)
{
String
sysTime
=
DateUtil
.
getNowTime
();
Criteria
criteria
=
Criteria
.
where
(
"storeId"
).
is
(
filterParam
.
getStoreId
()).
and
(
"spuId"
).
is
(
filterParam
.
getSpuId
()).
and
(
"delFlg"
).
is
(
"0"
);
Criteria
criteria
=
Criteria
.
where
(
"storeId"
).
is
(
filterParam
.
getStoreId
()).
and
(
"spuId"
).
is
(
filterParam
.
getSpuId
()).
and
(
"delFlg"
).
is
(
"0"
);
if
(
StringUtils
.
isNotBlank
(
filterParam
.
getKeyword
()))
{
if
(
StringUtils
.
isNotBlank
(
filterParam
.
getKeyword
()))
{
Pattern
pattern
=
Pattern
.
compile
(
"^.*"
+
filterParam
.
getKeyword
()
+
".*$"
,
Pattern
.
CASE_INSENSITIVE
);
Pattern
pattern
=
Pattern
.
compile
(
"^.*"
+
filterParam
.
getKeyword
()
+
".*$"
,
Pattern
.
CASE_INSENSITIVE
);
...
@@ -1657,6 +1658,7 @@ public class GoblinMongoUtils {
...
@@ -1657,6 +1658,7 @@ public class GoblinMongoUtils {
}
}
mgtGoodsSkuListVo
.
setSurplusStock
(
stock
);
mgtGoodsSkuListVo
.
setSurplusStock
(
stock
);
}
}
mgtGoodsSkuListVo
.
setSysTime
(
sysTime
);
voList
.
add
(
mgtGoodsSkuListVo
);
voList
.
add
(
mgtGoodsSkuListVo
);
}
}
return
pagedResult
.
setList
(
voList
).
setTotal
(
count
,
20
);
return
pagedResult
.
setList
(
voList
).
setTotal
(
count
,
20
);
...
...
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