From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 manager-api/src/main/java/cn/lili/controller/lmk/CustomerController.java |   38 +++++++++++++-------------------------
 1 files changed, 13 insertions(+), 25 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 62a9d02..24baa47 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
@@ -1,21 +1,15 @@
 package cn.lili.controller.lmk;
 
 import cn.lili.base.Result;
-import cn.lili.common.enums.ResultUtil;
-import cn.lili.common.vo.PageVO;
-import cn.lili.common.vo.ResultMessage;
 import cn.lili.group.Add;
 import cn.lili.group.Update;
-import cn.lili.modules.lmk.domain.form.CustomerTagForm;
+import cn.lili.modules.lmk.domain.form.MemberTagForm;
 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.service.CustomerService;
 import cn.lili.modules.lmk.service.CustomerTagRefService;
-import cn.lili.modules.lmk.service.CustomerTagService;
-import cn.lili.modules.member.entity.vo.MemberSearchVO;
-import cn.lili.modules.member.entity.vo.MemberVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import cn.lili.modules.lmk.service.MemberTagService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -29,8 +23,7 @@
 @RequestMapping("/manager/customerManager")
 public class CustomerController {
     private final CustomerService customerService;
-    private final CustomerTagService customerTagService;
-    private final CustomerTagRefService customerTagRefService;
+    private final MemberTagService memberTagService;
 
     @ApiOperation(value = "鍟嗛摵涓嬫媺鍒楄〃")
     @GetMapping("/store/selectOption")
@@ -52,39 +45,39 @@
 
     @PostMapping("/addTag")
     @ApiOperation(value = "娣诲姞鏍囩", notes = "娣诲姞鏍囩")
-    public Result add(@RequestBody @Validated(Add.class) CustomerTagForm form) {
-        return customerTagService.add(form);
+    public Result add(@RequestBody @Validated(Add.class) MemberTagForm form) {
+        return memberTagService.add(form);
     }
 
     @PutMapping("/editTag")
     @ApiOperation(value = "淇敼鏍囩", notes = "淇敼鏍囩")
-    public Result update(@RequestBody @Validated(Update.class) CustomerTagForm form) {
-        return customerTagService.update(form);
+    public Result update(@RequestBody @Validated(Update.class) MemberTagForm form) {
+        return memberTagService.update(form);
     }
 
     @DeleteMapping("/tag/{id}")
     @ApiOperation(value = "ID鍒犻櫎鏍囩", notes = "ID鍒犻櫎")
     public Result removeById(@PathVariable("id") String id) {
-        return customerTagService.removeById(id);
+        return memberTagService.removeById(id);
     }
 
 
     @GetMapping("/tagList")
     @ApiOperation(value = "鏍囩鍒楄〃", notes = "鏍囩鍒楄〃")
     public Result list() {
-        return customerTagService.all();
+        return memberTagService.all();
     }
     @GetMapping("/pageTagList")
     @ApiOperation(value = "鍒嗛〉鏍囩鍒楄〃", notes = "鏍囩鍒楄〃")
     public Result pageList(CustomerTagQuery query) {
-        return customerTagService.page(query);
+        return memberTagService.page(query);
     }
 
 
     @PostMapping("/customerAddTag")
     @ApiOperation(value = "娣诲姞瀹㈡埛鏍囩鏍囪瘑", notes = "娣诲姞瀹㈡埛鏍囩鏍囪瘑")
-    public Result addCustomerTag(@RequestBody @Validated(Add.class) CustomerTagForm form) {
-        return customerTagService.addCustomerTag(form);
+    public Result addCustomerTag(@RequestBody @Validated(Add.class) MemberTagForm form) {
+        return memberTagService.addMemberTag(form);
     }
 
 //    @PostMapping("/customerAddTag")
@@ -93,16 +86,11 @@
 //        return customerTagRefService.add(form);
 //    }
 
-    @PutMapping("/customerEditTag")
-    @ApiOperation(value = "淇敼瀹㈡埛鏍囩鏍囪瘑", notes = "淇敼瀹㈡埛鏍囩鏍囪瘑")
-    public Result update(@RequestBody @Validated(Update.class) CustomerTagRefForm form) {
-        return customerTagRefService.update(form);
-    }
 
     @DeleteMapping("/customerDelTag/{id}")
     @ApiOperation(value = "鍒犻櫎瀹㈡埛鏍囩鏍囪瘑ID鍒犻櫎", notes = "鍒犻櫎瀹㈡埛鏍囩鏍囪瘑ID鍒犻櫎")
     public Result removeCustomerTagById(@PathVariable("id") String id) {
-        return customerTagRefService.removeById(id);
+        return memberTagService.removeById(id);
     }
 
 }

--
Gitblit v1.8.0