From a86cfc379cd61a01182942ca34fec0adcd330df0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 10 Jan 2025 10:25:33 +0800
Subject: [PATCH] fix(mall): 修复优惠券满减逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
index 57dbb83..1ca5061 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
@@ -88,8 +88,9 @@
if(ActivityTypeEnum.YOU_HUI_JUAN.getValue() == adminActivityAddDto.getType()){
mallActivity.setCouponId(adminActivityAddDto.getCouponId());
- addCouponGoods(adminActivityAddDto.getCouponId(),activityGoodsIds);
+// addCouponGoods(adminActivityAddDto.getCouponId(),activityGoodsIds);
}
+ this.baseMapper.updateById(mallActivity);
return new FebsResponse().success().data("操作成功");
}
@@ -226,4 +227,24 @@
this.baseMapper.deleteById(id);
return new FebsResponse().success().message("操作成功");
}
+
+ @Override
+ public List<AdminMallActivityListVo> getAdminActivityListByType(Integer type) {
+ List<AdminMallActivityListVo> mallActivityList = new ArrayList<>();
+ List<MallActivity> mallActivities = this.baseMapper.selectList(
+ new LambdaQueryWrapper<MallActivity>()
+ .select(MallActivity::getId, MallActivity::getName)
+ .eq(MallActivity::getState, YesOrNoOrIngEnum.YES.getValue())
+ .eq(MallActivity::getType, type)
+ );
+ if(CollUtil.isNotEmpty(mallActivities)){
+ for (MallActivity mallActivity : mallActivities) {
+ AdminMallActivityListVo adminMallActivityListVo = new AdminMallActivityListVo();
+ adminMallActivityListVo.setId(mallActivity.getId());
+ adminMallActivityListVo.setName(mallActivity.getName());
+ mallActivityList.add(adminMallActivityListVo);
+ }
+ }
+ return mallActivityList;
+ }
}
--
Gitblit v1.9.1