Merge remote-tracking branch 'origin/test' into dev

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiUserSaleExpandController.java

@@ -38,14 +38,9 @@ public class ApiUserSaleExpandController implements ApiUserSaleExpandFeignClient
         return apiUserSaleExpandService.page(request);
     }
 
-    /**
-     * 获取销售员（转介人）详情
-     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
-     * @return
-     */
     @Override
-    public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId) {
-        return apiUserSaleExpandService.detail(userSaleBizId);
+    public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) {
+        return apiUserSaleExpandService.detail(userSaleBizId,clientUserBizId);
     }
 
     /**

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiUserSaleExpandService.java

@@ -11,7 +11,7 @@ import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPage
 public interface ApiUserSaleExpandService {
     Result<IPage<ApiUserSaleExpandPageResponse>> page(ApiUserSaleExpandPageRequest request);
 
-    Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId);
+    Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId);
 
     Result add(ApiUserSaleExpandAddRequest request);
 

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiUserSaleExpandServiceImpl.java

@@ -47,9 +47,13 @@ public class ApiUserSaleExpandServiceImpl implements ApiUserSaleExpandService {
      * @return
      */
     @Override
-    public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId) {
-        Result<UserSaleExpand> result = checkUserSaleExpandIsExist(userSaleBizId);
-        UserSaleExpand userSaleExpand = result.getData();
+    public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) {
+//        Result<UserSaleExpand> result = checkUserSaleExpandIsExist(userSaleBizId);
+//        UserSaleExpand userSaleExpand = result.getData();
+        UserSaleExpand userSaleExpand = iUserSaleExpandService.queryOne(userSaleBizId,clientUserBizId);
+        if (userSaleExpand == null) {
+            throw new BusinessException("转介人信息不存在");
+        }
         ApiUserSaleExpandDetailResponse response = new ApiUserSaleExpandDetailResponse();
         BeanUtils.copyProperties(userSaleExpand,response);
         return Result.success(response);

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/usersaleexpand/ApiUserSaleExpandFeignClient.java

@@ -29,10 +29,12 @@ public interface ApiUserSaleExpandFeignClient {
     /**
      * 获取销售员（转介人）详情
      * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @param clientUserBizId 客户端用户表唯一业务ID
      * @return
      */
     @GetMapping("/detail")
-    Result<ApiUserSaleExpandDetailResponse> detail(@NotBlank(message = "销售员（转介人）唯一标识(业务ID)不能为空") @RequestParam(value = "userSaleBizId") String userSaleBizId);
+    Result<ApiUserSaleExpandDetailResponse> detail(@RequestParam(value = "userSaleBizId",required = false) String userSaleBizId,
+                                                   @RequestParam(value = "clientUserBizId",required = false) String clientUserBizId);
 
     /**
      * 添加销售员（转介人）

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/usersaleexpand/ApiUserSaleExpandFeignFallbackFactory.java

@@ -25,7 +25,7 @@ public class ApiUserSaleExpandFeignFallbackFactory implements FallbackFactory<Ap
             }
 
             @Override
-            public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId) {
+            public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) {
                 return null;
             }
 

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/service/IUserSaleExpandService.java

@@ -21,4 +21,6 @@ public interface IUserSaleExpandService extends IService<UserSaleExpand> {
                                               ApiUserSaleExpandPageRequest request);
 
     UserSaleExpand queryOne(String userSaleBizId);
+
+    UserSaleExpand queryOne(String userSaleBizId,String clientUserBizId);
 }

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/service/impl/UserSaleExpandServiceImpl.java

@@ -9,6 +9,7 @@ import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPage
 import com.yd.insurance.base.service.dao.UserSaleExpandMapper;
 import com.yd.insurance.base.service.model.UserSaleExpand;
 import com.yd.insurance.base.service.service.IUserSaleExpandService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -33,4 +34,13 @@ public class UserSaleExpandServiceImpl extends ServiceImpl<UserSaleExpandMapper,
         return this.getOne(new LambdaQueryWrapper<UserSaleExpand>().eq(UserSaleExpand::getUserSaleBizId,userSaleBizId));
     }
 
+    @Override
+    public UserSaleExpand queryOne(String userSaleBizId, String clientUserBizId) {
+        return this.getOne(new LambdaQueryWrapper<UserSaleExpand>()
+                .eq(StringUtils.isNotBlank(userSaleBizId),UserSaleExpand::getUserSaleBizId,userSaleBizId)
+                .eq(StringUtils.isNotBlank(clientUserBizId),UserSaleExpand::getClientUserBizId,clientUserBizId)
+                .last(" limit 1 ")
+        );
+    }
+
 }