Skip to content

Y
yd-insurance-base
Commit 708769c2 by zhangxingmin
Options

push

parent 4995be72
Showing with 589 additions and 17 deletions
yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiUserSaleExpandController.java
...@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.insurance.base.api.service.ApiUserSaleExpandService; import com.yd.insurance.base.api.service.ApiUserSaleExpandService;
import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient; import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest; import com.yd.insurance.base.feign.request.usersaleexpand.*;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -14,6 +12,8 @@ import org.springframework.validation.annotation.Validated; ...@@ -14,6 +12,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* 保险-转介人（销售员）信息 * 保险-转介人（销售员）信息
* *
...@@ -38,6 +38,16 @@ public class ApiUserSaleExpandController implements ApiUserSaleExpandFeignClient ...@@ -38,6 +38,16 @@ public class ApiUserSaleExpandController implements ApiUserSaleExpandFeignClient
return apiUserSaleExpandService.page(request); return apiUserSaleExpandService.page(request);
} }
/**
* 销售员（转介人）列表查询
* @param request
* @return
*/
@Override
public Result<List<ApiUserSaleExpandDetailResponse>> list(ApiUserSaleExpandListRequest request) {
return apiUserSaleExpandService.list(request);
}
@Override @Override
public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) { public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) {
return apiUserSaleExpandService.detail(userSaleBizId,clientUserBizId); return apiUserSaleExpandService.detail(userSaleBizId,clientUserBizId);
...@@ -83,4 +93,14 @@ public class ApiUserSaleExpandController implements ApiUserSaleExpandFeignClient ...@@ -83,4 +93,14 @@ public class ApiUserSaleExpandController implements ApiUserSaleExpandFeignClient
public Result editStatus(String userSaleBizId, Integer status) { public Result editStatus(String userSaleBizId, Integer status) {
return apiUserSaleExpandService.editStatus(userSaleBizId,status); return apiUserSaleExpandService.editStatus(userSaleBizId,status);
} }
/**
* 保存销售员（转介人）（新增或者更新）
* @param request
* @return
*/
@Override
public Result save(ApiUserSaleExpandSaveRequest request) {
return apiUserSaleExpandService.save(request);
}
} }
yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiUserSignExpandController.java
...@@ -7,6 +7,7 @@ import com.yd.insurance.base.feign.client.usersignexpand.ApiUserSignExpandFeignC ...@@ -7,6 +7,7 @@ import com.yd.insurance.base.feign.client.usersignexpand.ApiUserSignExpandFeignC
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandSaveRequest;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -88,4 +89,14 @@ public class ApiUserSignExpandController implements ApiUserSignExpandFeignClient ...@@ -88,4 +89,14 @@ public class ApiUserSignExpandController implements ApiUserSignExpandFeignClient
public Result editStatus(String userSignBizId, Integer status) { public Result editStatus(String userSignBizId, Integer status) {
return apiUserSignExpandService.editStatus(userSignBizId,status); return apiUserSignExpandService.editStatus(userSignBizId,status);
} }
/**
* 保存签单员（新增或者更新）
* @param request
* @return
*/
@Override
public Result save(ApiUserSignExpandSaveRequest request) {
return apiUserSignExpandService.save(request);
}
} }
yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiUserSaleExpandService.java
...@@ -2,15 +2,17 @@ package com.yd.insurance.base.api.service; ...@@ -2,15 +2,17 @@ package com.yd.insurance.base.api.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest; import com.yd.insurance.base.feign.request.usersaleexpand.*;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
import java.util.List;
public interface ApiUserSaleExpandService { public interface ApiUserSaleExpandService {
Result<IPage<ApiUserSaleExpandPageResponse>> page(ApiUserSaleExpandPageRequest request); Result<IPage<ApiUserSaleExpandPageResponse>> page(ApiUserSaleExpandPageRequest request);
Result<List<ApiUserSaleExpandDetailResponse>> list(ApiUserSaleExpandListRequest request);
Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId); Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId);
Result add(ApiUserSaleExpandAddRequest request); Result add(ApiUserSaleExpandAddRequest request);
...@@ -20,4 +22,6 @@ public interface ApiUserSaleExpandService { ...@@ -20,4 +22,6 @@ public interface ApiUserSaleExpandService {
Result del(String userSaleBizId); Result del(String userSaleBizId);
Result editStatus(String userSaleBizId, Integer status); Result editStatus(String userSaleBizId, Integer status);
Result save(ApiUserSaleExpandSaveRequest request);
} }
yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiUserSignExpandService.java
...@@ -5,6 +5,7 @@ import com.yd.common.result.Result; ...@@ -5,6 +5,7 @@ import com.yd.common.result.Result;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandSaveRequest;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse;
...@@ -20,4 +21,6 @@ public interface ApiUserSignExpandService { ...@@ -20,4 +21,6 @@ public interface ApiUserSignExpandService {
Result del(String userSignBizId); Result del(String userSignBizId);
Result editStatus(String userSignBizId, Integer status); Result editStatus(String userSignBizId, Integer status);
Result save(ApiUserSignExpandSaveRequest request);
} }
yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiUserSaleExpandServiceImpl.java
...@@ -8,19 +8,21 @@ import com.yd.common.exception.BusinessException; ...@@ -8,19 +8,21 @@ import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.common.utils.RandomStringGenerator; import com.yd.common.utils.RandomStringGenerator;
import com.yd.insurance.base.api.service.ApiUserSaleExpandService; import com.yd.insurance.base.api.service.ApiUserSaleExpandService;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest; import com.yd.insurance.base.feign.request.usersaleexpand.*;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
import com.yd.insurance.base.service.model.UserSaleExpand; import com.yd.insurance.base.service.model.UserSaleExpand;
import com.yd.insurance.base.service.service.IUserSaleExpandService; import com.yd.insurance.base.service.service.IUserSaleExpandService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
@Slf4j @Slf4j
@Service @Service
...@@ -42,6 +44,28 @@ public class ApiUserSaleExpandServiceImpl implements ApiUserSaleExpandService { ...@@ -42,6 +44,28 @@ public class ApiUserSaleExpandServiceImpl implements ApiUserSaleExpandService {
} }
/** /**
* 销售员（转介人）列表查询
* @param request
* @return
*/
@Override
public Result<List<ApiUserSaleExpandDetailResponse>> list(ApiUserSaleExpandListRequest request) {
if (CollectionUtils.isEmpty(request.getClientUserBizIdList())) {
return Result.success();
}
List<UserSaleExpand> userSaleExpandList = iUserSaleExpandService.queryList(request.getClientUserBizIdList());
if (CollectionUtils.isEmpty(userSaleExpandList)) {
return Result.success();
}
List<ApiUserSaleExpandDetailResponse> saleExpandDetailResponseList = userSaleExpandList.stream().map(d -> {
ApiUserSaleExpandDetailResponse response = new ApiUserSaleExpandDetailResponse();
BeanUtils.copyProperties(d,response);
return response;
}).collect(Collectors.toList());
return Result.success(saleExpandDetailResponseList);
}
/**
* 获取销售员（转介人）详情 * 获取销售员（转介人）详情
* @param userSaleBizId 销售员（转介人）唯一标识(业务ID) * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
* @return * @return
...@@ -113,6 +137,29 @@ public class ApiUserSaleExpandServiceImpl implements ApiUserSaleExpandService { ...@@ -113,6 +137,29 @@ public class ApiUserSaleExpandServiceImpl implements ApiUserSaleExpandService {
} }
/** /**
* 保存销售员（转介人）（新增或者更新）
* @param request
* @return
*/
@Override
public Result save(ApiUserSaleExpandSaveRequest request) {
//新增或者更新
UserSaleExpand userSaleExpand = iUserSaleExpandService.queryOne("",request.getClientUserBizId());
if (userSaleExpand == null) {
//新增
userSaleExpand = new UserSaleExpand();
BeanUtils.copyProperties(request,userSaleExpand);
userSaleExpand.setUserSaleBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_USER_SALE_EXPAND.getCode()));
iUserSaleExpandService.saveOrUpdate(userSaleExpand);
}else {
//更新
BeanUtils.copyProperties(request,userSaleExpand);
iUserSaleExpandService.saveOrUpdate(userSaleExpand);
}
return Result.success();
}
/**
* 校验销售员（转介人）是否存在 * 校验销售员（转介人）是否存在
* @param userSaleBizId * @param userSaleBizId
* @return * @return
......
yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiUserSignExpandServiceImpl.java
...@@ -11,6 +11,7 @@ import com.yd.insurance.base.api.service.ApiUserSignExpandService; ...@@ -11,6 +11,7 @@ import com.yd.insurance.base.api.service.ApiUserSignExpandService;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandSaveRequest;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse;
import com.yd.insurance.base.service.model.UserSignExpand; import com.yd.insurance.base.service.model.UserSignExpand;
...@@ -109,6 +110,26 @@ public class ApiUserSignExpandServiceImpl implements ApiUserSignExpandService { ...@@ -109,6 +110,26 @@ public class ApiUserSignExpandServiceImpl implements ApiUserSignExpandService {
} }
/** /**
* 保存签单员（新增或者更新）
* @param request
* @return
*/
@Override
public Result save(ApiUserSignExpandSaveRequest request) {
UserSignExpand userSignExpand = iUserSignExpandService.queryOne("",request.getClientUserBizId());
if (userSignExpand == null) {
userSignExpand = new UserSignExpand();
BeanUtils.copyProperties(request,userSignExpand);
userSignExpand.setUserSignBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_USER_SIGN_EXPAND.getCode()));
iUserSignExpandService.saveOrUpdate(userSignExpand);
}else {
BeanUtils.copyProperties(request,userSignExpand);
iUserSignExpandService.saveOrUpdate(userSignExpand);
}
return Result.success();
}
/**
* 校验签单员是否存在 * 校验签单员是否存在
* @param userSignBizId * @param userSignBizId
* @return * @return
......
yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/usersaleexpand/ApiUserSaleExpandFeignClient.java
...@@ -2,15 +2,14 @@ package com.yd.insurance.base.feign.client.usersaleexpand; ...@@ -2,15 +2,14 @@ package com.yd.insurance.base.feign.client.usersaleexpand;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.insurance.base.feign.fallback.usersaleexpand.ApiUserSaleExpandFeignFallbackFactory; import com.yd.insurance.base.feign.fallback.usersaleexpand.ApiUserSaleExpandFeignFallbackFactory;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest; import com.yd.insurance.base.feign.request.usersaleexpand.*;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List;
/** /**
* 系统用户-销售用户扩展信息Feign客户端 * 系统用户-销售用户扩展信息Feign客户端
...@@ -27,6 +26,14 @@ public interface ApiUserSaleExpandFeignClient { ...@@ -27,6 +26,14 @@ public interface ApiUserSaleExpandFeignClient {
Result page(@RequestBody ApiUserSaleExpandPageRequest request); Result page(@RequestBody ApiUserSaleExpandPageRequest request);
/** /**
* 销售员（转介人）列表查询
* @param request
* @return
*/
@PostMapping("/list")
Result<List<ApiUserSaleExpandDetailResponse>> list(@RequestBody ApiUserSaleExpandListRequest request);
/**
* 获取销售员（转介人）详情 * 获取销售员（转介人）详情
* @param userSaleBizId 销售员（转介人）唯一标识(业务ID) * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
* @param clientUserBizId 客户端用户表唯一业务ID * @param clientUserBizId 客户端用户表唯一业务ID
...@@ -71,4 +78,12 @@ public interface ApiUserSaleExpandFeignClient { ...@@ -71,4 +78,12 @@ public interface ApiUserSaleExpandFeignClient {
Result editStatus(@NotBlank(message = "销售员（转介人）唯一标识(业务ID)不能为空") @RequestParam(value = "userSaleBizId") String userSaleBizId, Result editStatus(@NotBlank(message = "销售员（转介人）唯一标识(业务ID)不能为空") @RequestParam(value = "userSaleBizId") String userSaleBizId,
@NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status); @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
/**
* 保存销售员（转介人）（新增或者更新）
* @param request
* @return
*/
@PostMapping("/save")
Result save(@Validated @RequestBody ApiUserSaleExpandSaveRequest request);
} }
yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/usersignexpand/ApiUserSignExpandFeignClient.java
...@@ -2,9 +2,11 @@ package com.yd.insurance.base.feign.client.usersignexpand; ...@@ -2,9 +2,11 @@ package com.yd.insurance.base.feign.client.usersignexpand;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.insurance.base.feign.fallback.usersignexpand.ApiUserSignExpandFeignFallbackFactory; import com.yd.insurance.base.feign.fallback.usersignexpand.ApiUserSignExpandFeignFallbackFactory;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandSaveRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandSaveRequest;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
...@@ -70,4 +72,12 @@ public interface ApiUserSignExpandFeignClient { ...@@ -70,4 +72,12 @@ public interface ApiUserSignExpandFeignClient {
Result editStatus(@NotBlank(message = "签单员唯一标识(业务ID)不能为空") @RequestParam(value = "userSignBizId") String userSignBizId, Result editStatus(@NotBlank(message = "签单员唯一标识(业务ID)不能为空") @RequestParam(value = "userSignBizId") String userSignBizId,
@NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status); @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
/**
* 保存签单员（新增或者更新）
* @param request
* @return
*/
@PostMapping("/save")
Result save(@Validated @RequestBody ApiUserSignExpandSaveRequest request);
} }
yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/usersaleexpand/ApiUserSaleExpandFeignFallbackFactory.java
...@@ -2,14 +2,14 @@ package com.yd.insurance.base.feign.fallback.usersaleexpand; ...@@ -2,14 +2,14 @@ package com.yd.insurance.base.feign.fallback.usersaleexpand;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient; import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest; import com.yd.insurance.base.feign.request.usersaleexpand.*;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.List;
/** /**
* 系统用户-销售用户扩展信息Feign降级处理 * 系统用户-销售用户扩展信息Feign降级处理
*/ */
...@@ -25,6 +25,11 @@ public class ApiUserSaleExpandFeignFallbackFactory implements FallbackFactory<Ap ...@@ -25,6 +25,11 @@ public class ApiUserSaleExpandFeignFallbackFactory implements FallbackFactory<Ap
} }
@Override @Override
public Result<List<ApiUserSaleExpandDetailResponse>> list(ApiUserSaleExpandListRequest request) {
return null;
}
@Override
public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) { public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId, String clientUserBizId) {
return null; return null;
} }
...@@ -48,6 +53,11 @@ public class ApiUserSaleExpandFeignFallbackFactory implements FallbackFactory<Ap ...@@ -48,6 +53,11 @@ public class ApiUserSaleExpandFeignFallbackFactory implements FallbackFactory<Ap
public Result editStatus(String userSaleBizId, Integer status) { public Result editStatus(String userSaleBizId, Integer status) {
return null; return null;
} }
@Override
public Result save(ApiUserSaleExpandSaveRequest request) {
return null;
}
}; };
} }
} }
yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/usersignexpand/ApiUserSignExpandFeignFallbackFactory.java
...@@ -5,6 +5,7 @@ import com.yd.insurance.base.feign.client.usersignexpand.ApiUserSignExpandFeignC ...@@ -5,6 +5,7 @@ import com.yd.insurance.base.feign.client.usersignexpand.ApiUserSignExpandFeignC
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandSaveRequest;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.cloud.openfeign.FallbackFactory;
...@@ -48,6 +49,11 @@ public class ApiUserSignExpandFeignFallbackFactory implements FallbackFactory<Ap ...@@ -48,6 +49,11 @@ public class ApiUserSignExpandFeignFallbackFactory implements FallbackFactory<Ap
public Result editStatus(String userSignBizId, Integer status) { public Result editStatus(String userSignBizId, Integer status) {
return null; return null;
} }
@Override
public Result save(ApiUserSignExpandSaveRequest request) {
return null;
}
}; };
} }
} }
yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersaleexpand/ApiUserSaleExpandListRequest.java 0 → 100644
package com.yd.insurance.base.feign.request.usersaleexpand;
import lombok.Data;
import java.util.List;
@Data
public class ApiUserSaleExpandListRequest {
private List<String> clientUserBizIdList;
}
yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersaleexpand/ApiUserSaleExpandSaveRequest.java 0 → 100644
package com.yd.insurance.base.feign.request.usersaleexpand;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
@Data
public class ApiUserSaleExpandSaveRequest {
/**
* 客户端用户表唯一业务ID（客户端用户中心表唯一业务ID）
*/
@NotBlank(message = "客户端用户中心表唯一业务ID不能为空")
private String clientUserBizId;
/**
* 销售用户真实姓名
*/
private String realName;
/**
* 手机号
*/
@NotBlank(message = "手机号不能为空")
private String phone;
/**
* 邮箱
*/
private String email;
/**
* 性别(0:未知 1:男 2:女)
*/
private Integer gender;
/**
* 内部编号
*/
private String internalNumber;
/**
* 所属公司ID（部门唯一标识(业务ID)）
*/
private String deptBizId;
/**
* 所属公司名称（部门名称）
*/
private String deptName;
/**
* 团队表唯一业务ID
*/
private String teamBizId;
/**
* 团队名称
*/
private String teamName;
/**
* 状态(0:停用 1:启用)
*/
private Integer status;
/**
* 通用备注
*/
private String remark;
/**
* 当前等级编码 *
*/
private String currentGradeCode;
/**
* 初始化等级编码 *
*/
private String initGradeCode;
/**
* RA编号 *
*/
private String raNumber;
/**
* 证件类型 *
*/
private String cardType;
/**
* 证件号码 *
*/
private String cardNo;
/**
* 绑定的基本法配置表唯一业务ID列表（多个分号分隔） *
*/
private String ruleBizIds;
/**
* 绑定的客户端角色表表唯一业务ID列表（多个分号分隔） *
*/
private String roleBizIds;
/**
* 合同签订日期 *
*/
private LocalDateTime contractSigningDate;
/**
* 离职日 *
*/
private LocalDateTime lastWorkingDay;
/**
* 在职状态: 0-在职, 1-离职 *
*/
private String employmentStatus;
}
yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersignexpand/ApiUserSignExpandSaveRequest.java 0 → 100644
package com.yd.insurance.base.feign.request.usersignexpand;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
@Data
public class ApiUserSignExpandSaveRequest {
/**
* 客户端用户表唯一业务ID（客户端用户中心表唯一业务ID）
*/
@NotBlank(message = "客户端用户中心表唯一业务ID不能为空")
private String clientUserBizId;
/**
* 签单用户真实姓名
*/
private String realName;
/**
* 内部编号
*/
private String internalNumber;
/**
* 执业编码
*/
private String practiceCode;
/**
* 手机号
*/
@NotBlank(message = "手机号不能为空")
private String phone;
/**
* 证件类型
*/
private String cardType;
/**
* 证件号码
*/
private String cardNo;
/**
* 邮箱
*/
private String email;
/**
* 性别(0:未知 1:男 2:女)
*/
private Integer gender;
/**
* 所属公司ID（部门唯一标识(业务ID)）
*/
private String deptBizId;
/**
* 所属公司名称（部门名称）
*/
private String deptName;
/**
* 推荐等级：
*
* 一般
* 推荐
* 非常推荐
* 不推荐
*/
private String recommendedLevel;
/**
* 状态(0:停用 1:启用)
*/
private Integer status;
/**
* 通用备注
*/
private String remark;
/**
* 当前等级编码 *
*/
private String currentGradeCode;
/**
* 初始化等级编码 *
*/
private String initGradeCode;
/**
* RA编号 *
*/
private String raNumber;
/**
* 绑定的基本法配置表唯一业务ID列表（多个分号分隔） *
*/
private String ruleBizIds;
/**
* 绑定的客户端角色表表唯一业务ID列表（多个分号分隔） *
*/
private String roleBizIds;
/**
* 所属团队表唯一业务ID *
*/
private String teamBizId;
/**
* 所属团队名称 *
*/
private String teamName;
/**
* 合同签订日期 *
*/
private LocalDateTime contractSigningDate;
/**
* 离职日 *
*/
private LocalDateTime lastWorkingDay;
/**
* 在职状态: 0-在职, 1-离职 *
*/
private String employmentStatus;
}
yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/usersaleexpand/ApiUserSaleExpandDetailResponse.java
...@@ -63,6 +63,16 @@ public class ApiUserSaleExpandDetailResponse { ...@@ -63,6 +63,16 @@ public class ApiUserSaleExpandDetailResponse {
private String deptName; private String deptName;
/** /**
* 团队表唯一业务ID
*/
private String teamBizId;
/**
* 团队名称
*/
private String teamName;
/**
* 状态(0:停用 1:启用) * 状态(0:停用 1:启用)
*/ */
private Integer status; private Integer status;
......
yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/UserSaleExpand.java
...@@ -41,7 +41,7 @@ public class UserSaleExpand implements Serializable { ...@@ -41,7 +41,7 @@ public class UserSaleExpand implements Serializable {
private String userBizId; private String userBizId;
/** /**
* 客户端用户表唯一业务ID * 客户端用户表唯一业务ID（客户端用户中心表唯一业务ID）
*/ */
@TableField("client_user_biz_id") @TableField("client_user_biz_id")
private String clientUserBizId; private String clientUserBizId;
...@@ -141,4 +141,66 @@ public class UserSaleExpand implements Serializable { ...@@ -141,4 +141,66 @@ public class UserSaleExpand implements Serializable {
*/ */
@TableField("update_time") @TableField("update_time")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/**
* 当前等级编码 *
*/
@TableField("current_grade_code")
private String currentGradeCode;
/**
* 初始化等级编码 *
*/
@TableField("init_grade_code")
private String initGradeCode;
/**
* RA编号 *
*/
@TableField("ra_number")
private String raNumber;
/**
* 证件类型 *
*/
@TableField("card_type")
private String cardType;
/**
* 证件号码 *
*/
@TableField("card_no")
private String cardNo;
/**
* 绑定的基本法配置表唯一业务ID列表（多个分号分隔） *
*/
@TableField("rule_biz_ids")
private String ruleBizIds;
/**
* 绑定的客户端角色表表唯一业务ID列表（多个分号分隔） *
*/
@TableField("role_biz_ids")
private String roleBizIds;
/**
* 合同签订日期 *
*/
@TableField("contract_signing_date")
private LocalDateTime contractSigningDate;
/**
* 离职日 *
*/
@TableField("last_working_day")
private LocalDateTime lastWorkingDay;
/**
* 在职状态: 0-在职, 1-离职 *
*/
@TableField("employment_status")
private String employmentStatus;
} }
yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/UserSignExpand.java
...@@ -41,7 +41,7 @@ public class UserSignExpand implements Serializable { ...@@ -41,7 +41,7 @@ public class UserSignExpand implements Serializable {
private String userBizId; private String userBizId;
/** /**
* 客户端用户表唯一业务ID * 客户端用户表唯一业务ID（客户端用户中心表唯一业务ID）
*/ */
@TableField("client_user_biz_id") @TableField("client_user_biz_id")
private String clientUserBizId; private String clientUserBizId;
...@@ -158,4 +158,65 @@ public class UserSignExpand implements Serializable { ...@@ -158,4 +158,65 @@ public class UserSignExpand implements Serializable {
*/ */
@TableField("update_time") @TableField("update_time")
private LocalDateTime updateTime; private LocalDateTime updateTime;
/**
* 当前等级编码 *
*/
@TableField("current_grade_code")
private String currentGradeCode;
/**
* 初始化等级编码 *
*/
@TableField("init_grade_code")
private String initGradeCode;
/**
* RA编号 *
*/
@TableField("ra_number")
private String raNumber;
/**
* 绑定的基本法配置表唯一业务ID列表（多个分号分隔） *
*/
@TableField("rule_biz_ids")
private String ruleBizIds;
/**
* 绑定的客户端角色表表唯一业务ID列表（多个分号分隔） *
*/
@TableField("role_biz_ids")
private String roleBizIds;
/**
* 所属团队表唯一业务ID *
*/
@TableField("team_biz_id")
private String teamBizId;
/**
* 所属团队名称 *
*/
@TableField("team_name")
private String teamName;
/**
* 合同签订日期 *
*/
@TableField("contract_signing_date")
private LocalDateTime contractSigningDate;
/**
* 离职日 *
*/
@TableField("last_working_day")
private LocalDateTime lastWorkingDay;
/**
* 在职状态: 0-在职, 1-离职 *
*/
@TableField("employment_status")
private String employmentStatus;
} }
yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/service/IUserSaleExpandService.java
...@@ -7,6 +7,8 @@ import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageR ...@@ -7,6 +7,8 @@ import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageR
import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse; import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
import com.yd.insurance.base.service.model.UserSaleExpand; import com.yd.insurance.base.service.model.UserSaleExpand;
import java.util.List;
/** /**
* <p> * <p>
* 系统用户-销售用户扩展表 服务类 * 系统用户-销售用户扩展表 服务类
...@@ -23,4 +25,6 @@ public interface IUserSaleExpandService extends IService<UserSaleExpand> { ...@@ -23,4 +25,6 @@ public interface IUserSaleExpandService extends IService<UserSaleExpand> {
UserSaleExpand queryOne(String userSaleBizId); UserSaleExpand queryOne(String userSaleBizId);
UserSaleExpand queryOne(String userSaleBizId,String clientUserBizId); UserSaleExpand queryOne(String userSaleBizId,String clientUserBizId);
List<UserSaleExpand> queryList(List<String> clientUserBizIdList);
} }
yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/service/IUserSignExpandService.java
...@@ -21,4 +21,6 @@ public interface IUserSignExpandService extends IService<UserSignExpand> { ...@@ -21,4 +21,6 @@ public interface IUserSignExpandService extends IService<UserSignExpand> {
ApiUserSignExpandPageRequest request); ApiUserSignExpandPageRequest request);
UserSignExpand queryOne(String userSignBizId); UserSignExpand queryOne(String userSignBizId);
UserSignExpand queryOne(String userSignBizId,String clientUserBizId);
} }
yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/service/impl/UserSaleExpandServiceImpl.java
...@@ -12,6 +12,8 @@ import com.yd.insurance.base.service.service.IUserSaleExpandService; ...@@ -12,6 +12,8 @@ import com.yd.insurance.base.service.service.IUserSaleExpandService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
/** /**
* <p> * <p>
* 系统用户-销售用户扩展表 服务实现类 * 系统用户-销售用户扩展表 服务实现类
...@@ -43,4 +45,9 @@ public class UserSaleExpandServiceImpl extends ServiceImpl<UserSaleExpandMapper, ...@@ -43,4 +45,9 @@ public class UserSaleExpandServiceImpl extends ServiceImpl<UserSaleExpandMapper,
); );
} }
@Override
public List<UserSaleExpand> queryList(List<String> clientUserBizIdList) {
return this.lambdaQuery().in(UserSaleExpand::getClientUserBizId,clientUserBizIdList).list();
}
} }
yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/service/impl/UserSignExpandServiceImpl.java
...@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest; import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse; import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse;
import com.yd.insurance.base.service.dao.UserSignExpandMapper; import com.yd.insurance.base.service.dao.UserSignExpandMapper;
import com.yd.insurance.base.service.model.UserSaleExpand;
import com.yd.insurance.base.service.model.UserSignExpand; import com.yd.insurance.base.service.model.UserSignExpand;
import com.yd.insurance.base.service.service.IUserSignExpandService; import com.yd.insurance.base.service.service.IUserSignExpandService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
...@@ -32,4 +34,13 @@ public class UserSignExpandServiceImpl extends ServiceImpl<UserSignExpandMapper, ...@@ -32,4 +34,13 @@ public class UserSignExpandServiceImpl extends ServiceImpl<UserSignExpandMapper,
public UserSignExpand queryOne(String userSignBizId) { public UserSignExpand queryOne(String userSignBizId) {
return this.getOne(new LambdaQueryWrapper<UserSignExpand>().eq(UserSignExpand::getUserBizId,userSignBizId)); return this.getOne(new LambdaQueryWrapper<UserSignExpand>().eq(UserSignExpand::getUserBizId,userSignBizId));
} }
@Override
public UserSignExpand queryOne(String userSignBizId, String clientUserBizId) {
return this.getOne(new LambdaQueryWrapper<UserSignExpand>()
.eq(StringUtils.isNotBlank(userSignBizId),UserSignExpand::getUserSignBizId,userSignBizId)
.eq(StringUtils.isNotBlank(clientUserBizId),UserSignExpand::getClientUserBizId,clientUserBizId)
.last(" limit 1 ")
);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment