修改未开启

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/MarketingCampaignSopDetailController.java

@@ -397,6 +397,7 @@ public class MarketingCampaignSopDetailController {
     public Result<Object> getByCampaignId(@PathVariable Long marketingCampaignId) {
         LambdaQueryWrapper<MarketingCampaignSopDetailEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(MarketingCampaignSopDetailEntity::getMarketingId, marketingCampaignId);
+        wrapper.eq(MarketingCampaignSopDetailEntity::getIsDelete, 0);
         wrapper.orderByAsc(MarketingCampaignSopDetailEntity::getStep);
         List<MarketingCampaignSopDetailEntity> list = marketingCampaignSopDetailService.list(wrapper);
         return Result.result(list);

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignServiceImpl.java

@@ -448,14 +448,17 @@ public class MarketingCampaignServiceImpl
             marketEmailsEntityLambdaQueryWrapper.eq(MarketEmailsEntity::getHasReply, 1);
             marketEmailsEntityLambdaQueryWrapper.eq(MarketEmailsEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
             List<MarketEmailsEntity> marketEmailsEntityList = marketEmailsService.list(marketEmailsEntityLambdaQueryWrapper);
-            List<Long> marketingHasReplyIdList = marketEmailsEntityList.stream().map(MarketEmailsEntity::getMarketingCampaignId).collect(Collectors.toList());
-            if (!CollectionUtils.isEmpty(marketingHasReplyIdList)){
-                LambdaUpdateWrapper<MarketEmailsEntity> marketEmailsUpdateWrapper = new LambdaUpdateWrapper<>();
-                marketEmailsUpdateWrapper.in(MarketEmailsEntity::getMarketingCampaignId, marketingHasReplyIdList);
-                marketEmailsUpdateWrapper.eq(MarketEmailsEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-                marketEmailsUpdateWrapper.eq(MarketEmailsEntity::getStatus, -1);
-                marketEmailsUpdateWrapper.set(MarketEmailsEntity::getStatus, -3);
-                marketEmailsService.update(marketEmailsUpdateWrapper);
+
+            if (!CollectionUtils.isEmpty(marketEmailsEntityList)){
+                for (MarketEmailsEntity marketEmailsEntity : marketEmailsEntityList) {
+                    LambdaUpdateWrapper<MarketEmailsEntity> marketEmailsUpdateWrapper = new LambdaUpdateWrapper<>();
+                    marketEmailsUpdateWrapper.eq(MarketEmailsEntity::getMarketingCampaignId, marketEmailsEntity.getMarketingCampaignId());
+                    marketEmailsUpdateWrapper.eq(MarketEmailsEntity::getCustomerId, marketEmailsEntity.getCustomerId());
+                    marketEmailsUpdateWrapper.eq(MarketEmailsEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
+                    marketEmailsUpdateWrapper.eq(MarketEmailsEntity::getStatus, -1);
+                    marketEmailsUpdateWrapper.set(MarketEmailsEntity::getStatus, -3);
+                    marketEmailsService.update(marketEmailsUpdateWrapper);
+                }
             }
         }
     }