From ead65cd9b15cd574f4e37c3376c7447efea53935 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 09 九月 2024 20:27:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2

---
 src/main/java/com/mzl/flower/web/customer/CustomerController.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/mzl/flower/web/customer/CustomerController.java b/src/main/java/com/mzl/flower/web/customer/CustomerController.java
index 4c552d3..8b870c9 100644
--- a/src/main/java/com/mzl/flower/web/customer/CustomerController.java
+++ b/src/main/java/com/mzl/flower/web/customer/CustomerController.java
@@ -4,15 +4,11 @@
 import com.mzl.flower.base.BaseController;
 import com.mzl.flower.base.R;
 import com.mzl.flower.base.ReturnDataDTO;
-import com.mzl.flower.config.exception.ValidationException;
 import com.mzl.flower.config.security.SecurityUtils;
 import com.mzl.flower.dto.request.customer.BindPartnerDTO;
 import com.mzl.flower.dto.request.customer.ChangePartnerDTO;
 import com.mzl.flower.dto.request.customer.QueryCustomerDTO;
 import com.mzl.flower.dto.request.customer.UpdateCustomerDTO;
-import com.mzl.flower.dto.request.supplier.AuditSupplierDTO;
-import com.mzl.flower.dto.request.supplier.QuerySupplierDTO;
-import com.mzl.flower.dto.request.supplier.UpdateSupplierDTO;
 import com.mzl.flower.dto.response.customer.CustomerDTO;
 import com.mzl.flower.dto.response.supplier.SupplierDTO;
 import com.mzl.flower.service.customer.CustomerService;
@@ -24,6 +20,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 @RestController
 @RequestMapping("/api/customer")
@@ -85,4 +82,11 @@
     public ResponseEntity<ReturnDataDTO<SupplierDTO>> getPartnerName(@NotBlank(message = "参数不能为空") String id) {
         return returnData(R.SUCCESS.getCode(),customerService.getPartnerName(id));
     }
+
+    @GetMapping("/page/isEnable")
+    @ApiOperation(value = "启用/禁用", notes = "启用/禁用商品")
+    public ResponseEntity<ReturnDataDTO<String>> isEnable(@NotNull(message = "id不能为空") Long id) {
+        customerService.isEnable(id);
+        return returnData(R.SUCCESS.getCode(),null);
+    }
 }

--
Gitblit v1.9.3