From 4e6d6e7c8e4ca42e96528a71162f5e58e473f652 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 09:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java b/manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
index 24baa47..f253194 100644
--- a/manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java
@@ -7,9 +7,18 @@
import cn.lili.modules.lmk.domain.form.CustomerTagRefForm;
import cn.lili.modules.lmk.domain.query.CustomerQuery;
import cn.lili.modules.lmk.domain.query.CustomerTagQuery;
+import cn.lili.modules.lmk.domain.query.FootPrintQuery;
+import cn.lili.modules.lmk.domain.vo.VideoFootVO;
import cn.lili.modules.lmk.service.CustomerService;
import cn.lili.modules.lmk.service.CustomerTagRefService;
import cn.lili.modules.lmk.service.MemberTagService;
+import cn.lili.modules.lmk.service.CustomerTagService;
+import cn.lili.modules.member.entity.dto.FootPrintQueryParams;
+import cn.lili.modules.member.entity.vo.MemberSearchVO;
+import cn.lili.modules.member.entity.vo.MemberVO;
+import cn.lili.modules.member.service.FootprintService;
+import cn.lili.modules.member.service.MemberService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -24,6 +33,9 @@
public class CustomerController {
private final CustomerService customerService;
private final MemberTagService memberTagService;
+ private final CustomerTagService customerTagService;
+ private final CustomerTagRefService customerTagRefService;
+ private final FootprintService footprintService;
@ApiOperation(value = "鍟嗛摵涓嬫媺鍒楄〃")
@GetMapping("/store/selectOption")
@@ -85,7 +97,11 @@
// public Result add(@RequestBody @Validated(Add.class) CustomerTagRefForm form) {
// return customerTagRefService.add(form);
// }
-
+ @DeleteMapping("/customerDelTag/{id}")
+ @ApiOperation(value = "鍒犻櫎瀹㈡埛鏍囩鏍囪瘑ID鍒犻櫎", notes = "鍒犻櫎瀹㈡埛鏍囩鏍囪瘑ID鍒犻櫎")
+ public Result removeCustomerTagById(@PathVariable("id") String id) {
+ return memberTagService.removeById(id);
+ }
@DeleteMapping("/customerDelTag/{id}")
@ApiOperation(value = "鍒犻櫎瀹㈡埛鏍囩鏍囪瘑ID鍒犻櫎", notes = "鍒犻櫎瀹㈡埛鏍囩鏍囪瘑ID鍒犻櫎")
@@ -93,4 +109,16 @@
return memberTagService.removeById(id);
}
+ @GetMapping("/videoFootPage")
+ @ApiOperation(value = "瑙嗛娴忚鍘嗗彶鍒嗛〉", notes = "瑙嗛娴忚鍘嗗彶鍒嗛〉")
+ public Result videoFootPage(FootPrintQuery query){
+
+ return footprintService.videoFootPrintPage(query);
+ }
+
+ @GetMapping("/memberActionAnalyse/{id}")
+ @ApiOperation(value = "浼氬憳琛屼负鍒嗘瀽", notes = "浼氬憳琛屼负鍒嗘瀽")
+ public Result memberActionAnalyse(@PathVariable("id") String id){
+ return footprintService.memberActionAnalyse(id);
+ }
}
--
Gitblit v1.8.0