客服链接参数实体更名

src/main/java/com/yaoyaozw/customer/controller/CustomerDelayTextController.java

@@ -4,7 +4,7 @@ import com.yaoyaozw.customer.annotations.AccountOperateControl;
 import com.yaoyaozw.customer.annotations.OperateLog;
 import com.yaoyaozw.customer.common.GenericsResult;
 import com.yaoyaozw.customer.dto.customer.CustomerDelayTextSaveDTO;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.enums.AccountParamType;
 import com.yaoyaozw.customer.enums.AccountTableColumnType;
 import com.yaoyaozw.customer.service.CustomerDelayTextService;
@@ -37,7 +37,7 @@ public class CustomerDelayTextController {
     @ApiOperation("新增客服内容")
     @PostMapping("/insertCustomerContent")
     @OperateLog(module = "延时客服-文本", desc = "新增文本延时客服子素材")
-    public GenericsResult<CustomerDelayTextDetailVO> insertCustomerContent(@RequestBody CustomerReferralDTO referralDto) {
+    public GenericsResult<CustomerDelayTextDetailVO> insertCustomerContent(@RequestBody CommonReferralBody referralDto) {
         return textService.insertCustomerContent(referralDto);
     }
 

src/main/java/com/yaoyaozw/customer/controller/CustomerMessageTextController.java

@@ -3,7 +3,7 @@ package com.yaoyaozw.customer.controller;
 import com.yaoyaozw.customer.annotations.OperateLog;
 import com.yaoyaozw.customer.common.GenericsResult;
 import com.yaoyaozw.customer.dto.customer.CustomerMessageTextSaveDTO;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.service.CustomerGraphicsTextService;
 import com.yaoyaozw.customer.vo.customer.CustomerMessageTextDetailVO;
 import io.swagger.annotations.Api;
@@ -33,7 +33,7 @@ public class CustomerMessageTextController {
     @ApiOperation("新增客服内容")
     @PostMapping("/insertCustomerContent")
     @OperateLog(module = "客服消息-文本", desc = "新增文本客服消息子素材")
-    public GenericsResult<CustomerMessageTextDetailVO> insertCustomerContent(@RequestBody CustomerReferralDTO referralDto) {
+    public GenericsResult<CustomerMessageTextDetailVO> insertCustomerContent(@RequestBody CommonReferralBody referralDto) {
         return textService.insertCustomerContent(referralDto);
     }
 

src/main/java/com/yaoyaozw/customer/dto/customer/CustomerDelaySaveDTO.java

 package com.yaoyaozw.customer.dto.customer;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,7 +47,7 @@ public class CustomerDelaySaveDTO implements Serializable {
     private Integer isPay;
 
     @ApiModelProperty("消息内容实体")
-    private CustomerReferralDTO customerReferralDto;
+    private CommonReferralBody customerReferralDto;
 
     private Integer hour;
 

src/main/java/com/yaoyaozw/customer/dto/customer/CustomerMessageSaveDTO.java

 package com.yaoyaozw.customer.dto.customer;
 
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,6 +38,6 @@ public class CustomerMessageSaveDTO implements Serializable {
     private String content;
 
     @ApiModelProperty("链接相关内容")
-    private CustomerReferralDTO customerReferralDto;
+    private CommonReferralBody customerReferralDto;
 
 }

src/main/java/com/yaoyaozw/customer/dto/customer/CustomerReferralDTO.java → src/main/java/com/yaoyaozw/customer/entity/CommonReferralBody.java

-package com.yaoyaozw.customer.dto.customer;
+package com.yaoyaozw.customer.entity;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -20,7 +20,7 @@ import java.util.List;
  * @date 2022/10/8 12:00
  */
 @Data
-public class CustomerReferralDTO implements Serializable {
+public class CommonReferralBody implements Serializable {
 
     @ApiModelProperty("客服素材主体id")
     @JsonSerialize(using = ToStringSerializer.class)

src/main/java/com/yaoyaozw/customer/service/CustomerDelayTextService.java

@@ -3,7 +3,7 @@ package com.yaoyaozw.customer.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yaoyaozw.customer.common.GenericsResult;
 import com.yaoyaozw.customer.dto.customer.CustomerDelayTextSaveDTO;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.entity.CustomerGraphicsDelay;
 import com.yaoyaozw.customer.vo.customer.CustomerDelayTextDetailVO;
 
@@ -28,7 +28,7 @@ public interface CustomerDelayTextService extends IService<CustomerGraphicsDelay
      * @param referralDto 推荐dto
      * @return {@link GenericsResult}<{@link CustomerDelayTextDetailVO}>
      */
-    GenericsResult<CustomerDelayTextDetailVO> insertCustomerContent(CustomerReferralDTO referralDto);
+    GenericsResult<CustomerDelayTextDetailVO> insertCustomerContent(CommonReferralBody referralDto);
 
     /**
      * 得到客户文本细节

src/main/java/com/yaoyaozw/customer/service/CustomerGraphicsTextService.java

@@ -3,7 +3,7 @@ package com.yaoyaozw.customer.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yaoyaozw.customer.common.GenericsResult;
 import com.yaoyaozw.customer.dto.customer.CustomerMessageTextSaveDTO;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.entity.CustomerGraphics;
 import com.yaoyaozw.customer.vo.customer.CustomerMessageTextDetailVO;
 
@@ -28,7 +28,7 @@ public interface CustomerGraphicsTextService extends IService<CustomerGraphics>
      * @param referralDto 推荐dto
      * @return {@link GenericsResult}<{@link CustomerMessageTextDetailVO}>
      */
-    GenericsResult<CustomerMessageTextDetailVO> insertCustomerContent(CustomerReferralDTO referralDto);
+    GenericsResult<CustomerMessageTextDetailVO> insertCustomerContent(CommonReferralBody referralDto);
 
     /**
      * 获取文本客服详情

src/main/java/com/yaoyaozw/customer/service/impl/CustomerDelayTextServiceImpl.java

@@ -5,21 +5,17 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yaoyaozw.customer.common.BaseResult;
 import com.yaoyaozw.customer.common.GenericsResult;
 import com.yaoyaozw.customer.components.CustomerServiceCommonAsyncComponent;
 import com.yaoyaozw.customer.components.SnowflakeComponent;
 import com.yaoyaozw.customer.components.TokenManager;
 import com.yaoyaozw.customer.constants.CustomerCommonConstant;
 import com.yaoyaozw.customer.dto.customer.CustomerDelayTextSaveDTO;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
-import com.yaoyaozw.customer.entity.AuthorizerInfo;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.entity.CustomerGraphicsDelay;
 import com.yaoyaozw.customer.entity.ReferralEntity;
 import com.yaoyaozw.customer.mapper.CustomerGraphicsDelayMapper;
-import com.yaoyaozw.customer.mapper.KanbanCommonMapper;
 import com.yaoyaozw.customer.mapper.MaterialCommonMapper;
-import com.yaoyaozw.customer.service.AuthorizerInfoService;
 import com.yaoyaozw.customer.service.CustomerDelayTextService;
 import com.yaoyaozw.customer.service.CustomerGraphicsDelayService;
 import com.yaoyaozw.customer.service.ReferralEntityService;
@@ -30,9 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -102,7 +96,7 @@ public class CustomerDelayTextServiceImpl extends ServiceImpl<CustomerGraphicsDe
     }
 
     @Override
-    public GenericsResult<CustomerDelayTextDetailVO> insertCustomerContent(CustomerReferralDTO referralDto) {
+    public GenericsResult<CustomerDelayTextDetailVO> insertCustomerContent(CommonReferralBody referralDto) {
 
         // 处理活动数据
         ReferralEntity referralEntity = new ReferralEntity();
@@ -174,7 +168,7 @@ public class CustomerDelayTextServiceImpl extends ServiceImpl<CustomerGraphicsDe
             }
 
             // 赋值链接信息
-            CustomerReferralDTO customerReferralDto = new CustomerReferralDTO();
+            CommonReferralBody customerReferralDto = new CommonReferralBody();
             BeanUtil.copyProperties(item, customerReferralDto);
 
             customerContentVO.setCustomerReferralDto(customerReferralDto);

src/main/java/com/yaoyaozw/customer/service/impl/CustomerGraphicsDelayServiceImpl.java

@@ -15,7 +15,7 @@ import com.yaoyaozw.customer.components.TokenManager;
 import com.yaoyaozw.customer.constants.CustomerCommonConstant;
 import com.yaoyaozw.customer.dto.customer.CustomerDelayQueryDTO;
 import com.yaoyaozw.customer.dto.customer.CustomerDelaySaveDTO;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.entity.AuthorizerInfo;
 import com.yaoyaozw.customer.entity.CustomerGraphicsDelay;
 import com.yaoyaozw.customer.entity.ReferralEntity;
@@ -23,7 +23,6 @@ import com.yaoyaozw.customer.mapper.CustomerGraphicsDelayMapper;
 import com.yaoyaozw.customer.mapper.KanbanCommonMapper;
 import com.yaoyaozw.customer.mapper.MaterialCommonMapper;
 import com.yaoyaozw.customer.service.AuthorizerInfoService;
-import com.yaoyaozw.customer.service.CustomerDelayTextService;
 import com.yaoyaozw.customer.service.CustomerGraphicsDelayService;
 import com.yaoyaozw.customer.service.ReferralEntityService;
 import com.yaoyaozw.customer.vo.AuthInfoVO;
@@ -38,7 +37,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -177,12 +175,12 @@ public class CustomerGraphicsDelayServiceImpl extends ServiceImpl<CustomerGraphi
         ReferralEntity referralEntity = referralEntityService.getOne(new QueryWrapper<ReferralEntity>().eq("material_graphics_id", id));
 
         if (ObjectUtil.isNotNull(referralEntity)) {
-            CustomerReferralDTO customerReferralDto = new CustomerReferralDTO();
+            CommonReferralBody customerReferralDto = new CommonReferralBody();
             BeanUtil.copyProperties(referralEntity, customerReferralDto);
 
             customerDelayGraphicsDetailVO.setCustomerReferralDto(customerReferralDto);
         } else {
-            customerDelayGraphicsDetailVO.setCustomerReferralDto(new CustomerReferralDTO());
+            customerDelayGraphicsDetailVO.setCustomerReferralDto(new CommonReferralBody());
         }
 
         AuthInfoVO authInfoVO = super.baseMapper.getCustomerDelayAuthInfo(id);

src/main/java/com/yaoyaozw/customer/service/impl/CustomerGraphicsServiceImpl.java

@@ -16,7 +16,7 @@ import com.yaoyaozw.customer.dto.customer.CustomerMessageQueryDTO;
 import com.yaoyaozw.customer.dto.customer.CustomerMessageSaveDTO;
 import com.yaoyaozw.customer.dto.integration.IntegrationRequestDTO;
 import com.yaoyaozw.customer.entity.AuthorizerToken;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.entity.CrowdPackageCondition;
 import com.yaoyaozw.customer.entity.CrowdPackageConditionMatch;
 import com.yaoyaozw.customer.entity.ReferralEntity;
@@ -47,7 +47,6 @@ import com.yaoyaozw.customer.service.CustomerGraphicsService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.toCollection;
 
 /**
@@ -131,7 +130,7 @@ public class CustomerGraphicsServiceImpl extends ServiceImpl<CustomerGraphicsMap
 
         // 获取链接数据
         ReferralEntity referralEntity = referralEntityService.getOne(new QueryWrapper<ReferralEntity>().eq("material_graphics_id", id).isNull("account_id"));
-        CustomerReferralDTO customerReferralDto = new CustomerReferralDTO();
+        CommonReferralBody customerReferralDto = new CommonReferralBody();
 
         if (ObjectUtil.isNull(referralEntity)) {
             return new GenericsResult<>(false, "找不到链接数据");

src/main/java/com/yaoyaozw/customer/service/impl/CustomerGraphicsTextServiceImpl.java

@@ -10,7 +10,7 @@ import com.yaoyaozw.customer.components.SnowflakeComponent;
 import com.yaoyaozw.customer.components.TokenManager;
 import com.yaoyaozw.customer.constants.CustomerCommonConstant;
 import com.yaoyaozw.customer.dto.customer.CustomerMessageTextSaveDTO;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.entity.CustomerGraphics;
 import com.yaoyaozw.customer.entity.ReferralEntity;
 import com.yaoyaozw.customer.mapper.CustomerGraphicsMapper;
@@ -73,7 +73,7 @@ public class CustomerGraphicsTextServiceImpl extends ServiceImpl<CustomerGraphic
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public GenericsResult<CustomerMessageTextDetailVO> insertCustomerContent(CustomerReferralDTO referralDto) {
+    public GenericsResult<CustomerMessageTextDetailVO> insertCustomerContent(CommonReferralBody referralDto) {
 
         // 处理活动数据
         ReferralEntity referralEntity = new ReferralEntity();
@@ -136,7 +136,7 @@ public class CustomerGraphicsTextServiceImpl extends ServiceImpl<CustomerGraphic
             }
 
             // 赋值链接信息
-            CustomerReferralDTO customerReferralDto = new CustomerReferralDTO();
+            CommonReferralBody customerReferralDto = new CommonReferralBody();
             BeanUtil.copyProperties(item, customerReferralDto);
 
             customerContentVO.setCustomerReferralDto(customerReferralDto);

src/main/java/com/yaoyaozw/customer/vo/customer/CustomerContentVO.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yaoyaozw.customer.constants.CustomerCommonConstant;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +26,7 @@ public class CustomerContentVO implements Serializable {
     private String content;
 
     @ApiModelProperty("链接相关内容")
-    private CustomerReferralDTO customerReferralDto;
+    private CommonReferralBody customerReferralDto;
 
     @ApiModelProperty("是否可编辑")
     private Boolean editable;

src/main/java/com/yaoyaozw/customer/vo/customer/CustomerDelayGraphicsDetailVO.java

@@ -3,7 +3,7 @@ package com.yaoyaozw.customer.vo.customer;
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import com.yaoyaozw.customer.vo.AuthInfoVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -51,7 +51,7 @@ public class CustomerDelayGraphicsDetailVO implements Serializable {
     private Long timeInterval;
 
     @ApiModelProperty("链接相关内容")
-    private CustomerReferralDTO customerReferralDto;
+    private CommonReferralBody customerReferralDto;
 
     private AuthInfoVO authInfoVo;
 

src/main/java/com/yaoyaozw/customer/vo/customer/CustomerMessageDetailVO.java

@@ -2,7 +2,7 @@ package com.yaoyaozw.customer.vo.customer;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.yaoyaozw.customer.dto.customer.CustomerReferralDTO;
+import com.yaoyaozw.customer.entity.CommonReferralBody;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -41,6 +41,6 @@ public class CustomerMessageDetailVO implements Serializable {
     private String content;
 
     @ApiModelProperty("链接相关内容")
-    private CustomerReferralDTO customerReferralDto;
+    private CommonReferralBody customerReferralDto;
 
 }