From ae9c2b4c7f1f1577584beb5a9d31f4fa69ab47ff Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 27 九月 2024 16:26:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/v2/coupon/CouponRecordController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/coupon/CouponRecordController.java b/src/main/java/com/mzl/flower/web/v2/coupon/CouponRecordController.java
index 9cd7758..4bc4d77 100644
--- a/src/main/java/com/mzl/flower/web/v2/coupon/CouponRecordController.java
+++ b/src/main/java/com/mzl/flower/web/v2/coupon/CouponRecordController.java
@@ -42,7 +42,6 @@
private CouponTemplateService2 couponTemplateService;
-
@PostMapping("")
@ApiOperation(value = "新增", notes = "新增")
public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateCouponRecordDTO dto) {
@@ -59,14 +58,15 @@
throw new ValidationException("优惠券已下架");
}
-
couponRecordService.createCouponRecord(dto);
return returnData(R.SUCCESS.getCode(), null);
}
@PutMapping("/{id}")
@ApiOperation(value = "修改", notes = "修改")
- public ResponseEntity<ReturnDataDTO> update(@Validated @RequestBody CreateCouponRecordDTO dto) {
+ public ResponseEntity<ReturnDataDTO> update(@PathVariable String id,@Validated @RequestBody CreateCouponRecordDTO dto) {
+
+ dto.setId(id);
CouponRecordDO couponRecordDO= couponRecordService.getById(dto.getId());
if(null==couponRecordDO){
--
Gitblit v1.9.3