zoujiajian 2 gadi atpakaļ
vecāks
revīzija
2f9062c02c

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/entity/CorpCustomerAcquisitionLink.java

@@ -69,4 +69,9 @@ public class CorpCustomerAcquisitionLink extends BaseEntity {
      */
     private Long msgId;
 
+
+    @TableField(exist = false)
+    @DbIgnore
+    private String msgName;
+
 }

+ 66 - 0
netflix-dao/src/main/java/com/cyksj/model/views/CorpCustomerAcquisitionLinkPopularizeView.java

@@ -0,0 +1,66 @@
+package com.cyksj.model.views;
+
+import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.SearchBean;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 项目名: yhlxj
+ * 文件名: CorpCustomerAcquisitionLinkPopularizeView
+ * 创建者: JavaZou
+ * 创建时间:2023/12/8 14:39
+ */
+@Getter
+@Setter
+@SearchBean(tables = "corp_customer_acquisition_link_popularize cap left join channel_popularize cp on cp.id = cap.popularize_id" +
+		" left join channel c on c.id = cp.channel_id")
+public class CorpCustomerAcquisitionLinkPopularizeView {
+
+	@DbField("cap.id")
+	private Long id;
+
+	@DbField("cap.popularize_id")
+	private Long popularizeId;
+
+	@DbField("cp.name")
+	private String popularizeName;
+
+	@DbField("cp.channel_id")
+	private Long channelId;
+
+	@DbField("c.name")
+	private String channelName;
+
+	@DbField("cp.customer_acquistion_link_id")
+	private Long customerAcquistionLinkId;
+
+	/**
+	 * 1.加粉 2.深度回传
+	 */
+	@DbField("cap.type")
+	private Integer type;
+
+	/**
+	 * 回传事件
+	 */
+	@DbField("cap.event")
+	private String event;
+
+	/**
+	 * 前置回传
+	 */
+	@DbField("cap.add_event")
+	private String addEvent;
+
+	/**
+	 * 监测时间
+	 */
+	@DbField("cap.time")
+	private Long time;
+
+	@DbField("cap.created_time")
+	private Date createdTime;
+}

+ 6 - 0
netflix-dao/src/main/java/com/cyksj/model/views/CorpFollowActiveCodeView.java

@@ -105,6 +105,12 @@ public class CorpFollowActiveCodeView {
 	@DbIgnore
 	private BigDecimal orderMoney = BigDecimal.ZERO;
 
+	@DbField("cfa.id")
+	private Long msgId;
+
+	@DbIgnore
+	private String msgName;
+
 	@DbField("cfa.created_time")
 	private Date createdTime;
 }

+ 19 - 4
netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/CmsCorpFollowActiveCodeController.java

@@ -8,11 +8,9 @@ import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.OrderDonMapper;
 import com.cyksj.mapper.corp.CorpUserMapper;
+import com.cyksj.mapper.corp.CorpWelcomeTemplateMapper;
 import com.cyksj.mapper.manage.coupon.CouponMapper;
-import com.cyksj.model.entity.CorpFollowActiveCode;
-import com.cyksj.model.entity.CorpFollowActiveCodeClickRecord;
-import com.cyksj.model.entity.CorpFollowServiceRelate;
-import com.cyksj.model.entity.CorpUser;
+import com.cyksj.model.entity.*;
 import com.cyksj.model.request.corp.Attachments;
 import com.cyksj.model.request.corp.CorpFollowContact;
 import com.cyksj.model.views.CorpActiveCodeGoodsOrderView;
@@ -63,8 +61,21 @@ public class CmsCorpFollowActiveCodeController {
 
 	private final RedisService redisService;
 
+	private final CorpWelcomeTemplateMapper corpWelcomeTemplateMapper;
+
 	private final HttpServletRequest request;
 
+	/**
+	 * 获取企业成员列表
+	 */
+	@GetMapping("/get")
+	public Result<SearchResult<CorpFollow>> getCorpFollow() {
+		SearchResult<CorpFollow> search = beanSearcher.search(CorpFollow.class, MapUtils.flatBuilder(request.getParameterMap())
+				.onlySelect(CorpFollow::getId, CorpFollow::getUserid, CorpFollow::getName)
+				.build());
+		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+	}
+
 
 	/**
 	 * 生成动态配置
@@ -136,6 +147,10 @@ public class CmsCorpFollowActiveCodeController {
 				}
 			} catch (Exception e) {
 			}
+			CorpWelcomeTemplate corpWelcomeTemplate = corpWelcomeTemplateMapper.selectById(data.getMsgId());
+			if (corpWelcomeTemplate != null) {
+				data.setMsgName(corpWelcomeTemplate.getName());
+			}
 		});
 		return GatewayResponse.SUCCESS.newBuilder().toResult(search);
 	}

+ 8 - 0
netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/CorpCustomerAcquistionLinkController.java

@@ -5,9 +5,11 @@ import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.mapper.corp.CorpFollowMapper;
 import com.cyksj.mapper.corp.CorpTagMapper;
+import com.cyksj.mapper.corp.CorpWelcomeTemplateMapper;
 import com.cyksj.model.entity.CorpCustomerAcquisitionLink;
 import com.cyksj.model.entity.CorpFollow;
 import com.cyksj.model.entity.CorpTag;
+import com.cyksj.model.entity.CorpWelcomeTemplate;
 import com.cyksj.service.corp.CorpCustomerAcquisitionLinkService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -35,6 +37,8 @@ public class CorpCustomerAcquistionLinkController {
 
     private final CorpTagMapper corpTagMapper;
 
+    private final CorpWelcomeTemplateMapper corpWelcomeTemplateMapper;
+
     private final BeanSearcher beanSearcher;
 
     private final HttpServletRequest request;
@@ -82,6 +86,10 @@ public class CorpCustomerAcquistionLinkController {
             List<String> tagStrList = corpTagMapper.selectList(Wrappers.lambdaQuery(CorpTag.class)
                     .in(CorpTag::getId, e.getTags())).stream().map(CorpTag::getName).collect(Collectors.toList());
             e.setTagStrList(tagStrList);
+            CorpWelcomeTemplate corpWelcomeTemplate = corpWelcomeTemplateMapper.selectById(e.getMsgId());
+            if (corpWelcomeTemplate != null) {
+                e.setMsgName(corpWelcomeTemplate.getName());
+            }
         });
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }

+ 3 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/CorpCustomerAcquistionLinkPopularizeController.java

@@ -5,6 +5,7 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.model.entity.CorpCustomerAcquisitionLinkPopularize;
+import com.cyksj.model.views.CorpCustomerAcquisitionLinkPopularizeView;
 import com.cyksj.service.corp.CorpCustomerAcquisitionLinkPopularizeService;
 import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
@@ -79,8 +80,8 @@ public class CorpCustomerAcquistionLinkPopularizeController {
      * 加粉链接列表
      */
     @GetMapping("/get")
-    public Result<SearchResult<CorpCustomerAcquisitionLinkPopularize>> get(){
-        SearchResult<CorpCustomerAcquisitionLinkPopularize> search = beanSearcher.search(CorpCustomerAcquisitionLinkPopularize.class, MapUtils.flatBuilder(request.getParameterMap()).build());
+    public Result<SearchResult<CorpCustomerAcquisitionLinkPopularizeView>> get(){
+        SearchResult<CorpCustomerAcquisitionLinkPopularizeView> search = beanSearcher.search(CorpCustomerAcquisitionLinkPopularizeView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(search);
     }