From f19155dcda0413563963d545eed3045364814c0d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 12 八月 2023 05:14:27 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 0970e5d..4846aa0 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
@@ -39,10 +39,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -162,6 +159,18 @@
activity.setUpdateUserId(mgtActivityEditDto.getUserId());
activity.setUpdateTime(nowTime);
activity.setRecommendFlag(mgtActivityEditDto.getRecommendFlag());
+ if(activity.getAreaFlag()==2&&activity.getShopFlag()==1&&StringUtils.isNotBlank(activity.getDesignatedArea())){
+ activity.setApplicableShop("");
+ String designatedArea = activity.getDesignatedArea();
+ List<String> cityCodes = Arrays.asList(designatedArea.split(","));
+ List<Long> shopIdList = remoteShopService.listShopIdByCityCode(cityCodes).getData();
+ if(shopIdList!=null&&!shopIdList.isEmpty()){
+ String result = shopIdList.stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ activity.setApplicableShop(result);
+ }
+ }
this.saveOrUpdate(activity);
// 获取活动商品信息
List<MgtActivityGoodsEditDto> mgtActivityGoodsEditDtoList = mgtActivityEditDto.getMgtActivityGoodsEditDtoList();
--
Gitblit v1.7.1