From 03f1f3372a10a08f96f3308bfa099e86a55046d0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 30 一月 2024 09:32:38 +0800
Subject: [PATCH] 修改数据权限bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java
index 33cf898..1b171c7 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityGoodsServiceImpl.java
@@ -7,9 +7,8 @@
import com.ruoyi.goods.domain.vo.MgtActivityGoodsListVo;
import com.ruoyi.goods.mapper.activity.ActivityGoodsMapper;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
+import com.ruoyi.goods.service.activity.ActivityRecordService;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
-
-
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -29,15 +28,18 @@
@Resource
private ActivityGoodsMapper activityGoodsMapper;
+ @Resource
+ private ActivityRecordService activityRecordService;
+
/**
* 通过id获取活动商品
* @param goodsId
* @return
*/
@Override
- public ActivityGoods getByGoodsId(String goodsId){
+ public ActivityGoods getByGoodsId(String activityId,String goodsId){
LambdaQueryWrapper<ActivityGoods> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.eq(ActivityGoods::getDelFlag, 0).eq(ActivityGoods::getGoodsId, goodsId);
+ queryWrapper.eq(ActivityGoods::getDelFlag, 0).eq(ActivityGoods::getActivityId, activityId).eq(ActivityGoods::getGoodsId, goodsId);
ActivityGoods activityGoods = this.getOne(queryWrapper,false);
return activityGoods;
}
@@ -69,4 +71,19 @@
public List<MgtActivityGoodsListVo> listVoByActivityId(String activityId){
return activityGoodsMapper.listVoByActivityId(activityId);
}
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/7/12 20:35
+ * @param activityId
+ * @return List<ActivityGoods>
+ */
+ @Override
+ public List<ActivityGoods> listByActivityId(String activityId){
+ LambdaQueryWrapper<ActivityGoods> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ActivityGoods::getDelFlag,0);
+ queryWrapper.eq(ActivityGoods::getActivityId,activityId);
+ return this.list(queryWrapper);
+ }
}
--
Gitblit v1.7.1