记得上下班打卡 | git大法好,push需谨慎

Commit 8e33d96e authored by 张国柄's avatar 张国柄

~API:商城活动:优惠券编辑+约束:活动中不可编辑;

parent 16ac2d9a
...@@ -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()) {
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
149014=SKU编辑失败,规格信息有误 149014=SKU编辑失败,规格信息有误
149015=SKU添加失败,重复的规格信息 149015=SKU添加失败,重复的规格信息
149016=请先将商品下架后操作 149016=请先将商品下架后操作
149017=请先将活动停用后操作
148001=库存不足 148001=库存不足
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment