From 61fa98486f112ae8df2608e0a5c4377d8cd8a9f3 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Mon, 20 Nov 2023 10:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/basicdata/feign/IBasicdataClientClient.java    | 2 +-
 .../basicdata/feign/IBasicdataTripartiteMallClient.java      | 5 +++--
 .../com/logpm/basicdata/feign/BasicdataClientClient.java     | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java
index b69a71198..10ebe490e 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataClientClient.java
@@ -39,7 +39,7 @@ import java.util.List;
 )
 public interface IBasicdataClientClient {
 
-    String API_PREFIX = "/client";
+    String API_PREFIX = "/client12122";
     String TOP = API_PREFIX + "/top2";
     String GETCUSTOMER = API_PREFIX + "/customer";
     String BASICDATACLIENTUSERENTITYLISTBYUSERID = API_PREFIX + "/BasicdataClientUserEntityListByUserId";
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java
index b2740c00e..479e29220 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataTripartiteMallClient.java
@@ -34,8 +34,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 )
 public interface IBasicdataTripartiteMallClient {
 
-    String API_PREFIX = "/client";
+    String API_PREFIX = "/tripartite/client";
     String TOP = API_PREFIX + "/1top";
+    String GETNAMEBRAND = API_PREFIX + "/getNameBrand";
 
     /**
      * 获取客户三方商城列表
@@ -47,7 +48,7 @@ public interface IBasicdataTripartiteMallClient {
     @GetMapping(TOP)
     BladePage<BasicdataTripartiteMallEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
 
-	@GetMapping(TOP)
+	@GetMapping(GETNAMEBRAND)
 	Long getClientIdByNameAndBrand(@RequestParam String name, @RequestParam String brand);
 
 
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
index 9114f7ad3..e7355e3f6 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
@@ -29,6 +29,7 @@ import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -60,6 +61,7 @@ public class BasicdataClientClient implements IBasicdataClientClient {
     }
 
 	@Override
+	@GetMapping(API_PREFIX+"/findByName")
 	public BasicdataClientEntity findByName(String customerName) {
 		QueryWrapper<BasicdataClientEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("client_name",customerName);
@@ -73,6 +75,7 @@ public class BasicdataClientClient implements IBasicdataClientClient {
 	 * @return
 	 */
 	@Override
+	@GetMapping(GETCUSTOMER)
 	public BasicdataClientEntity getCustomer(String customerName, String customerCode) {
 		return basicdataClientService.getOne(Wrappers.<BasicdataClientEntity>query().lambda()
 			.eq(StringUtils.isNotEmpty(customerName),BasicdataClientEntity::getClientName,customerName)
@@ -86,11 +89,13 @@ public class BasicdataClientClient implements IBasicdataClientClient {
 	}
 
 	@Override
+	@GetMapping(API_PREFIX+"/findEntityById")
 	public BasicdataClientEntity findEntityById(Long id) {
 		return basicdataClientService.getById(id);
 	}
 
 	@Override
+	@PostMapping(API_PREFIX+"/addReturnId")
 	public Long addReturnId(BasicdataClientEntity basicdataClientEntity) {
 		boolean save = basicdataClientService.save(basicdataClientEntity);
 		if(save){