From 5c0172fa32dc8f9f68d4d921a6e19e8697ea52e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Tue, 5 Mar 2024 16:58:28 +0800 Subject: [PATCH] bug --- .../controller/ActiveOneCouponController.java | 10 ++++++++++ .../cardGift/controller/CardGiftController.java | 2 ++ .../cardGift/service/impl/CardGiftServiceImpl.java | 3 +++ 3 files changed, 15 insertions(+) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java index 778c985f8..125dd9367 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java @@ -89,5 +89,15 @@ public class ActiveOneCouponController extends BaseController { return getSuccessResult(this.activeOneCouponService.removeByIds(idList)); } + /** + * 删除数据 + * @param id + * @return + */ + @DeleteMapping("/delById/{id}") + public ResponseObject deleteById(@PathVariable Long id) { + return getSuccessResult(this.activeOneCouponService.removeById(id)); + } + } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java index 8b4e43621..4ae051375 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.io.Serializable; import java.net.URLEncoder; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -95,6 +96,7 @@ public class CardGiftController extends BaseController { */ @PutMapping public ResponseObject update(@RequestBody CardGift cardGift) { + cardGift.setSailTime(new Date()); return getSuccessResult(this.cardGiftService.updateById(cardGift)); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java index d25b2790e..4476adf2e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java @@ -159,6 +159,9 @@ public class CardGiftServiceImpl extends ServiceImpl i if(ObjectUtils.isNotEmpty(cardGift.getSailStatus())) { queryWrapper.eq(CardGift::getSailStatus,cardGift.getSailStatus()); } + if(ObjectUtils.isNotEmpty(cardGift.getActivateStatus())) { + queryWrapper.eq(CardGift::getActivateStatus,cardGift.getActivateStatus()); + } if(ObjectUtils.isNotEmpty(cardGift.getCardAmount())) { queryWrapper.eq(CardGift::getCardAmount,cardGift.getCardAmount()); }