From 64251287f735a6a26bc585a8ca593c3936113137 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 07 九月 2023 18:04:47 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index 919d379..946ce64 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -409,8 +409,12 @@
* @return List<MgtActivityListVo>
*/
@Override
- public List<MgtActivityListVo> listMgtActivity(){
- return activityMapper.listMgtActivity();
+ public List<MgtActivityListVo> listMgtActivity(MgtActivityListDto mgtActivityListDto){
+ List<MgtActivityListVo> activityListVoList = new ArrayList<>();
+ if(mgtActivityListDto.getActivityFrom()!=null&&mgtActivityListDto.getActivityFrom()!=2){
+ activityListVoList = activityMapper.listMgtActivity();
+ }
+ return activityListVoList;
}
/**
@@ -662,4 +666,28 @@
return activityListVoList;
}
+
+ /**
+ * @description 判断商户是否在活动范围
+ * @author jqs
+ * @date 2023/9/7 14:13
+ * @param merActivityShopDto
+ * @return Boolean
+ */
+ @Override
+ public Boolean judgeActivityShop(MerActivityShopDto merActivityShopDto){
+ Boolean judge = false;
+ Long shopId = merActivityShopDto.getShopId();
+ Activity activity = this.getById(merActivityShopDto.getActivityId());
+ //判断是否全部商户
+ if(activity.getAreaFlag()==1&&activity.getShopFlag()==1){
+ judge = true;
+ }else{
+ //判断是否在商户范围内
+ String applicableShop = activity.getApplicableShop();
+ applicableShop = ","+applicableShop+",";
+ judge = applicableShop.contains(","+shopId.toString()+",");
+ }
+ return judge;
+ }
}
--
Gitblit v1.7.1