From f489850355bae6d690b2d3e6d0627f90bde79b1d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 九月 2024 18:59:51 +0800
Subject: [PATCH] 1.优惠券记录新增category查询字段 2.小程序-商品历史记录根据更新时间排序 3.优惠券-用户优惠券控制已下架的优惠券不可重新上架，及当前优惠券的已经发放的情况下不可再次下发
---
src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java
index 4b51ad0..50a553a 100644
--- a/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java
+++ b/src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplatePointController.java
@@ -65,8 +65,9 @@
@PutMapping("/{id}")
@ApiOperation(value = "修改", notes = "修改")
- public ResponseEntity<ReturnDataDTO> update(@Validated @RequestBody CreateCouponTemplatePointDTO dto) {
+ public ResponseEntity<ReturnDataDTO> update(@PathVariable String id,@Validated @RequestBody CreateCouponTemplatePointDTO dto) {
// 信息校验
+ dto.setId(id);
valid(dto);
CouponTemplateDO couponTemplateDO = couponTemplateService.getById(dto.getId());
@@ -75,6 +76,7 @@
}
CreateCouponTemplateBO couponTemplateBO = new CreateCouponTemplateBO();
+ BeanUtils.copyProperties(couponTemplateDO,couponTemplateBO);
BeanUtils.copyProperties(dto, couponTemplateBO);
// 设置成积分优惠券
@@ -153,9 +155,9 @@
return returnData(R.SUCCESS.getCode(), null);
}
- @PutMapping("/batch/expire")
+ @PostMapping("/batch/expire")
@ApiOperation(value = "批量下架", notes = "批量下架")
- public ResponseEntity<ReturnDataDTO> expireBatch(BatchCouponTemplateDTO dto) {
+ public ResponseEntity<ReturnDataDTO> expireBatch(@RequestBody BatchCouponTemplateDTO dto) {
couponTemplateService.expireBatchCouponTemplate(dto);
@@ -165,9 +167,9 @@
- @PutMapping("/batch/active")
+ @PostMapping("/batch/active")
@ApiOperation(value = "批量发布", notes = "批量发布")
- public ResponseEntity<ReturnDataDTO> activeBatch(BatchCouponTemplateDTO dto) {
+ public ResponseEntity<ReturnDataDTO> activeBatch(@RequestBody BatchCouponTemplateDTO dto) {
couponTemplateService.activeBatchCouponTemplate(dto);
@@ -175,9 +177,9 @@
}
- @DeleteMapping("/batch/del")
+ @PostMapping("/batch/del")
@ApiOperation(value = "批量删除", notes = "批量删除")
- public ResponseEntity<ReturnDataDTO> deleteBatch(BatchCouponTemplateDTO dto) {
+ public ResponseEntity<ReturnDataDTO> deleteBatch(@RequestBody BatchCouponTemplateDTO dto) {
couponTemplateService.deleteBatchCouponTemplate(dto);
return returnData(R.SUCCESS.getCode(), null);
--
Gitblit v1.9.3