客户分析提交

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/MarketingCampaignDTO.java

@@ -192,7 +192,7 @@ public class MarketingCampaignDTO extends Page {
     private List<Long> idList;
 
     @ApiModelProperty(value = "关联客户id")
-    private List<Long> customerIdList;
+    private List<Long> customerAnalysisIdList;
 
 
 }

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/CustomerBaseEntity.java

@@ -11,8 +11,8 @@ import lombok.Data;
 public class CustomerBaseEntity extends SysBaseField {
 
     @ApiModelProperty(value = "客户id")
-    @TableField("customer_id")
-    private Long customerId;
+    @TableField("customer_analysis_id")
+    private Long customerAnalysisId;
 
     @ApiModelProperty(value = "营销活动id")
     @TableField("marketing_campaign_id")

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

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.storlead.trade.dto.MarketingCampaignDTO;
+import com.storlead.trade.entity.CustomerAnalysisResultEntity;
 import com.storlead.trade.entity.CustomerBaseEntity;
 import com.storlead.trade.entity.MarketingCampaignEntity;
 import com.storlead.trade.mapper.MarketingCampaignEntityMapper;
+import com.storlead.trade.service.CustomerAnalysisResultEntityService;
 import com.storlead.trade.service.CustomerBaseEntityService;
 import com.storlead.trade.service.MarketingCampaignEntityService;
 import com.storlead.trade.vo.MarketingCampaignVO;
@@ -33,6 +35,8 @@ public class MarketingCampaignEntityServiceImpl
 
     @Resource
     private CustomerBaseEntityService customerBaseEntityService;
+    @Resource
+    private CustomerAnalysisResultEntityService customerAnalysisResultEntityService;
     @Override
     public Result<Object> getList(MarketingCampaignDTO marketingCampaignDTO) {
         IPage<MarketingCampaignVO> pageVO = new Page<>(marketingCampaignDTO.getPageIndex(), marketingCampaignDTO.getPageSize());
@@ -47,15 +51,27 @@ public class MarketingCampaignEntityServiceImpl
             return Result.ok(pageVO);
         }
         List<MarketingCampaignVO> marketingCampaignVOList = pageVO.getRecords();
+
         List<Long> marketingCampaignIdList = marketingCampaignVOList.stream().map(MarketingCampaignVO::getId).collect(Collectors.toList());
         LambdaQueryWrapper<CustomerBaseEntity> customerBaseEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
         customerBaseEntityLambdaQueryWrapper.in(CustomerBaseEntity::getMarketingCampaignId, marketingCampaignIdList);
         customerBaseEntityLambdaQueryWrapper.eq(CustomerBaseEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
         List<CustomerBaseEntity> customerBaseEntityList = customerBaseEntityService.list(customerBaseEntityLambdaQueryWrapper);
         //获取全部的关联客户id
-        List<Long> customerIdList = customerBaseEntityList.stream().map(CustomerBaseEntity::getCustomerId).collect(Collectors.toList());
-//        LambdaQueryWrapper<CustomerEntity> customerBaseEntityQueryWrapper = new LambdaQueryWrapper<>();
+        List<Long> customerAnalysisIdList = customerBaseEntityList.stream().map(CustomerBaseEntity::getCustomerAnalysisId).collect(Collectors.toList());
+        LambdaQueryWrapper<CustomerAnalysisResultEntity> customerAnalysisEntityQueryWrapper = new LambdaQueryWrapper<>();
+        customerAnalysisEntityQueryWrapper.eq(CustomerAnalysisResultEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
+        customerAnalysisEntityQueryWrapper.in(CustomerAnalysisResultEntity::getId, customerAnalysisIdList);
+        List<CustomerAnalysisResultEntity> customerAnalysisResultEntityList = customerAnalysisResultEntityService.list(customerAnalysisEntityQueryWrapper);
+        //将customerAnalysisResultEntityList按照customerBaseEntityList对应的id写入pageVO的customerList中
 
+        for (int i = 0; i < marketingCampaignVOList.size(); i++) {
+            int finalI = i;
+            List<CustomerBaseEntity> customerBaseList = customerBaseEntityList.stream().filter(customerBaseEntity -> customerBaseEntity.getCustomerAnalysisId().equals(customerAnalysisResultEntityList.get(finalI).getId())).collect(Collectors.toList());
+            List<Long> customerAnalysisResultIdList = customerBaseList.stream().filter(e -> e.getMarketingCampaignId().equals(marketingCampaignVOList.get(finalI).getId())).map(CustomerBaseEntity::getCustomerAnalysisId).collect(Collectors.toList());
+            List<CustomerAnalysisResultEntity> customerAnalysisResultEntityListI = customerAnalysisResultEntityList.stream().filter(customerAnalysisResultEntity -> customerAnalysisResultIdList.contains(customerAnalysisResultEntity.getId())).collect(Collectors.toList());
+            marketingCampaignVOList.get(i).setCustomerList(customerAnalysisResultEntityListI);
+        }
 
         return Result.ok(pageVO);
     }
@@ -70,12 +86,12 @@ public class MarketingCampaignEntityServiceImpl
             return Result.error("添加失败");
         }
         //添加关联客户
-        List<Long> customerIdList = marketingCampaignDTO.getCustomerIdList();
+        List<Long> customerIdList = marketingCampaignDTO.getCustomerAnalysisIdList();
         if (!CollectionUtils.isEmpty(customerIdList)) {
             List<CustomerBaseEntity> customerBaseEntityList = new ArrayList<>();
             for (Long customerId : customerIdList) {
                 CustomerBaseEntity customerBaseEntity = new CustomerBaseEntity();
-                customerBaseEntity.setCustomerId(customerId);
+                customerBaseEntity.setCustomerAnalysisId(customerId);
                 customerBaseEntity.setMarketingCampaignId(marketingCampaignEntity.getId());
                 customerBaseEntityList.add(customerBaseEntity);
             }
@@ -96,7 +112,7 @@ public class MarketingCampaignEntityServiceImpl
             return Result.error("修改失败");
         }
         //添加关联客户
-        List<Long> customerIdList = marketingCampaignDTO.getCustomerIdList();
+        List<Long> customerIdList = marketingCampaignDTO.getCustomerAnalysisIdList();
         LambdaUpdateWrapper<CustomerBaseEntity> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(CustomerBaseEntity::getMarketingCampaignId, marketingCampaignEntity.getId());
         customerBaseEntityService.remove(updateWrapper);
@@ -104,7 +120,7 @@ public class MarketingCampaignEntityServiceImpl
             List<CustomerBaseEntity> customerBaseEntityList = new ArrayList<>();
             for (Long customerId : customerIdList) {
                 CustomerBaseEntity customerBaseEntity = new CustomerBaseEntity();
-                customerBaseEntity.setCustomerId(customerId);
+                customerBaseEntity.setCustomerAnalysisId(customerId);
                 customerBaseEntity.setMarketingCampaignId(marketingCampaignEntity.getId());
                 customerBaseEntityList.add(customerBaseEntity);
             }

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/vo/MarketingCampaignVO.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.storlead.trade.entity.CustomerAnalysisResultEntity;
 import com.storlead.trade.entity.CustomerBaseEntity;
 import com.storlead.framework.mybatis.entity.SysBaseField;
 import io.swagger.annotations.ApiModelProperty;
@@ -191,5 +192,5 @@ public class MarketingCampaignVO extends SysBaseField {
     private List<Long> customerIdList;
 
     @ApiModelProperty(value = "关联客户信息")
-    private List<CustomerBaseEntity> customerList;
+    private List<CustomerAnalysisResultEntity> customerList;
 }