记得上下班打卡 | 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
5576fcf5
Commit
5576fcf5
authored
Jan 26, 2024
by
zhangguobing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~api:券商品业务-完善创建逻辑;
parent
e598ec9a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
GoblinStoreMgtGoodsCouponAddParam.java
.../goblin/dto/manage/GoblinStoreMgtGoodsCouponAddParam.java
+2
-2
GoblinStoreMgtGoodsCouponAddSkuParam.java
...blin/dto/manage/GoblinStoreMgtGoodsCouponAddSkuParam.java
+2
-2
GoblinStoreMgtGoodsCouponEditSkuParam.java
...lin/dto/manage/GoblinStoreMgtGoodsCouponEditSkuParam.java
+4
-4
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsCouponAddParam.java
View file @
5576fcf5
...
@@ -259,8 +259,8 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
...
@@ -259,8 +259,8 @@ public class GoblinStoreMgtGoodsCouponAddParam implements Serializable {
skuInfoVo
.
setUseScope
(
Integer
.
valueOf
(
addSkuParam
.
getUseScope
()));
skuInfoVo
.
setUseScope
(
Integer
.
valueOf
(
addSkuParam
.
getUseScope
()));
skuInfoVo
.
setValFace
(
addSkuParam
.
getValFace
());
skuInfoVo
.
setValFace
(
addSkuParam
.
getValFace
());
skuInfoVo
.
setValidity
(-
1
);
skuInfoVo
.
setValidity
(-
1
);
skuInfoVo
.
setEffectAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
addSkuParam
.
getEffect
Time
()));
skuInfoVo
.
setEffectAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
addSkuParam
.
getEffect
At
()));
skuInfoVo
.
setExpireAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
addSkuParam
.
getExpire
Time
()));
skuInfoVo
.
setExpireAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
addSkuParam
.
getExpire
At
()));
}
}
if
(
StringUtils
.
isBlank
(
addSkuParam
.
getSkuId
()))
{
if
(
StringUtils
.
isBlank
(
addSkuParam
.
getSkuId
()))
{
skuInfoVo
.
setSkuId
(
goodsInfoVo
.
getSpuId
().
concat
(
StringUtils
.
right
(
String
.
valueOf
(
System
.
nanoTime
()),
5
)));
skuInfoVo
.
setSkuId
(
goodsInfoVo
.
getSpuId
().
concat
(
StringUtils
.
right
(
String
.
valueOf
(
System
.
nanoTime
()),
5
)));
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsCouponAddSkuParam.java
View file @
5576fcf5
...
@@ -89,9 +89,9 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
...
@@ -89,9 +89,9 @@ public class GoblinStoreMgtGoodsCouponAddSkuParam implements Serializable {
@ApiModelProperty
(
position
=
31
,
required
=
true
,
value
=
"开始时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2024-01-01 00:00:00"
)
@ApiModelProperty
(
position
=
31
,
required
=
true
,
value
=
"开始时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2024-01-01 00:00:00"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"开始时间格式有误"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"开始时间格式有误"
)
@NotNull
(
message
=
"参数'开始时间'不可为空"
)
@NotNull
(
message
=
"参数'开始时间'不可为空"
)
private
String
effect
Time
;
private
String
effect
At
;
@ApiModelProperty
(
position
=
32
,
required
=
true
,
value
=
"结束时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2024-12-31 00:00:00"
)
@ApiModelProperty
(
position
=
32
,
required
=
true
,
value
=
"结束时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2024-12-31 00:00:00"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"结束时间格式有误"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"结束时间格式有误"
)
@NotNull
(
message
=
"参数'结束时间'不可为空"
)
@NotNull
(
message
=
"参数'结束时间'不可为空"
)
private
String
expire
Time
;
private
String
expire
At
;
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsCouponEditSkuParam.java
View file @
5576fcf5
...
@@ -54,11 +54,11 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
...
@@ -54,11 +54,11 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
@ApiModelProperty
(
position
=
18
,
required
=
true
,
value
=
"结束时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2024-01-01 00:00:00"
)
@ApiModelProperty
(
position
=
18
,
required
=
true
,
value
=
"结束时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2024-01-01 00:00:00"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"开始时间格式有误"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"开始时间格式有误"
)
@NotNull
(
message
=
"参数'开始时间'不可为空"
)
@NotNull
(
message
=
"参数'开始时间'不可为空"
)
private
String
effect
Time
;
private
String
effect
At
;
@ApiModelProperty
(
position
=
19
,
required
=
true
,
value
=
"结束时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2024-12-31 00:00:00"
)
@ApiModelProperty
(
position
=
19
,
required
=
true
,
value
=
"结束时间[yyyy-MM-dd HH:mm:ss]"
,
example
=
"2024-12-31 00:00:00"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"结束时间格式有误"
)
@Pattern
(
regexp
=
LnsRegex
.
Valid
.
DATETIME_FULL
,
message
=
"结束时间格式有误"
)
@NotNull
(
message
=
"参数'结束时间'不可为空"
)
@NotNull
(
message
=
"参数'结束时间'不可为空"
)
private
String
expire
Time
;
private
String
expire
At
;
public
GoblinGoodsSkuInfoVo
initEditGoodsSkuInfoVo
()
{
public
GoblinGoodsSkuInfoVo
initEditGoodsSkuInfoVo
()
{
...
@@ -72,8 +72,8 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
...
@@ -72,8 +72,8 @@ public class GoblinStoreMgtGoodsCouponEditSkuParam implements Serializable {
goodsSkuInfoVo
.
setIsTrueName
(
Integer
.
valueOf
(
this
.
getIsTrueName
()));
goodsSkuInfoVo
.
setIsTrueName
(
Integer
.
valueOf
(
this
.
getIsTrueName
()));
goodsSkuInfoVo
.
setUseScope
(
Integer
.
valueOf
(
this
.
getUseScope
()));
goodsSkuInfoVo
.
setUseScope
(
Integer
.
valueOf
(
this
.
getUseScope
()));
goodsSkuInfoVo
.
setValFace
(
this
.
getValFace
());
goodsSkuInfoVo
.
setValFace
(
this
.
getValFace
());
goodsSkuInfoVo
.
setEffectAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
this
.
getEffect
Time
()));
goodsSkuInfoVo
.
setEffectAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
this
.
getEffect
At
()));
goodsSkuInfoVo
.
setExpireAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
this
.
getExpire
Time
()));
goodsSkuInfoVo
.
setExpireAt
(
DateUtil
.
Formatter
.
yyyyMMddHHmmss
.
parse
(
this
.
getExpire
At
()));
return
goodsSkuInfoVo
;
return
goodsSkuInfoVo
;
}
}
}
}
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