记得上下班打卡 | 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
8e33d96e
Commit
8e33d96e
authored
Mar 06, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~API:商城活动:优惠券编辑+约束:活动中不可编辑;
parent
16ac2d9a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
GoblinStoreMgtCouponController.java
...lin/controller/manage/GoblinStoreMgtCouponController.java
+12
-1
errors.properties
...-service-goblin-impl/src/main/resources/errors.properties
+1
-0
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtCouponController.java
View file @
8e33d96e
...
@@ -275,7 +275,7 @@ public class GoblinStoreMgtCouponController {
...
@@ -275,7 +275,7 @@ public class GoblinStoreMgtCouponController {
}
}
@ApiOperationSupport
(
order
=
6
)
@ApiOperationSupport
(
order
=
6
)
@ApiOperation
(
value
=
"优惠券编辑"
,
notes
=
"只修改基本信息,不包含发放设置修改"
)
@ApiOperation
(
value
=
"优惠券编辑"
)
@PostMapping
(
"edit"
)
@PostMapping
(
"edit"
)
public
ResponseDto
<
Object
>
edit
(
@Valid
@RequestBody
GoblinStoreMgtCouponAddParam
mgtCouponEditParam
)
{
public
ResponseDto
<
Object
>
edit
(
@Valid
@RequestBody
GoblinStoreMgtCouponAddParam
mgtCouponEditParam
)
{
String
currentUid
=
CurrentUtil
.
getCurrentUid
(),
storeId
=
mgtCouponEditParam
.
getStoreId
();
String
currentUid
=
CurrentUtil
.
getCurrentUid
(),
storeId
=
mgtCouponEditParam
.
getStoreId
();
...
@@ -289,6 +289,9 @@ public class GoblinStoreMgtCouponController {
...
@@ -289,6 +289,9 @@ public class GoblinStoreMgtCouponController {
||
!
storeId
.
equals
(
storeCouponVo
.
getStoreId
()))
{
||
!
storeId
.
equals
(
storeCouponVo
.
getStoreId
()))
{
return
ResponseDto
.
failure
(
ErrorCode
.
HTTP_PARAM_ERROR
.
getCode
(),
"参数无效:优惠券ID"
);
return
ResponseDto
.
failure
(
ErrorCode
.
HTTP_PARAM_ERROR
.
getCode
(),
"参数无效:优惠券ID"
);
}
}
if
(
storeCouponVo
.
getState
().
equals
(
"1"
))
{
// 活动中不可编辑
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"149017"
));
}
if
(!
storeCouponVo
.
getType
().
equals
(
mgtCouponEditParam
.
getType
()))
{
if
(!
storeCouponVo
.
getType
().
equals
(
mgtCouponEditParam
.
getType
()))
{
return
ResponseDto
.
failure
(
ErrorCode
.
HTTP_PARAM_ERROR
.
getCode
(),
"卡券类型不可变更"
);
return
ResponseDto
.
failure
(
ErrorCode
.
HTTP_PARAM_ERROR
.
getCode
(),
"卡券类型不可变更"
);
}
}
...
@@ -308,6 +311,14 @@ public class GoblinStoreMgtCouponController {
...
@@ -308,6 +311,14 @@ public class GoblinStoreMgtCouponController {
storeCouponBasicVo
.
setType
(
storeCouponVo
.
getType
());
storeCouponBasicVo
.
setType
(
storeCouponVo
.
getType
());
storeCouponBasicVo
.
setState
(
storeCouponVo
.
getState
());
storeCouponBasicVo
.
setState
(
storeCouponVo
.
getState
());
storeCouponBasicVo
.
setStock
(
storeCouponVo
.
getStock
());
// 这里库存不允许编辑修改,只可在列表页编辑'增减库存'
storeCouponBasicVo
.
setStock
(
storeCouponVo
.
getStock
());
// 这里库存不允许编辑修改,只可在列表页编辑'增减库存'
// storeCouponBasicVo.setTriggers(storeCouponVo.getTriggers());
// storeCouponBasicVo.setValFace(storeCouponVo.getValFace());
// storeCouponBasicVo.setDiscount(storeCouponVo.getDiscount());
// storeCouponBasicVo.setValOver(storeCouponVo.getValOver());
// storeCouponBasicVo.setValMinus(storeCouponVo.getValMinus());
// storeCouponBasicVo.setDeduction(storeCouponVo.getDeduction());
switch
(
storeCouponBasicVo
.
getType
())
{
switch
(
storeCouponBasicVo
.
getType
())
{
case
"1"
:
// 代金
case
"1"
:
// 代金
if
(
null
==
mgtCouponEditParam
.
getValFace
())
{
if
(
null
==
mgtCouponEditParam
.
getValFace
())
{
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/errors.properties
View file @
8e33d96e
...
@@ -40,6 +40,7 @@
...
@@ -40,6 +40,7 @@
149014
=
SKU编辑失败,规格信息有误
149014
=
SKU编辑失败,规格信息有误
149015
=
SKU添加失败,重复的规格信息
149015
=
SKU添加失败,重复的规格信息
149016
=
请先将商品下架后操作
149016
=
请先将商品下架后操作
149017
=
请先将活动停用后操作
148001
=
库存不足
148001
=
库存不足
...
...
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