Skip to content

Y
yd-csf
Commit f92ec39e by zhangxingmin
Options

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

# Conflicts:
#	yd-csf-api/Dockerfile
parents aef66dfa c99bb692
Showing with 706 additions and 432 deletions
yd-csf-api/Dockerfile
# 基础镜像
FROM openjdk:8 FROM openjdk:8
# 维护人 # 维护人
LABEL maintainer="zxm<2060197959@qq.com>" LABEL maintainer="zxm<2060197959@qq.com>"
# 创建目录
# 创建目录（Alpine 命令相同）
RUN mkdir -p /home/app RUN mkdir -p /home/app
# 拷贝项目jar - 使用可执行的 fat JAR
# 拷贝项目 jar
COPY target/yd-csf-api-1.0-SNAPSHOT-exec.jar /home/app/yd-csf-api.jar COPY target/yd-csf-api-1.0-SNAPSHOT-exec.jar /home/app/yd-csf-api.jar
# 执行命令启动jar，并设置JVM内存参数
# 启动命令（内存参数可保留） ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-Xmx256m", "-Xms128m", "-jar", "/home/app/yd-csf-api.jar"]
ENTRYPOINT ["java", "-Xmx256m", "-Xms128m", "-jar", "/home/app/yd-csf-api.jar"]
# 暴露端口 # 暴露端口
EXPOSE 9202 EXPOSE 9202
yd-csf-api/src/main/java/com/yd/csf/api/async/ApiExpectedFortuneAsyncService.java
package com.yd.csf.api.async; package com.yd.csf.api.async;
import com.yd.common.result.Result;
import com.yd.csf.api.service.ApiExpectedFortuneService;
import com.yd.csf.feign.request.expectedfortune.ApiGenerateExpectedFortuneRequest;
import com.yd.csf.feign.response.expectedfortune.ApiGenerateExpectedFortuneResponse;
import com.yd.feign.config.FeignTokenInterceptor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@Slf4j @Slf4j
@Component @Component
public class ApiExpectedFortuneAsyncService { public class ApiExpectedFortuneAsyncService {
@Resource
private ApiExpectedFortuneService apiExpectedFortuneService;
/**
* 异步处理
*
* @return
*/
@Async("commonAsyncExecutor")
public Result execute(String policyNo, String token) {
// 将 token 设置到 ThreadLocal 中，供 Feign 拦截器使用
FeignTokenInterceptor.setThreadLocalToken(token);
HttpServletRequest request1 = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token1 = request1.getHeader("Authorization");
log.info("异步处理 token==============,{}",token1);
try {
ApiGenerateExpectedFortuneRequest request = new ApiGenerateExpectedFortuneRequest();
request.setPolicyNo(policyNo);
log.info("生成预计发佣 generateSyncWithLogAndRedis ——> PolicyNo：{}", policyNo);
Result<ApiGenerateExpectedFortuneResponse> result =
apiExpectedFortuneService.generateSyncWithLogAndRedis(request);
if (result != null && result.getCode() == 200) {
log.info("新单跟进-同步生成预计出账记录成功: 保单号={}", policyNo);
}
return result;
} finally {
// 必须清理，防止内存泄漏
FeignTokenInterceptor.clearThreadLocalToken();
}
}
} }
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
...@@ -247,13 +247,20 @@ public class ApiCommissionExpectedController { ...@@ -247,13 +247,20 @@ public class ApiCommissionExpectedController {
if (policy == null) { if (policy == null) {
return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "保单不存在"); return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "保单不存在");
} }
PolicyFollow policyFollow = policyFollowService.lambdaQuery().eq(PolicyFollow::getPolicyNo, request.getPolicyNo()).one();
if (policyFollow == null) {
return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "新单跟进不存在");
}
commissionExpectedService.getExpectedCommissionByProductlaunchId( commissionExpectedService.getExpectedCommissionByProductlaunchId(
policy, policy,
request.getProductLaunchBizId(), request.getProductLaunchBizId(),
request.getInsuranceCompanyBizId(), request.getInsuranceCompanyBizId(),
request.getReconciliationCompany(), request.getReconciliationCompany(),
request.getReconciliationCompanyCode(), request.getReconciliationCompanyCode(),
request.getReconciliationCompanyBizId()); request.getReconciliationCompanyBizId(),
policyFollow.getProfessionalInvestor());
return Result.success(true); return Result.success(true);
} }
...@@ -389,4 +396,15 @@ public class ApiCommissionExpectedController { ...@@ -389,4 +396,15 @@ public class ApiCommissionExpectedController {
} }
return Collections.emptyList(); return Collections.emptyList();
} }
@GetMapping("/test_expected_commission")
@Operation(summary = "测试佣金匹配")
public Result<Boolean> testExpectedCommission(@RequestParam("policyNo") String policyNo) {
if (StringUtils.isBlank(policyNo)) {
return Result.fail(ResultCode.NULL_ERROR.getCode(), "policyNo不能为空");
}
commissionExpectedService.testExpectedCommission(policyNo);
return Result.success(true);
}
} }
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java
...@@ -18,6 +18,7 @@ import com.yd.common.enums.ResultCode; ...@@ -18,6 +18,7 @@ import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException; 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.csf.api.async.ApiExpectedFortuneAsyncService;
import com.yd.csf.api.dto.CommissionExcelDTO; import com.yd.csf.api.dto.CommissionExcelDTO;
import com.yd.csf.api.dto.PolicyExcelDTO; import com.yd.csf.api.dto.PolicyExcelDTO;
import com.yd.csf.api.dto.PolicyFollowDTO; import com.yd.csf.api.dto.PolicyFollowDTO;
...@@ -93,14 +94,16 @@ public class ApiPolicyFollowController { ...@@ -93,14 +94,16 @@ public class ApiPolicyFollowController {
private ApiInsuranceReconciliationCompanyFeignClient apiInsuranceReconciliationCompanyFeignClient; private ApiInsuranceReconciliationCompanyFeignClient apiInsuranceReconciliationCompanyFeignClient;
@Resource @Resource
private CommissionExpectedService commissionExpectedService; private CommissionExpectedService commissionExpectedService;
@Resource // @Resource
private ApiPolicyFollowService apiPolicyFollowService; // private ApiPolicyFollowService apiPolicyFollowService;
@Resource // @Resource
private ApiExpectedFortuneService apiExpectedFortuneService; // private ApiExpectedFortuneService apiExpectedFortuneService;
@Resource @Resource
private ApiAnnouncementCommissionRatioFeignClient apiAnnouncementCommissionRatioFeignClient; private ApiAnnouncementCommissionRatioFeignClient apiAnnouncementCommissionRatioFeignClient;
@Resource @Resource
private FeignResultHelper feignResultHelper; private FeignResultHelper feignResultHelper;
@Resource
private ApiExpectedFortuneAsyncService apiExpectedFortuneAsyncService;
@PostMapping("/upload/excel") @PostMapping("/upload/excel")
...@@ -573,10 +576,13 @@ public class ApiPolicyFollowController { ...@@ -573,10 +576,13 @@ public class ApiPolicyFollowController {
if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) { if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) {
// 获取Token // 获取Token
String token = request.getHeader("Authorization"); String token = request.getHeader("Authorization");
log.info("修改跟进状态获取token：{}", token); log.info("修改跟进状态获取token=======================>：{}", token);
log.info("修改跟进状态调用异步开始：{}", "=======================>");
// 同步：根据保单生成预计出账记录 // 同步：根据保单生成预计出账记录
execute(token, policyFollow.getPolicyNo()); // execute(token, policyFollow.getPolicyNo());
apiExpectedFortuneAsyncService.execute(policyFollow.getPolicyNo(),token);
} }
log.info("修改跟进状态直接结束：{}", "=======================>");
return Result.success(true); return Result.success(true);
} }
...@@ -587,22 +593,22 @@ public class ApiPolicyFollowController { ...@@ -587,22 +593,22 @@ public class ApiPolicyFollowController {
policyFollow.getProductName()); policyFollow.getProductName());
} }
/** // /**
* 异步处理 // * 异步处理
* // *
* @return // * @return
*/ // */
public Result execute(String token, String policyNo) { // public Result execute(String token, String policyNo) {
// 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理） // // 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest(); // ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
generateExpectedFortuneRequest.setPolicyNo(policyNo); // generateExpectedFortuneRequest.setPolicyNo(policyNo);
log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo); // log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo);
Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest); // Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest);
if (result != null && result.getCode() == 200) { // if (result != null && result.getCode() == 200) {
log.info("新单跟进-同步生成预计出账记录成功:保单号={}", policyNo); // log.info("新单跟进-同步生成预计出账记录成功:保单号={}", policyNo);
} // }
return Result.success(); // return Result.success();
} // }
/** /**
* 新单跟进状态列表查询 * 新单跟进状态列表查询
......
yd-csf-api/src/main/java/com/yd/csf/api/service/ApiPremiumReconciliationService.java
...@@ -31,9 +31,6 @@ public interface ApiPremiumReconciliationService { ...@@ -31,9 +31,6 @@ public interface ApiPremiumReconciliationService {
Result editResult(ApiPremiumReconciliationResultEditRequest request); Result editResult(ApiPremiumReconciliationResultEditRequest request);
@Async("commonAsyncExecutor")
void execute(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token);
Result<Boolean> checkReconciliationComplete(String policyNo); Result<Boolean> checkReconciliationComplete(String policyNo);
Result<PremiumReconciliation> checkPremiumReconciliationIsExist(String expectedCommissionRatioBizId); Result<PremiumReconciliation> checkPremiumReconciliationIsExist(String expectedCommissionRatioBizId);
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAdditionalServiceImpl.java
...@@ -81,6 +81,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService { ...@@ -81,6 +81,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiProductPlanAdditionalInfoDto apiProductPlanAdditionalInfoDto) { public Result add(ApiProductPlanAdditionalInfoDto apiProductPlanAdditionalInfoDto) {
List<ApiProductPlanAdditionalInfoDto> list = new ArrayList<>(); List<ApiProductPlanAdditionalInfoDto> list = new ArrayList<>();
list.add(apiProductPlanAdditionalInfoDto); list.add(apiProductPlanAdditionalInfoDto);
...@@ -100,6 +101,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService { ...@@ -100,6 +101,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiProductPlanAdditionalInfoDto apiProductPlanAdditionalInfoDto) { public Result edit(ApiProductPlanAdditionalInfoDto apiProductPlanAdditionalInfoDto) {
//编辑预约入参字段校验 - 产品计划信息字段校验 - 编辑产品附加险信息单个对象字段校验 //编辑预约入参字段校验 - 产品计划信息字段校验 - 编辑产品附加险信息单个对象字段校验
apiAppointmentCheckService.checkEditApiProductPlanAdditionalInfoDto(apiProductPlanAdditionalInfoDto); apiAppointmentCheckService.checkEditApiProductPlanAdditionalInfoDto(apiProductPlanAdditionalInfoDto);
...@@ -134,6 +136,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService { ...@@ -134,6 +136,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String additionalBizId) { public Result del(String additionalBizId) {
//校验附加险信息是否存在 //校验附加险信息是否存在
Result<Additional> result = checkAdditionalIsExist(additionalBizId); Result<Additional> result = checkAdditionalIsExist(additionalBizId);
...@@ -183,6 +186,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService { ...@@ -183,6 +186,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result batchEditAdditionalData(ApiProductPlanInfoDto productPlanInfoDto, String planBizId) { public Result batchEditAdditionalData(ApiProductPlanInfoDto productPlanInfoDto, String planBizId) {
if (Objects.isNull(productPlanInfoDto) if (Objects.isNull(productPlanInfoDto)
|| ( !Objects.isNull(productPlanInfoDto) || ( !Objects.isNull(productPlanInfoDto)
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAgentDetailFycServiceImpl.java
...@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -35,6 +36,7 @@ public class ApiAgentDetailFycServiceImpl implements ApiAgentDetailFycService { ...@@ -35,6 +36,7 @@ public class ApiAgentDetailFycServiceImpl implements ApiAgentDetailFycService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result saveAgentDetailFyc(GenerateAgentDetailFycDto dto) { public Result saveAgentDetailFyc(GenerateAgentDetailFycDto dto) {
List<AlgorithmResDto> algorithmResDtoList = dto.getAlgorithmResDtoList(); List<AlgorithmResDto> algorithmResDtoList = dto.getAlgorithmResDtoList();
List<AgentDetailFyc> agentDetailFycList = new ArrayList<>(); List<AgentDetailFyc> agentDetailFycList = new ArrayList<>();
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAgentReferralRelationServiceImpl.java
...@@ -9,6 +9,7 @@ import com.yd.csf.service.model.AgentReferralRelation; ...@@ -9,6 +9,7 @@ import com.yd.csf.service.model.AgentReferralRelation;
import com.yd.csf.service.service.IAgentReferralRelationService; import com.yd.csf.service.service.IAgentReferralRelationService;
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 org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -25,6 +26,7 @@ public class ApiAgentReferralRelationServiceImpl implements ApiAgentReferralRela ...@@ -25,6 +26,7 @@ public class ApiAgentReferralRelationServiceImpl implements ApiAgentReferralRela
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result save(ApiAgentReferralRelationSaveRequest request) { public Result save(ApiAgentReferralRelationSaveRequest request) {
//先删后新增 //先删后新增
iAgentReferralRelationService.del(request.getAgentIdList(), request.getReferrerId()); iAgentReferralRelationService.del(request.getAgentIdList(), request.getReferrerId());
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentFileServiceImpl.java
...@@ -8,6 +8,7 @@ import com.yd.auth.core.utils.SecurityUtil; ...@@ -8,6 +8,7 @@ import com.yd.auth.core.utils.SecurityUtil;
import com.yd.common.constant.RedisConstants; import com.yd.common.constant.RedisConstants;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.DictTypeEnum; import com.yd.common.enums.DictTypeEnum;
import com.yd.common.enums.ProjectEnum;
import com.yd.common.exception.BusinessException; import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.common.utils.*; import com.yd.common.utils.*;
...@@ -46,6 +47,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -46,6 +47,7 @@ import org.apache.commons.lang3.StringUtils;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.*; import java.util.*;
...@@ -137,6 +139,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -137,6 +139,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiAppointmentFileAddRequest request) { public Result add(ApiAppointmentFileAddRequest request) {
//获取Security上下文当前用户的登录信息 //获取Security上下文当前用户的登录信息
AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser(); AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
...@@ -154,6 +157,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -154,6 +157,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiAppointmentFileEditRequest request) { public Result edit(ApiAppointmentFileEditRequest request) {
Result<AppointmentFile> result = checkAppointmentFileIsExist(request.getAppointmentFileBizId()); Result<AppointmentFile> result = checkAppointmentFileIsExist(request.getAppointmentFileBizId());
AppointmentFile appointmentFile = result.getData(); AppointmentFile appointmentFile = result.getData();
...@@ -168,6 +172,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -168,6 +172,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String appointmentFileBizId) { public Result del(String appointmentFileBizId) {
Result<AppointmentFile> result = checkAppointmentFileIsExist(appointmentFileBizId); Result<AppointmentFile> result = checkAppointmentFileIsExist(appointmentFileBizId);
AppointmentFile appointmentFile = result.getData(); AppointmentFile appointmentFile = result.getData();
...@@ -181,6 +186,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -181,6 +186,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result download(String appointmentFileBizId) { public Result download(String appointmentFileBizId) {
return null; return null;
} }
...@@ -191,6 +197,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -191,6 +197,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<String> itineraryPdf(String appointmentBizId) { public Result<String> itineraryPdf(String appointmentBizId) {
String url = ""; String url = "";
//查询redis缓存的字典列表信息 //查询redis缓存的字典列表信息
...@@ -206,6 +213,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -206,6 +213,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
request.setDataObject(itineraryDto); request.setDataObject(itineraryDto);
request.setObjectId(appointmentBizId); request.setObjectId(appointmentBizId);
request.setTemplateType(TemplateTypeEnum.XCD.getItemValue()); request.setTemplateType(TemplateTypeEnum.XCD.getItemValue());
request.setProjectBizId(ProjectEnum.CSF_PC.getProjectBizId());
if (StringUtils.isNotBlank(itineraryDto.getName()) && if (StringUtils.isNotBlank(itineraryDto.getName()) &&
StringUtils.isNotBlank(itineraryDto.getArrivalTime())) { StringUtils.isNotBlank(itineraryDto.getArrivalTime())) {
//咨询人和集合日（签单日）都不为空，文件名 = 咨询人 + 集合日（20260103） //咨询人和集合日（签单日）都不为空，文件名 = 咨询人 + 集合日（20260103）
...@@ -236,6 +244,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -236,6 +244,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId) { public Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId) {
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
try { try {
...@@ -342,6 +351,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -342,6 +351,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
excelRequest.setAppointmentBizId(appointmentBizId); excelRequest.setAppointmentBizId(appointmentBizId);
excelRequest.setData(data); excelRequest.setData(data);
excelRequest.setTemplateType(TemplateTypeEnum.YYD.getItemValue()); excelRequest.setTemplateType(TemplateTypeEnum.YYD.getItemValue());
excelRequest.setProjectBizId(ProjectEnum.CSF_PC.getProjectBizId());
Result<ApiOssExportAppointmentExcelResponse> result1 = apiExcelFeignClient.exportAppointment(excelRequest); Result<ApiOssExportAppointmentExcelResponse> result1 = apiExcelFeignClient.exportAppointment(excelRequest);
ApiOssExportAppointmentExcelResponse excelResponse = result1.getData(); ApiOssExportAppointmentExcelResponse excelResponse = result1.getData();
ApiAppointmentExportExcelResponse response = new ApiAppointmentExportExcelResponse(); ApiAppointmentExportExcelResponse response = new ApiAppointmentExportExcelResponse();
...@@ -362,6 +372,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService ...@@ -362,6 +372,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<ApiAppointmentImportExcelResponse> appointmentImportExcel(MultipartFile file, public Result<ApiAppointmentImportExcelResponse> appointmentImportExcel(MultipartFile file,
ApiAppointmentImportExcelRequest request) { ApiAppointmentImportExcelRequest request) {
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentLogServiceImpl.java
...@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
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 org.springframework.transaction.annotation.Transactional;
@Service @Service
@Slf4j @Slf4j
...@@ -25,6 +26,7 @@ public class ApiAppointmentLogServiceImpl implements ApiAppointmentLogService { ...@@ -25,6 +26,7 @@ public class ApiAppointmentLogServiceImpl implements ApiAppointmentLogService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<String> saveAppointmentLog(Appointment appointment) { public Result<String> saveAppointmentLog(Appointment appointment) {
AppointmentLog appointmentLog = new AppointmentLog(); AppointmentLog appointmentLog = new AppointmentLog();
BeanUtils.copyProperties(appointment,appointmentLog); BeanUtils.copyProperties(appointment,appointmentLog);
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentReferrerLogServiceImpl.java
...@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -29,6 +30,7 @@ public class ApiAppointmentReferrerLogServiceImpl implements ApiAppointmentRefer ...@@ -29,6 +30,7 @@ public class ApiAppointmentReferrerLogServiceImpl implements ApiAppointmentRefer
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result saveAppointmentReferrerLogList(List<ApiAppointmentReferrerDto> referrerDtoList, public Result saveAppointmentReferrerLogList(List<ApiAppointmentReferrerDto> referrerDtoList,
String appointmentLogBizId) { String appointmentLogBizId) {
if (CollectionUtils.isEmpty(referrerDtoList)) { if (CollectionUtils.isEmpty(referrerDtoList)) {
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java
...@@ -280,6 +280,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -280,6 +280,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @param appointmentBizId * @param appointmentBizId
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result addRelObjectMaterialList(String appointmentBizId, public Result addRelObjectMaterialList(String appointmentBizId,
List<ApiAppointmentMaterialDto> dtoList) { List<ApiAppointmentMaterialDto> dtoList) {
//添加-单个对象和材料列表关系信息 //添加-单个对象和材料列表关系信息
...@@ -497,6 +498,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -497,6 +498,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* 更新关联的FNA状态为"待签单" * 更新关联的FNA状态为"待签单"
* @param fnaBizId FNA业务ID * @param fnaBizId FNA业务ID
*/ */
@Transactional(rollbackFor = Exception.class)
private void updateFnaStatusToPendingSignature(String fnaBizId) { private void updateFnaStatusToPendingSignature(String fnaBizId) {
if (StringUtils.isBlank(fnaBizId)) { if (StringUtils.isBlank(fnaBizId)) {
return; return;
...@@ -514,6 +516,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -514,6 +516,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result editStorage(ApiAppointmentEditStorageRequest request) { public Result editStorage(ApiAppointmentEditStorageRequest request) {
//校验预约信息-客户和fna入参 //校验预约信息-客户和fna入参
apiAppointmentCheckService.checkCustomerAndFna(request.getApiAppointmentInfoDto(), "预约信息-"); apiAppointmentCheckService.checkCustomerAndFna(request.getApiAppointmentInfoDto(), "预约信息-");
...@@ -1175,6 +1178,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -1175,6 +1178,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result editStatus(ApiAppointmentEditStatusRequest request) { public Result editStatus(ApiAppointmentEditStatusRequest request) {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId()); Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
...@@ -1196,6 +1200,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -1196,6 +1200,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* 取消预约-更新新单跟进状态为取消预约 * 取消预约-更新新单跟进状态为取消预约
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result editFollowStatus(String appointmentBizId) { public Result editFollowStatus(String appointmentBizId) {
List<PolicyFollow> followList = policyFollowService.queryListByAppointmentBizId(appointmentBizId); List<PolicyFollow> followList = policyFollowService.queryListByAppointmentBizId(appointmentBizId);
if (!CollectionUtils.isEmpty(followList)) { if (!CollectionUtils.isEmpty(followList)) {
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentUserSignLogServiceImpl.java
...@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -29,6 +30,7 @@ public class ApiAppointmentUserSignLogServiceImpl implements ApiAppointmentUserS ...@@ -29,6 +30,7 @@ public class ApiAppointmentUserSignLogServiceImpl implements ApiAppointmentUserS
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result saveAppointmentUserSignLogList(List<ApiAppointmentUserSignDto> userSignDtoList, public Result saveAppointmentUserSignLogList(List<ApiAppointmentUserSignDto> userSignDtoList,
String appointmentLogBizId) { String appointmentLogBizId) {
if (CollectionUtils.isEmpty(userSignDtoList)) { if (CollectionUtils.isEmpty(userSignDtoList)) {
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiBeneficiaryServiceImpl.java
...@@ -83,6 +83,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService { ...@@ -83,6 +83,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiBeneficiaryInfoDto apiBeneficiaryInfoDto) { public Result add(ApiBeneficiaryInfoDto apiBeneficiaryInfoDto) {
List<ApiBeneficiaryInfoDto> list = new ArrayList<>(); List<ApiBeneficiaryInfoDto> list = new ArrayList<>();
list.add(apiBeneficiaryInfoDto); list.add(apiBeneficiaryInfoDto);
...@@ -99,6 +100,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService { ...@@ -99,6 +100,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiBeneficiaryInfoDto apiBeneficiaryInfoDto) { public Result edit(ApiBeneficiaryInfoDto apiBeneficiaryInfoDto) {
//编辑预约入参字段校验 - 编辑单个受益人信息字段校验 //编辑预约入参字段校验 - 编辑单个受益人信息字段校验
apiAppointmentCheckService.checkEditApiBeneficiaryInfoDto(apiBeneficiaryInfoDto); apiAppointmentCheckService.checkEditApiBeneficiaryInfoDto(apiBeneficiaryInfoDto);
...@@ -118,6 +120,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService { ...@@ -118,6 +120,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result batchEdit(ApiBatchEditBeneficiaryRequest request) { public Result batchEdit(ApiBatchEditBeneficiaryRequest request) {
apiAppointmentCheckService.checkEditApiBeneficiaryInfoDtoList(request.getApiBeneficiaryInfoDtoList()); apiAppointmentCheckService.checkEditApiBeneficiaryInfoDtoList(request.getApiBeneficiaryInfoDtoList());
//批量编辑受益人信息表数据 //批量编辑受益人信息表数据
...@@ -131,6 +134,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService { ...@@ -131,6 +134,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String beneficiaryBizId) { public Result del(String beneficiaryBizId) {
//校验受益人信息是否存在 //校验受益人信息是否存在
Result<Beneficiary> result = checkBeneficiaryIsExist(beneficiaryBizId); Result<Beneficiary> result = checkBeneficiaryIsExist(beneficiaryBizId);
...@@ -177,6 +181,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService { ...@@ -177,6 +181,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result batchEditBeneficiaryData(List<ApiBeneficiaryInfoDto> list,String appointmentBizId) { public Result batchEditBeneficiaryData(List<ApiBeneficiaryInfoDto> list,String appointmentBizId) {
if (CollectionUtils.isEmpty(list)){ if (CollectionUtils.isEmpty(list)){
//为空放行 //为空放行
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiCommissionRuleConfigServiceImpl.java
...@@ -21,6 +21,7 @@ import com.yd.csf.service.service.ICommissionRuleConfigService; ...@@ -21,6 +21,7 @@ import com.yd.csf.service.service.ICommissionRuleConfigService;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
...@@ -65,6 +66,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf ...@@ -65,6 +66,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiCommissionRuleConfigAddRequest request) { public Result add(ApiCommissionRuleConfigAddRequest request) {
//校验基本法名称的唯一性 //校验基本法名称的唯一性
List<CommissionRuleConfig> list = iCommissionRuleConfigService.queryList(CommissionRuleConfigDto.builder() List<CommissionRuleConfig> list = iCommissionRuleConfigService.queryList(CommissionRuleConfigDto.builder()
...@@ -88,6 +90,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf ...@@ -88,6 +90,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiCommissionRuleConfigEditRequest request) { public Result edit(ApiCommissionRuleConfigEditRequest request) {
//校验基本法配置信息是否存在 //校验基本法配置信息是否存在
Result<CommissionRuleConfig> result = checkCommissionRuleConfigIsExist(request.getRuleBizId()); Result<CommissionRuleConfig> result = checkCommissionRuleConfigIsExist(request.getRuleBizId());
...@@ -113,6 +116,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf ...@@ -113,6 +116,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String ruleBizId) { public Result del(String ruleBizId) {
return null; return null;
} }
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiConditionConfigServiceImpl.java
...@@ -23,6 +23,7 @@ import com.yd.csf.service.service.IConditionTypeService; ...@@ -23,6 +23,7 @@ import com.yd.csf.service.service.IConditionTypeService;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
...@@ -72,6 +73,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService ...@@ -72,6 +73,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiConditionConfigAddRequest request) { public Result add(ApiConditionConfigAddRequest request) {
//校验条件名称唯一性 //校验条件名称唯一性
List<ConditionConfig> conditionConfigList = iConditionConfigService.queryList(ConditionConfigDto.builder() List<ConditionConfig> conditionConfigList = iConditionConfigService.queryList(ConditionConfigDto.builder()
...@@ -96,6 +98,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService ...@@ -96,6 +98,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiConditionConfigEditRequest request) { public Result edit(ApiConditionConfigEditRequest request) {
Result<ConditionConfig> result = checkConditionConfigIsExist(request.getConditionBizId()); Result<ConditionConfig> result = checkConditionConfigIsExist(request.getConditionBizId());
ConditionConfig conditionConfig = result.getData(); ConditionConfig conditionConfig = result.getData();
...@@ -120,6 +123,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService ...@@ -120,6 +123,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String conditionBizId) { public Result del(String conditionBizId) {
return null; return null;
} }
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiConditionTypeServiceImpl.java
...@@ -21,6 +21,7 @@ import com.yd.csf.service.service.IConditionTypeService; ...@@ -21,6 +21,7 @@ import com.yd.csf.service.service.IConditionTypeService;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
...@@ -63,6 +64,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService { ...@@ -63,6 +64,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiConditionTypeAddRequest request) { public Result add(ApiConditionTypeAddRequest request) {
//校验条件类型名称唯一性 //校验条件类型名称唯一性
List<ConditionType> conditionTypeList = iConditionTypeService.queryList(ConditionTypeDto.builder() List<ConditionType> conditionTypeList = iConditionTypeService.queryList(ConditionTypeDto.builder()
...@@ -86,6 +88,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService { ...@@ -86,6 +88,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiConditionTypeEditRequest request) { public Result edit(ApiConditionTypeEditRequest request) {
Result<ConditionType> result = checkConditionTypeIsExist(request.getConditionTypeBizId()); Result<ConditionType> result = checkConditionTypeIsExist(request.getConditionTypeBizId());
ConditionType conditionType = result.getData(); ConditionType conditionType = result.getData();
...@@ -109,6 +112,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService { ...@@ -109,6 +112,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String conditionTypeBizId) { public Result del(String conditionTypeBizId) {
return null; return null;
} }
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
...@@ -54,8 +54,11 @@ import org.springframework.stereotype.Service; ...@@ -54,8 +54,11 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionTemplate; import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
...@@ -117,6 +120,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -117,6 +120,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<ApiGenerateExpectedFortuneResponse> generate(ApiGenerateExpectedFortuneRequest request) { public Result<ApiGenerateExpectedFortuneResponse> generate(ApiGenerateExpectedFortuneRequest request) {
//查询当前保单号是否正在执行预计发佣的缓存，有值就说明正在执行，无值说明执行完毕或者没有执行。 //查询当前保单号是否正在执行预计发佣的缓存，有值就说明正在执行，无值说明执行完毕或者没有执行。
String value = redisUtil.getCacheObject(RedisConstants.EXPECTED_FORTUNE + request.getPolicyNo()); String value = redisUtil.getCacheObject(RedisConstants.EXPECTED_FORTUNE + request.getPolicyNo());
...@@ -182,6 +186,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -182,6 +186,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
* @param request * @param request
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result<ApiGenerateExpectedFortuneResponse> generateSync(ApiGenerateExpectedFortuneRequest request) { public Result<ApiGenerateExpectedFortuneResponse> generateSync(ApiGenerateExpectedFortuneRequest request) {
//查询当前保单号是否正在执行预计发佣的缓存，有值就说明正在执行，无值说明执行完毕或者没有执行。 //查询当前保单号是否正在执行预计发佣的缓存，有值就说明正在执行，无值说明执行完毕或者没有执行。
String value = redisUtil.getCacheObject(RedisConstants.EXPECTED_FORTUNE + request.getPolicyNo()); String value = redisUtil.getCacheObject(RedisConstants.EXPECTED_FORTUNE + request.getPolicyNo());
...@@ -222,6 +227,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -222,6 +227,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
announcementRatioListRequest.setEffectiveDate(Date.from(queryPolicyAndBrokerDto.getEffectiveDate().atStartOfDay(ZoneId.systemDefault()).toInstant())); announcementRatioListRequest.setEffectiveDate(Date.from(queryPolicyAndBrokerDto.getEffectiveDate().atStartOfDay(ZoneId.systemDefault()).toInstant()));
announcementRatioListRequest.setPaymentTerm(String.valueOf(queryPolicyAndBrokerDto.getPaymentTerm())); announcementRatioListRequest.setPaymentTerm(String.valueOf(queryPolicyAndBrokerDto.getPaymentTerm()));
HttpServletRequest request1 = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request1.getHeader("Authorization");
log.info("HttpServletRequest token==============,{}",token);
List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList; List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList;
try { try {
announcementRatioList = feignResultHelper.extractListData( announcementRatioList = feignResultHelper.extractListData(
...@@ -233,6 +241,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -233,6 +241,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
throw new BusinessException("未查询到产品发佣配置，查询条件：" + JSON.toJSONString(announcementRatioListRequest)); throw new BusinessException("未查询到产品发佣配置，查询条件：" + JSON.toJSONString(announcementRatioListRequest));
} }
log.info("查询产品发佣配置，获取结算币种==========>，{}",JSON.toJSONString(announcementRatioList));
Integer paymentTerm = 0; Integer paymentTerm = 0;
PolicyFollow policyFollow = policyFollowService.queryOneByPolicyNo(request.getPolicyNo()); PolicyFollow policyFollow = policyFollowService.queryOneByPolicyNo(request.getPolicyNo());
if (policyFollow != null) { if (policyFollow != null) {
...@@ -273,6 +283,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -273,6 +283,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<ApiGenerateExpectedFortuneResponse> generateWithLogAndRedis(ApiGenerateExpectedFortuneRequest request) { public Result<ApiGenerateExpectedFortuneResponse> generateWithLogAndRedis(ApiGenerateExpectedFortuneRequest request) {
try { try {
Result<ApiGenerateExpectedFortuneResponse> result = generate(request); Result<ApiGenerateExpectedFortuneResponse> result = generate(request);
...@@ -313,6 +324,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -313,6 +324,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<ApiGenerateExpectedFortuneResponse> generateSyncWithLogAndRedis(ApiGenerateExpectedFortuneRequest request) { public Result<ApiGenerateExpectedFortuneResponse> generateSyncWithLogAndRedis(ApiGenerateExpectedFortuneRequest request) {
try { try {
Result<ApiGenerateExpectedFortuneResponse> result = generateSync(request); Result<ApiGenerateExpectedFortuneResponse> result = generateSync(request);
...@@ -354,6 +366,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -354,6 +366,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
*/ */
@Override @Override
@Async("commonAsyncExecutor") @Async("commonAsyncExecutor")
@Transactional(rollbackFor = Exception.class)
public Result execute(List<QueryPolicyAndBrokerDto> queryPolicyAndBrokerDtoList, public Result execute(List<QueryPolicyAndBrokerDto> queryPolicyAndBrokerDtoList,
List<CommissionRuleBinding> commissionRuleBindingList, List<CommissionRuleBinding> commissionRuleBindingList,
String policyNo, String policyNo,
...@@ -419,6 +432,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -419,6 +432,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
}); });
} }
@Transactional(rollbackFor = Exception.class)
private void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, String policyCurrency, List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList) { private void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, String policyCurrency, List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList) {
log.info("------------------------开始计算默认结算汇率、港币金额----------------------"); log.info("------------------------开始计算默认结算汇率、港币金额----------------------");
...@@ -463,13 +477,21 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -463,13 +477,21 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
* @param policyNo * @param policyNo
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result executeSync(List<QueryPolicyAndBrokerDto> queryPolicyAndBrokerDtoList, public Result executeSync(List<QueryPolicyAndBrokerDto> queryPolicyAndBrokerDtoList,
String policyNo, List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList,Integer paymentTerm) { String policyNo, List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList,Integer paymentTerm) {
log.info("同步处理-> 遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表->入参queryPolicyAndBrokerDtoList：{}",JSON.toJSONString(queryPolicyAndBrokerDtoList)); log.info("同步处理-> 遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表->入参queryPolicyAndBrokerDtoList：{}",JSON.toJSONString(queryPolicyAndBrokerDtoList));
log.info("同步处理-> 遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表->入参policyNo：{}",policyNo); log.info("同步处理-> 遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表->入参policyNo：{}",policyNo);
HttpServletRequest request1 = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request1.getHeader("Authorization");
log.info("同步处理-> 遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表 token==============,{}",token);
// 使用编程式事务，确保方法内的事务一致性 // 使用编程式事务，确保方法内的事务一致性
return transactionTemplate.execute(status -> { return transactionTemplate.execute(status -> {
try { try {
HttpServletRequest request2 = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token2 = request2.getHeader("Authorization");
log.info("使用编程式事务，确保方法内的事务一致性 token==============,{}",token2);
for (QueryPolicyAndBrokerDto brokerDto : queryPolicyAndBrokerDtoList) { for (QueryPolicyAndBrokerDto brokerDto : queryPolicyAndBrokerDtoList) {
// Integer paymentTerm = brokerDto.getPaymentTerm(); // Integer paymentTerm = brokerDto.getPaymentTerm();
...@@ -548,6 +570,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -548,6 +570,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
return commissionRuleBindingList; return commissionRuleBindingList;
} }
@Transactional(rollbackFor = Exception.class)
private List<ExpectedFortune> updatePayableNoBatch(String policyNo) { private List<ExpectedFortune> updatePayableNoBatch(String policyNo) {
// 查询最新一条有 payableNo 记录 // 查询最新一条有 payableNo 记录
ExpectedFortune latest = iExpectedFortuneService.getOne( ExpectedFortune latest = iExpectedFortuneService.getOne(
...@@ -841,6 +864,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -841,6 +864,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(List<ExpectedFortuneAddRequest> fortuneAddRequestList) { public Boolean add(List<ExpectedFortuneAddRequest> fortuneAddRequestList) {
if (CollectionUtils.isEmpty(fortuneAddRequestList)) { if (CollectionUtils.isEmpty(fortuneAddRequestList)) {
return true; return true;
...@@ -938,6 +962,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -938,6 +962,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
* @return 汇率 * @return 汇率
*/ */
private BigDecimal queryExchangeRateByFeign(String policyCurrency, String currency) { private BigDecimal queryExchangeRateByFeign(String policyCurrency, String currency) {
HttpServletRequest request2 = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token2 = request2.getHeader("Authorization");
log.info("保单币种对预计来佣的结算币种的默认汇率 token==============,{}",token2);
if (policyCurrency.equalsIgnoreCase(currency)) { if (policyCurrency.equalsIgnoreCase(currency)) {
return BigDecimal.ONE; return BigDecimal.ONE;
} }
...@@ -961,6 +988,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -961,6 +988,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void exportExpectedFortune(ApiExpectedFortunePageRequest request, HttpServletResponse response) { public void exportExpectedFortune(ApiExpectedFortunePageRequest request, HttpServletResponse response) {
// 查询数据 // 查询数据
QueryWrapper<ExpectedFortune> queryWrapper = this.getQueryWrapper(request); QueryWrapper<ExpectedFortune> queryWrapper = this.getQueryWrapper(request);
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiFormulaConfigServiceImpl.java
...@@ -23,6 +23,7 @@ import com.yd.csf.service.service.IFormulaConfigService; ...@@ -23,6 +23,7 @@ import com.yd.csf.service.service.IFormulaConfigService;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
...@@ -69,6 +70,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService { ...@@ -69,6 +70,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiFormulaConfigAddRequest request) { public Result add(ApiFormulaConfigAddRequest request) {
//校验公式名称唯一性 //校验公式名称唯一性
List<FormulaConfig> formulaConfigList = iFormulaConfigService.queryList(FormulaConfigDto.builder() List<FormulaConfig> formulaConfigList = iFormulaConfigService.queryList(FormulaConfigDto.builder()
...@@ -94,6 +96,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService { ...@@ -94,6 +96,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiFormulaConfigEditRequest request) { public Result edit(ApiFormulaConfigEditRequest request) {
Result<FormulaConfig> result = checkFormulaConfigIsExist(request.getFormulaBizId()); Result<FormulaConfig> result = checkFormulaConfigIsExist(request.getFormulaBizId());
FormulaConfig formulaConfig = result.getData(); FormulaConfig formulaConfig = result.getData();
...@@ -119,6 +122,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService { ...@@ -119,6 +122,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String formulaBizId) { public Result del(String formulaBizId) {
return null; return null;
} }
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiInsurantServiceImpl.java
...@@ -109,6 +109,7 @@ public class ApiInsurantServiceImpl implements ApiInsurantService { ...@@ -109,6 +109,7 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiInsurantInfoDto apiInsurantInfoDto) { public Result edit(ApiInsurantInfoDto apiInsurantInfoDto) {
//编辑预约入参字段校验 - 受保人信息字段校验 //编辑预约入参字段校验 - 受保人信息字段校验
apiAppointmentCheckService.checkEditApiInsurantInfoDto(apiInsurantInfoDto); apiAppointmentCheckService.checkEditApiInsurantInfoDto(apiInsurantInfoDto);
...@@ -225,6 +226,7 @@ public class ApiInsurantServiceImpl implements ApiInsurantService { ...@@ -225,6 +226,7 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<Insurant> editInsurantData(ApiInsurantInfoDto dto, String appointmentBizId) { public Result<Insurant> editInsurantData(ApiInsurantInfoDto dto, String appointmentBizId) {
if (Objects.isNull(dto)){ if (Objects.isNull(dto)){
//受保人信息对象不能为空 //受保人信息对象不能为空
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPolicyReceiptServiceImpl.java
...@@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -79,6 +80,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService { ...@@ -79,6 +80,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiPolicyReceiptAddRequest request) { public Result add(ApiPolicyReceiptAddRequest request) {
//校验保单信息是否存在 //校验保单信息是否存在
Policy policy = policyService.queryOne(request.getPolicyNo()); Policy policy = policyService.queryOne(request.getPolicyNo());
...@@ -101,6 +103,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService { ...@@ -101,6 +103,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPolicyReceiptEditRequest request) { public Result edit(ApiPolicyReceiptEditRequest request) {
//校验保单回执信息是否存在 //校验保单回执信息是否存在
PolicyReceipt policyReceipt = iPolicyReceiptService.queryOne(request.getPolicyReceiptBizId()); PolicyReceipt policyReceipt = iPolicyReceiptService.queryOne(request.getPolicyReceiptBizId());
...@@ -127,6 +130,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService { ...@@ -127,6 +130,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result editReceiptStatus(String policyReceiptBizId, String receiptStatus) { public Result editReceiptStatus(String policyReceiptBizId, String receiptStatus) {
PolicyReceipt policyReceipt = iPolicyReceiptService.queryOne(policyReceiptBizId); PolicyReceipt policyReceipt = iPolicyReceiptService.queryOne(policyReceiptBizId);
if (Objects.isNull(policyReceipt)) { if (Objects.isNull(policyReceipt)) {
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPolicyholderServiceImpl.java
...@@ -101,6 +101,7 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService { ...@@ -101,6 +101,7 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPolicyholderInfoDto apiPolicyholderInfoDto) { public Result edit(ApiPolicyholderInfoDto apiPolicyholderInfoDto) {
//编辑预约入参字段校验 - 投保人信息字段校验 //编辑预约入参字段校验 - 投保人信息字段校验
apiAppointmentCheckService.checkEditApiPolicyholderInfoDto(apiPolicyholderInfoDto); apiAppointmentCheckService.checkEditApiPolicyholderInfoDto(apiPolicyholderInfoDto);
...@@ -165,6 +166,7 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService { ...@@ -165,6 +166,7 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
* @param apiCertificateDtoList * @param apiCertificateDtoList
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result addRelObjectCertificateList(String objectBizId, public Result addRelObjectCertificateList(String objectBizId,
String objectType, String objectType,
String objectTableName, String objectTableName,
...@@ -187,6 +189,7 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService { ...@@ -187,6 +189,7 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<Policyholder> editPolicyholderData(ApiPolicyholderInfoDto dto, String appointmentBizId) { public Result<Policyholder> editPolicyholderData(ApiPolicyholderInfoDto dto, String appointmentBizId) {
if (Objects.isNull(dto)) { if (Objects.isNull(dto)) {
//投保人信息对象不能为空 //投保人信息对象不能为空
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumReconciliationServiceImpl.java
...@@ -15,6 +15,7 @@ import com.yd.common.enums.ResultCode; ...@@ -15,6 +15,7 @@ import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException; 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.csf.api.async.ApiExpectedFortuneAsyncService;
import com.yd.csf.api.service.ApiExpectedFortuneService; import com.yd.csf.api.service.ApiExpectedFortuneService;
import com.yd.csf.api.service.ApiPremiumReconciliationService; import com.yd.csf.api.service.ApiPremiumReconciliationService;
import com.yd.csf.api.service.ApiPremiumRemittanceService; import com.yd.csf.api.service.ApiPremiumRemittanceService;
...@@ -118,6 +119,9 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -118,6 +119,9 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
return applicationContext.getBean(ApiPremiumReconciliationService.class); return applicationContext.getBean(ApiPremiumReconciliationService.class);
} }
@Resource
private ApiExpectedFortuneAsyncService apiExpectedFortuneAsyncService;
/** /**
* 分页列表查询-保费对账记录信息 * 分页列表查询-保费对账记录信息
* @param request * @param request
...@@ -720,6 +724,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -720,6 +724,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiPremiumReconciliationAddRequest request) { public Result add(ApiPremiumReconciliationAddRequest request) {
//根据当前Policy保单信息里面的生效日期、付款频率、缴费宽限期，校验当天是否在缴费期内，不在缴费期内不能保费对账 TODO 校验待定 //根据当前Policy保单信息里面的生效日期、付款频率、缴费宽限期，校验当天是否在缴费期内，不在缴费期内不能保费对账 TODO 校验待定
//保费对账信息 //保费对账信息
...@@ -812,6 +817,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -812,6 +817,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPremiumReconciliationDto request) { public Result edit(ApiPremiumReconciliationDto request) {
if (StringUtils.isBlank(request.getPremiumReconciliationBizId())) { if (StringUtils.isBlank(request.getPremiumReconciliationBizId())) {
throw new BusinessException("保费对账记录表唯一业务ID不能为空"); throw new BusinessException("保费对账记录表唯一业务ID不能为空");
...@@ -1231,12 +1237,6 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -1231,12 +1237,6 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
return Result.success(); return Result.success();
} }
@Override
@Async("commonAsyncExecutor")
public void execute(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token) {
changePolicyFollowStatus(changePolicyFollowStatusRequest,token);
}
/** /**
* 修改跟进状态 * 修改跟进状态
* *
...@@ -1247,7 +1247,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -1247,7 +1247,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
public Result<Boolean> changePolicyFollowStatus(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token) { public Result<Boolean> changePolicyFollowStatus(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token) {
// 设置ThreadLocal Token // 设置ThreadLocal Token
FeignTokenInterceptor.setThreadLocalToken(token); // FeignTokenInterceptor.setThreadLocalToken(token);
if (changePolicyFollowStatusRequest == null || StringUtils.isBlank(changePolicyFollowStatusRequest.getPolicyBizId())) { if (changePolicyFollowStatusRequest == null || StringUtils.isBlank(changePolicyFollowStatusRequest.getPolicyBizId())) {
return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "policyBizId不能为空"); return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "policyBizId不能为空");
...@@ -1291,27 +1291,27 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia ...@@ -1291,27 +1291,27 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) { if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) {
log.info("修改跟进状态获取token：{}", token); log.info("修改跟进状态获取token：{}", token);
// 同步：根据保单生成预计出账记录 // 同步：根据保单生成预计出账记录
generateExpectedFortuneSync(token, policyFollow.getPolicyNo()); apiExpectedFortuneAsyncService.execute(policyFollow.getPolicyNo(),token);
} }
return Result.success(true); return Result.success(true);
} }
/** // /**
* 同步生成预计出账记录 // * 同步生成预计出账记录
* // *
* @param token 认证Token // * @param token 认证Token
* @param policyNo 保单号 // * @param policyNo 保单号
*/ // */
private void generateExpectedFortuneSync(String token, String policyNo) { // private void generateExpectedFortuneSync(String token, String policyNo) {
// 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理） // // 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest(); // ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
generateExpectedFortuneRequest.setPolicyNo(policyNo); // generateExpectedFortuneRequest.setPolicyNo(policyNo);
log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo); // log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo);
Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest); // Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest);
if (result != null && result.getCode() == 200) { // if (result != null && result.getCode() == 200) {
log.info("新单跟进-同步生成预计出账记录成功:保单号={}", policyNo); // log.info("新单跟进-同步生成预计出账记录成功:保单号={}", policyNo);
} // }
} // }
/** /**
* 校验-保单所有期数的保费对账是否对账完成（全部对账完成就不能新增录入对账信息了） * 校验-保单所有期数的保费对账是否对账完成（全部对账完成就不能新增录入对账信息了）
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumRemittanceFileServiceImpl.java
...@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -17,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -48,6 +49,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance ...@@ -48,6 +49,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiPremiumRemittanceFileDto request) { public Result add(ApiPremiumRemittanceFileDto request) {
if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) { if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) {
throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空"); throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空");
...@@ -66,6 +68,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance ...@@ -66,6 +68,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPremiumRemittanceFileDto request) { public Result edit(ApiPremiumRemittanceFileDto request) {
if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) { if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) {
throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空"); throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空");
...@@ -86,6 +89,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance ...@@ -86,6 +89,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String premiumRemittanceFileBizId) { public Result del(String premiumRemittanceFileBizId) {
Result<PremiumRemittanceFile> result = checkPremiumRemittanceFileIsExist(premiumRemittanceFileBizId); Result<PremiumRemittanceFile> result = checkPremiumRemittanceFileIsExist(premiumRemittanceFileBizId);
PremiumRemittanceFile file = result.getData(); PremiumRemittanceFile file = result.getData();
...@@ -100,6 +104,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance ...@@ -100,6 +104,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result addPremiumRemittanceFileList(List<ApiPremiumRemittanceFileDto> apiPremiumRemittanceFileDtoList, public Result addPremiumRemittanceFileList(List<ApiPremiumRemittanceFileDto> apiPremiumRemittanceFileDtoList,
String premiumRemittanceBizId) { String premiumRemittanceBizId) {
if (CollectionUtils.isEmpty(apiPremiumRemittanceFileDtoList)) { if (CollectionUtils.isEmpty(apiPremiumRemittanceFileDtoList)) {
...@@ -124,6 +129,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance ...@@ -124,6 +129,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result savePremiumRemittanceFileList(List<ApiPremiumRemittanceFileDto> apiPremiumRemittanceFileDtoList, public Result savePremiumRemittanceFileList(List<ApiPremiumRemittanceFileDto> apiPremiumRemittanceFileDtoList,
String premiumRemittanceBizId) { String premiumRemittanceBizId) {
//先删后新增 //先删后新增
...@@ -149,6 +155,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance ...@@ -149,6 +155,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result delByPremiumRemittanceBizId(String premiumRemittanceBizId) { public Result delByPremiumRemittanceBizId(String premiumRemittanceBizId) {
iPremiumRemittanceFileService.delByPremiumRemittanceBizId(premiumRemittanceBizId); iPremiumRemittanceFileService.delByPremiumRemittanceBizId(premiumRemittanceBizId);
return Result.success(); return Result.success();
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPremiumRemittanceServiceImpl.java
...@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -20,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -55,6 +56,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ ...@@ -55,6 +56,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiPremiumRemittanceDto request) { public Result add(ApiPremiumRemittanceDto request) {
if (StringUtils.isBlank(request.getPremiumReconciliationBizId())) { if (StringUtils.isBlank(request.getPremiumReconciliationBizId())) {
throw new BusinessException("保费对账记录表唯一业务ID不能为空"); throw new BusinessException("保费对账记录表唯一业务ID不能为空");
...@@ -72,6 +74,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ ...@@ -72,6 +74,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPremiumRemittanceDto request) { public Result edit(ApiPremiumRemittanceDto request) {
if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) { if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) {
throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空"); throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空");
...@@ -112,6 +115,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ ...@@ -112,6 +115,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String premiumRemittanceBizId) { public Result del(String premiumRemittanceBizId) {
checkPremiumRemittanceIsExist(premiumRemittanceBizId); checkPremiumRemittanceIsExist(premiumRemittanceBizId);
//删除保费对账汇款记录附件列表 //删除保费对账汇款记录附件列表
...@@ -128,6 +132,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ ...@@ -128,6 +132,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result addPremiumRemittanceList(List<ApiPremiumRemittanceDto> apiPremiumRemittanceDtoList, public Result addPremiumRemittanceList(List<ApiPremiumRemittanceDto> apiPremiumRemittanceDtoList,
String premiumReconciliationBizId) { String premiumReconciliationBizId) {
if (CollectionUtils.isEmpty(apiPremiumRemittanceDtoList)) { if (CollectionUtils.isEmpty(apiPremiumRemittanceDtoList)) {
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiProductPlanServiceImpl.java
...@@ -81,6 +81,7 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService { ...@@ -81,6 +81,7 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<String> edit(ApiProductPlanMainInfoDto apiProductPlanMainInfoDto) { public Result<String> edit(ApiProductPlanMainInfoDto apiProductPlanMainInfoDto) {
//编辑预约入参字段校验 - 产品计划信息字段校验 - 产品计划主信息字段校验 //编辑预约入参字段校验 - 产品计划信息字段校验 - 产品计划主信息字段校验
...@@ -102,6 +103,7 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService { ...@@ -102,6 +103,7 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result editPlan(ApiProductPlanInfoDto apiProductPlanInfoDto) { public Result editPlan(ApiProductPlanInfoDto apiProductPlanInfoDto) {
//编辑产品计划主体信息 //编辑产品计划主体信息
Result<String> result = edit(apiProductPlanInfoDto.getApiProductPlanMainInfoDto()); Result<String> result = edit(apiProductPlanInfoDto.getApiProductPlanMainInfoDto());
...@@ -146,6 +148,7 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService { ...@@ -146,6 +148,7 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<ProductPlan> editProductPlanData(ApiProductPlanInfoDto productPlanInfoDto, String appointmentBizId) { public Result<ProductPlan> editProductPlanData(ApiProductPlanInfoDto productPlanInfoDto, String appointmentBizId) {
if (Objects.isNull(productPlanInfoDto) if (Objects.isNull(productPlanInfoDto)
|| ( !Objects.isNull(productPlanInfoDto) && Objects.isNull(productPlanInfoDto.getApiProductPlanMainInfoDto()))){ || ( !Objects.isNull(productPlanInfoDto) && Objects.isNull(productPlanInfoDto.getApiProductPlanMainInfoDto()))){
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiRelObjectConditionServiceImpl.java
...@@ -12,6 +12,7 @@ import com.yd.csf.service.service.IRelObjectConditionService; ...@@ -12,6 +12,7 @@ import com.yd.csf.service.service.IRelObjectConditionService;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -32,6 +33,7 @@ public class ApiRelObjectConditionServiceImpl implements ApiRelObjectConditionSe ...@@ -32,6 +33,7 @@ public class ApiRelObjectConditionServiceImpl implements ApiRelObjectConditionSe
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result saveRelList(ApiRelObjectConditionDto dto) { public Result saveRelList(ApiRelObjectConditionDto dto) {
//先删后新增 //先删后新增
iRelObjectConditionService.del(dto); iRelObjectConditionService.del(dto);
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiRelObjectFormulaServiceImpl.java
...@@ -13,6 +13,7 @@ import com.yd.csf.service.service.IRelObjectFormulaService; ...@@ -13,6 +13,7 @@ import com.yd.csf.service.service.IRelObjectFormulaService;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -60,6 +61,7 @@ public class ApiRelObjectFormulaServiceImpl implements ApiRelObjectFormulaServic ...@@ -60,6 +61,7 @@ public class ApiRelObjectFormulaServiceImpl implements ApiRelObjectFormulaServic
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result saveRelList(ApiRelObjectFormulaDto dto) { public Result saveRelList(ApiRelObjectFormulaDto dto) {
//先删后新增 //先删后新增
RelObjectFormulaDto relObjectFormulaDto = new RelObjectFormulaDto(); RelObjectFormulaDto relObjectFormulaDto = new RelObjectFormulaDto();
...@@ -86,6 +88,7 @@ public class ApiRelObjectFormulaServiceImpl implements ApiRelObjectFormulaServic ...@@ -86,6 +88,7 @@ public class ApiRelObjectFormulaServiceImpl implements ApiRelObjectFormulaServic
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result saveObjectList(List<ApiRelObjectFormulaDto> objectList, String formulaBizId) { public Result saveObjectList(List<ApiRelObjectFormulaDto> objectList, String formulaBizId) {
//先删后新增 //先删后新增
iRelObjectFormulaService.delObjectList(formulaBizId); iRelObjectFormulaService.delObjectList(formulaBizId);
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiRelObjectSqlServiceImpl.java
...@@ -13,6 +13,7 @@ import com.yd.csf.service.service.IRelObjectSqlService; ...@@ -13,6 +13,7 @@ import com.yd.csf.service.service.IRelObjectSqlService;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -28,6 +29,7 @@ public class ApiRelObjectSqlServiceImpl implements ApiRelObjectSqlService { ...@@ -28,6 +29,7 @@ public class ApiRelObjectSqlServiceImpl implements ApiRelObjectSqlService {
private ICommissionSqlTemplateService iCommissionSqlTemplateService; private ICommissionSqlTemplateService iCommissionSqlTemplateService;
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result saveRelList(ApiRelObjectSqlDto dto) { public Result saveRelList(ApiRelObjectSqlDto dto) {
//先删后新增 //先删后新增
RelObjectSqlDto relObjectSqlDto = new RelObjectSqlDto(); RelObjectSqlDto relObjectSqlDto = new RelObjectSqlDto();
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiRuleItemConfigServiceImpl.java
...@@ -24,6 +24,7 @@ import com.yd.csf.service.service.IRuleItemConfigService; ...@@ -24,6 +24,7 @@ import com.yd.csf.service.service.IRuleItemConfigService;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -79,6 +80,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService { ...@@ -79,6 +80,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiRuleItemConfigAddRequest request) { public Result add(ApiRuleItemConfigAddRequest request) {
//校验基本法项目名称的唯一性 //校验基本法项目名称的唯一性
List<RuleItemConfig> list = iRuleItemConfigService.queryList(RuleItemConfigDto.builder() List<RuleItemConfig> list = iRuleItemConfigService.queryList(RuleItemConfigDto.builder()
...@@ -115,6 +117,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService { ...@@ -115,6 +117,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiRuleItemConfigEditRequest request) { public Result edit(ApiRuleItemConfigEditRequest request) {
Result<RuleItemConfig> result = checkRuleItemConfigIsExist(request.getRuleItemBizId()); Result<RuleItemConfig> result = checkRuleItemConfigIsExist(request.getRuleItemBizId());
RuleItemConfig ruleItemConfig = result.getData(); RuleItemConfig ruleItemConfig = result.getData();
...@@ -150,6 +153,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService { ...@@ -150,6 +153,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String ruleItemBizId) { public Result del(String ruleItemBizId) {
return null; return null;
} }
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSecondHolderServiceImpl.java
...@@ -55,6 +55,7 @@ public class ApiSecondHolderServiceImpl implements ApiSecondHolderService { ...@@ -55,6 +55,7 @@ public class ApiSecondHolderServiceImpl implements ApiSecondHolderService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiSecondHolderInfoDto apiSecondHolderInfoDto) { public Result edit(ApiSecondHolderInfoDto apiSecondHolderInfoDto) {
//编辑预约入参字段校验 - 第二持有人信息字段校验 //编辑预约入参字段校验 - 第二持有人信息字段校验
apiAppointmentCheckService.checkEditApiSecondHolderInfoDto(apiSecondHolderInfoDto); apiAppointmentCheckService.checkEditApiSecondHolderInfoDto(apiSecondHolderInfoDto);
...@@ -97,6 +98,7 @@ public class ApiSecondHolderServiceImpl implements ApiSecondHolderService { ...@@ -97,6 +98,7 @@ public class ApiSecondHolderServiceImpl implements ApiSecondHolderService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result<SecondHolder> editSecondHolderData(ApiSecondHolderInfoDto dto, String appointmentBizId) { public Result<SecondHolder> editSecondHolderData(ApiSecondHolderInfoDto dto, String appointmentBizId) {
if (Objects.isNull(dto)){ if (Objects.isNull(dto)){
//为空 //为空
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiTaxationServiceImpl.java
...@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; ...@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -32,6 +33,7 @@ public class ApiTaxationServiceImpl implements ApiTaxationService { ...@@ -32,6 +33,7 @@ public class ApiTaxationServiceImpl implements ApiTaxationService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result saveTaxationList(ApiObjectTaxationDto dto) { public Result saveTaxationList(ApiObjectTaxationDto dto) {
//先删后新增 //先删后新增
iTaxationService.delByObjectBizId(dto.getObjectBizId()); iTaxationService.delByObjectBizId(dto.getObjectBizId());
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiVariableServiceImpl.java
...@@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils; ...@@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils;
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 org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -93,6 +94,7 @@ public class ApiVariableServiceImpl implements ApiVariableService { ...@@ -93,6 +94,7 @@ public class ApiVariableServiceImpl implements ApiVariableService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiVariableAddRequest request) { public Result add(ApiVariableAddRequest request) {
//校验变量中文名唯一性 //校验变量中文名唯一性
List<Variable> variableList = iVariableService.queryList(VariableDto.builder() List<Variable> variableList = iVariableService.queryList(VariableDto.builder()
...@@ -150,6 +152,7 @@ public class ApiVariableServiceImpl implements ApiVariableService { ...@@ -150,6 +152,7 @@ public class ApiVariableServiceImpl implements ApiVariableService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiVariableEditRequest request) { public Result edit(ApiVariableEditRequest request) {
//校验变量信息是否存在 //校验变量信息是否存在
Result<Variable> result = checkVariableIsExist(request.getVariableBizId()); Result<Variable> result = checkVariableIsExist(request.getVariableBizId());
...@@ -209,6 +212,7 @@ public class ApiVariableServiceImpl implements ApiVariableService { ...@@ -209,6 +212,7 @@ public class ApiVariableServiceImpl implements ApiVariableService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String variableBizId) { public Result del(String variableBizId) {
return null; return null;
} }
......
yd-csf-service/src/main/java/com/yd/csf/service/config/AsyncConfig.java
...@@ -4,6 +4,8 @@ import org.springframework.context.annotation.Bean; ...@@ -4,6 +4,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
...@@ -37,20 +39,53 @@ public class AsyncConfig { ...@@ -37,20 +39,53 @@ public class AsyncConfig {
return executor; return executor;
} }
// /**
// * 通用异步任务线程池
// */
// @Bean("commonAsyncExecutor")
// public Executor commonAsyncExecutor() {
// ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
// executor.setCorePoolSize(5);
// executor.setMaxPoolSize(10);
// executor.setQueueCapacity(50);
// executor.setThreadNamePrefix("common-async-");
// executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
// executor.setWaitForTasksToCompleteOnShutdown(true);
// executor.setAwaitTerminationSeconds(30);
// executor.setKeepAliveSeconds(30);
// executor.initialize();
// return executor;
// }
/** /**
* 通用异步任务线程池 * 通用异步任务线程池
* @return
*/ */
@Bean("commonAsyncExecutor") @Bean(name = "commonAsyncExecutor")
public Executor commonAsyncExecutor() { public ThreadPoolTaskExecutor commonAsyncExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(5); // 设置核心线程数、最大线程数、队列容量等参数...
executor.setMaxPoolSize(10); executor.setCorePoolSize(10);
executor.setQueueCapacity(50); executor.setMaxPoolSize(20);
executor.setQueueCapacity(100);
executor.setThreadNamePrefix("common-async-"); executor.setThreadNamePrefix("common-async-");
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
executor.setWaitForTasksToCompleteOnShutdown(true); // 设置 TaskDecorator，用于传递 RequestAttributes
executor.setAwaitTerminationSeconds(30); executor.setTaskDecorator(runnable -> {
executor.setKeepAliveSeconds(30); // 获取当前线程的 RequestAttributes
RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
return () -> {
try {
// 将 RequestAttributes 设置到子线程中
RequestContextHolder.setRequestAttributes(attributes);
runnable.run();
} finally {
// 任务完成后清空，避免内存泄漏
RequestContextHolder.resetRequestAttributes();
}
};
});
executor.initialize(); executor.initialize();
return executor; return executor;
} }
......
yd-csf-service/src/main/java/com/yd/csf/service/config/CsfMybatisPlusConfig.java
...@@ -41,7 +41,12 @@ public class CsfMybatisPlusConfig { ...@@ -41,7 +41,12 @@ public class CsfMybatisPlusConfig {
@Override @Override
public void insertFill(MetaObject metaObject) { public void insertFill(MetaObject metaObject) {
//获取Security上下文当前用户的登录信息 //获取Security上下文当前用户的登录信息
AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser(); AuthUserDto authUserDto = null;
try {
authUserDto = SecurityUtil.getCurrentLoginUser();
}catch (Exception e) {
log.info("获取Security上下文当前用户的登录信息失败，{}",e.getMessage());
}
log.info("metaObjectHandler=======insertFill自动填充获取用户信息：{}", JSON.toJSONString(authUserDto)); log.info("metaObjectHandler=======insertFill自动填充获取用户信息：{}", JSON.toJSONString(authUserDto));
if (authUserDto != null) { if (authUserDto != null) {
//自动注入创建人和创建用户名 //自动注入创建人和创建用户名
...@@ -53,7 +58,12 @@ public class CsfMybatisPlusConfig { ...@@ -53,7 +58,12 @@ public class CsfMybatisPlusConfig {
@Override @Override
public void updateFill(MetaObject metaObject) { public void updateFill(MetaObject metaObject) {
//获取Security上下文当前用户的登录信息 //获取Security上下文当前用户的登录信息
AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser(); AuthUserDto authUserDto = null;
try {
authUserDto = SecurityUtil.getCurrentLoginUser();
}catch (Exception e) {
log.info("获取Security上下文当前用户的登录信息失败，{}",e.getMessage());
}
log.info("metaObjectHandler=======updateFill自动填充获取用户信息：{}", JSON.toJSONString(authUserDto)); log.info("metaObjectHandler=======updateFill自动填充获取用户信息：{}", JSON.toJSONString(authUserDto));
if (authUserDto != null) { if (authUserDto != null) {
//自动注入更新人和更新用户名 //自动注入更新人和更新用户名
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowDto.java
...@@ -239,4 +239,7 @@ public class PolicyFollowDto implements Serializable { ...@@ -239,4 +239,7 @@ public class PolicyFollowDto implements Serializable {
@Schema(description = "保单类型: 1-电子, 2-纸质") @Schema(description = "保单类型: 1-电子, 2-纸质")
private String policyType; private String policyType;
@Schema(description = "专业投资者: Yes/No")
private String professionalInvestor;
} }
yd-csf-service/src/main/java/com/yd/csf/service/helper/SpeciesConditionMatcher.java 0 → 100644
package com.yd.csf.service.helper;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
/**
* 规格条件匹配器
*/
public class SpeciesConditionMatcher {
/**
* 判断条件是否匹配
* @param typeCode 条件类型代码
* @param conditionValue 配置的条件值
* @param actualValue 实际值
* @return true-匹配，false-不匹配
*/
public static boolean matches(String typeCode, String conditionValue, Object actualValue) {
if (StringUtils.isBlank(conditionValue) || actualValue == null) {
return false;
}
String actualValueStr = String.valueOf(actualValue);
// 范围匹配类型
if ("AGE".equals(typeCode) || "PREMIUM".equals(typeCode)) {
return matchesRange(conditionValue, actualValue);
}
// 精确匹配类型（包括专业投资者，不区分大小写）
if ("PROFESSIONAL".equals(typeCode)) {
return conditionValue.equalsIgnoreCase(actualValueStr);
}
// 其他类型精确匹配
return conditionValue.equals(actualValueStr);
}
/**
* 范围匹配
* 支持格式：
* - "0-10" 表示 [0, 10] 闭区间
* - "10-" 表示 >= 10
* - "-10" 表示 <= 10
* - "10" 表示等于 10
* - "0-64岁" 表示 [0, 64] 闭区间
*/
private static boolean matchesRange(String conditionValue, Object actualValue) {
try {
BigDecimal actual = toBigDecimal(actualValue);
// 解析范围表达式
String expression = conditionValue.replace("岁", "").trim();
if (!expression.contains("-")) {
// 单个值 "10"
BigDecimal value = new BigDecimal(expression);
return actual.compareTo(value) == 0;
}
String[] parts = expression.split("-");
if (parts.length != 2) {
return false;
}
String left = parts[0].trim();
String right = parts[1].trim();
if (left.isEmpty() && right.isEmpty()) {
// "-" 无效
return false;
} else if (left.isEmpty()) {
// "-10" 表示 <= 10
BigDecimal max = new BigDecimal(right);
return actual.compareTo(max) <= 0;
} else if (right.isEmpty()) {
// "10-" 表示 >= 10
BigDecimal min = new BigDecimal(left);
return actual.compareTo(min) >= 0;
} else {
// "0-10" 表示 [0, 10]
BigDecimal min = new BigDecimal(left);
BigDecimal max = new BigDecimal(right);
return actual.compareTo(min) >= 0 && actual.compareTo(max) <= 0;
}
} catch (Exception e) {
return false;
}
}
/**
* 将对象转换为 BigDecimal
*/
private static BigDecimal toBigDecimal(Object value) {
if (value instanceof BigDecimal) {
return (BigDecimal) value;
}
if (value instanceof Number) {
return new BigDecimal(value.toString());
}
// 处理 "0-64岁" 格式，提取第一个数字
String str = String.valueOf(value).replace("岁", "").trim();
if (str.contains("-")) {
str = str.split("-")[0];
}
return new BigDecimal(str);
}
/**
* 获取条件名称
*/
public static String getConditionName(String typeCode) {
switch (typeCode) {
case "PAYMENT_TERM":
return "供款年期";
case "RECONCILIATION_COMPANY":
return "出单经纪公司";
case "AGE":
return "投保年龄";
case "PREMIUM":
return "期缴保费";
case "PROFESSIONAL_INVESTOR":
return "专业投资者";
case "POLICY_CURRENCY":
return "保单币种";
case "PROTECTION_PERIOD":
return "保障年期";
default:
return typeCode;
}
}
}
yd-csf-service/src/main/java/com/yd/csf/service/model/Additional.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -134,13 +131,13 @@ public class Additional implements Serializable { ...@@ -134,13 +131,13 @@ public class Additional implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentAccumulatedFyc.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -88,13 +86,13 @@ public class AgentAccumulatedFyc implements Serializable { ...@@ -88,13 +86,13 @@ public class AgentAccumulatedFyc implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentDetailFyc.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -118,13 +116,13 @@ public class AgentDetailFyc implements Serializable { ...@@ -118,13 +116,13 @@ public class AgentDetailFyc implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentManageRelation.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 管理关系表（（团队的形成来自这张表，谁在最高级就是团长）） * 管理关系表（（团队的形成来自这张表，谁在最高级就是团长））
...@@ -87,13 +85,13 @@ public class AgentManageRelation implements Serializable { ...@@ -87,13 +85,13 @@ public class AgentManageRelation implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentReferralRelation.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 推荐关系表 * 推荐关系表
...@@ -99,13 +97,13 @@ public class AgentReferralRelation implements Serializable { ...@@ -99,13 +97,13 @@ public class AgentReferralRelation implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentTutoringRelation.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 辅导关系表 * 辅导关系表
...@@ -93,13 +91,13 @@ public class AgentTutoringRelation implements Serializable { ...@@ -93,13 +91,13 @@ public class AgentTutoringRelation implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentFile.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 预约附件信息表 * 预约附件信息表
...@@ -72,19 +70,19 @@ public class AppointmentFile implements Serializable { ...@@ -72,19 +70,19 @@ public class AppointmentFile implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 创建人名称 * 创建人名称
*/ */
@TableField("creator_name") @TableField(value = "creator_name", fill = FieldFill.INSERT)
private String creatorName; private String creatorName;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentLog.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 预约信息日志表（快照表） * 预约信息日志表（快照表）
...@@ -306,19 +304,19 @@ public class AppointmentLog implements Serializable { ...@@ -306,19 +304,19 @@ public class AppointmentLog implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 创建人用户名 * 创建人用户名
*/ */
@TableField("creator_name") @TableField(value = "creator_name", fill = FieldFill.INSERT)
private String creatorName; private String creatorName;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentReferrer.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 预约-转介人信息表 * 预约-转介人信息表
...@@ -84,13 +82,13 @@ public class AppointmentReferrer implements Serializable { ...@@ -84,13 +82,13 @@ public class AppointmentReferrer implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentReferrerLog.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 预约-转介人信息日志表（快照表） * 预约-转介人信息日志表（快照表）
...@@ -84,13 +82,13 @@ public class AppointmentReferrerLog implements Serializable { ...@@ -84,13 +82,13 @@ public class AppointmentReferrerLog implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentUserSign.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 预约-签单员信息表 * 预约-签单员信息表
...@@ -114,13 +112,13 @@ public class AppointmentUserSign implements Serializable { ...@@ -114,13 +112,13 @@ public class AppointmentUserSign implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentUserSignLog.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 预约-签单员信息日志表（快照表） * 预约-签单员信息日志表（快照表）
...@@ -114,13 +112,13 @@ public class AppointmentUserSignLog implements Serializable { ...@@ -114,13 +112,13 @@ public class AppointmentUserSignLog implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/BatchPolicy.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -88,13 +86,13 @@ public class BatchPolicy implements Serializable { ...@@ -88,13 +86,13 @@ public class BatchPolicy implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Beneficiary.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -110,13 +107,13 @@ public class Beneficiary implements Serializable { ...@@ -110,13 +107,13 @@ public class Beneficiary implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CarApply.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 车辆预约申请表 * 车辆预约申请表
...@@ -141,13 +139,13 @@ public class CarApply implements Serializable { ...@@ -141,13 +139,13 @@ public class CarApply implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ClientRole.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 客户端角色表 * 客户端角色表
...@@ -87,13 +85,13 @@ public class ClientRole implements Serializable { ...@@ -87,13 +85,13 @@ public class ClientRole implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Commission.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 保单来佣表 * 保单来佣表
* *
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionCompareRecord.java
...@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/** /**
* 来佣比对记录表 * 来佣比对记录表
* @TableName commission_compare_record * @TableName commission_compare_record
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionEditRecord.java
...@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/** /**
* 来佣修改记录表 * 来佣修改记录表
* @TableName commission_edit_record * @TableName commission_edit_record
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionExpected.java
...@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 预计来佣表 * 预计来佣表
* *
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionResult.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -94,13 +92,13 @@ public class CommissionResult implements Serializable { ...@@ -94,13 +92,13 @@ public class CommissionResult implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionRuleBinding.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 基本法绑定表 - 存储基本法与业务员或团队的绑定关系，支持灵活的权限分配 * 基本法绑定表 - 存储基本法与业务员或团队的绑定关系，支持灵活的权限分配
...@@ -105,13 +103,13 @@ public class CommissionRuleBinding implements Serializable { ...@@ -105,13 +103,13 @@ public class CommissionRuleBinding implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionRuleConfig.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 基本法配置表 * 基本法配置表
...@@ -105,13 +103,13 @@ public class CommissionRuleConfig implements Serializable { ...@@ -105,13 +103,13 @@ public class CommissionRuleConfig implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionSqlTemplate.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* SQL模板表 - 存储所有佣金计算相关的动态SQL模板，支持灵活配置和参数化查询，实现业务逻辑与代码解耦 * SQL模板表 - 存储所有佣金计算相关的动态SQL模板，支持灵活配置和参数化查询，实现业务逻辑与代码解耦
...@@ -111,13 +109,13 @@ public class CommissionSqlTemplate implements Serializable { ...@@ -111,13 +109,13 @@ public class CommissionSqlTemplate implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ConditionConfig.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -136,13 +134,13 @@ public class ConditionConfig implements Serializable { ...@@ -136,13 +134,13 @@ public class ConditionConfig implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ConditionType.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 条件类型表 * 条件类型表
...@@ -81,13 +79,13 @@ public class ConditionType implements Serializable { ...@@ -81,13 +79,13 @@ public class ConditionType implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Customer.java
...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 客户信息表 * 客户信息表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CustomerExpand.java
...@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* CSF客户信息扩展表 * CSF客户信息扩展表
* *
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortune.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
* 预计发佣表 * 预计发佣表
...@@ -265,13 +261,13 @@ public class ExpectedFortune implements Serializable { ...@@ -265,13 +261,13 @@ public class ExpectedFortune implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortuneLog.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 生成预计发佣日志记录表 * 生成预计发佣日志记录表
...@@ -63,13 +61,13 @@ public class ExpectedFortuneLog implements Serializable { ...@@ -63,13 +61,13 @@ public class ExpectedFortuneLog implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Fna.java
...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField; ...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* fna表 * fna表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/FnaCustomer.java
...@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 客户信息表 * 客户信息表
* *
......
yd-csf-service/src/main/java/com/yd/csf/service/model/FnaForm.java
...@@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import java.util.List;
import com.yd.csf.service.dto.DependantData;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/** /**
* fna表单表 * fna表单表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/FormulaConfig.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 公式配置表 * 公式配置表
...@@ -111,13 +109,13 @@ public class FormulaConfig implements Serializable { ...@@ -111,13 +109,13 @@ public class FormulaConfig implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Fortune.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 保单出账表 * 保单出账表
* *
......
yd-csf-service/src/main/java/com/yd/csf/service/model/FortuneAccount.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import lombok.Data;
/** /**
* 出账记录表 * 出账记录表
* *
......
yd-csf-service/src/main/java/com/yd/csf/service/model/FortuneAccountEditRecord.java
...@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,12 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/** /**
* 薪资修订记录表 * 薪资修订记录表
* @TableName fortune_account_edit_record * @TableName fortune_account_edit_record
......
yd-csf-service/src/main/java/com/yd/csf/service/model/FycTask.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 业务员积分任务表 - 定时跑批业务员绑定的基本法计算点，算出当前业务员所得的积分（一级管理奖、二级管理奖、辅导津贴奖、终身推荐奖等月末计算，季度结算等） * 业务员积分任务表 - 定时跑批业务员绑定的基本法计算点，算出当前业务员所得的积分（一级管理奖、二级管理奖、辅导津贴奖、终身推荐奖等月末计算，季度结算等）
...@@ -87,13 +85,13 @@ public class FycTask implements Serializable { ...@@ -87,13 +85,13 @@ public class FycTask implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Insurant.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -386,13 +383,13 @@ public class Insurant implements Serializable { ...@@ -386,13 +383,13 @@ public class Insurant implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Interests.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -88,13 +86,13 @@ public class Interests implements Serializable { ...@@ -88,13 +86,13 @@ public class Interests implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Invitation.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 邀请码表 * 邀请码表
...@@ -93,13 +91,13 @@ public class Invitation implements Serializable { ...@@ -93,13 +91,13 @@ public class Invitation implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Member.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 会员表 * 会员表
...@@ -111,13 +109,13 @@ public class Member implements Serializable { ...@@ -111,13 +109,13 @@ public class Member implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/MemberGradeConfig.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -106,13 +104,13 @@ public class MemberGradeConfig implements Serializable { ...@@ -106,13 +104,13 @@ public class MemberGradeConfig implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PayoutBatch.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -118,13 +116,13 @@ public class PayoutBatch implements Serializable { ...@@ -118,13 +116,13 @@ public class PayoutBatch implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Policy.java
...@@ -4,18 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,18 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/** /**
* 保单表 * 保单表
* *
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyAdditional.java
...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 保单附加险信息表 * 保单附加险信息表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyAgentRelation.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 保单业务员关联表 - 存储保单与业务员的关联关系及佣金分配信息 * 保单业务员关联表 - 存储保单与业务员的关联关系及佣金分配信息
...@@ -69,13 +67,13 @@ public class PolicyAgentRelation implements Serializable { ...@@ -69,13 +67,13 @@ public class PolicyAgentRelation implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyAppointmentFile.java
...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 新单跟进预约附件信息表 * 新单跟进预约附件信息表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyBeneficiary.java
...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 受益人信息表 * 受益人信息表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyBroker.java
...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 保单转介人表 * 保单转介人表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyFollow.java
...@@ -4,17 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,17 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/** /**
* 新单跟进表 * 新单跟进表
* *
...@@ -355,6 +350,11 @@ public class PolicyFollow implements Serializable { ...@@ -355,6 +350,11 @@ public class PolicyFollow implements Serializable {
private String deliveryNo; private String deliveryNo;
/** /**
* 专业投资者: Yes/No
*/
private String professionalInvestor;
/**
* 邮寄物品 * 邮寄物品
*/ */
private String mailingItem; private String mailingItem;
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyFollowFile.java
...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 新单跟进附件信息表 * 新单跟进附件信息表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyFollowRecord.java
...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 新单跟进记录表 * 新单跟进记录表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyInsurant.java
...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 保单受保人信息表 * 保单受保人信息表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyPolicyholder.java
...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 保单投保人信息表 * 保单投保人信息表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicyReceipt.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 保单回执表 * 保单回执表
...@@ -76,13 +73,13 @@ public class PolicyReceipt implements Serializable { ...@@ -76,13 +73,13 @@ public class PolicyReceipt implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PolicySecondHolder.java
...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 第二持有人信息表 * 第二持有人信息表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Policyholder.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -379,13 +377,13 @@ public class Policyholder implements Serializable { ...@@ -379,13 +377,13 @@ public class Policyholder implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PremiumReconciliation.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -124,13 +122,13 @@ public class PremiumReconciliation implements Serializable { ...@@ -124,13 +122,13 @@ public class PremiumReconciliation implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PremiumRemittance.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField; import lombok.Getter;
import com.baomidou.mybatisplus.annotation.TableId; import lombok.Setter;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/** /**
* <p> * <p>
...@@ -118,13 +116,13 @@ public class PremiumRemittance implements Serializable { ...@@ -118,13 +116,13 @@ public class PremiumRemittance implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/PremiumRemittanceFile.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 保费对账-汇款记录附件表 * 保费对账-汇款记录附件表
...@@ -75,19 +73,19 @@ public class PremiumRemittanceFile implements Serializable { ...@@ -75,19 +73,19 @@ public class PremiumRemittanceFile implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 创建人名 * 创建人名
*/ */
@TableField("creator_name") @TableField(value = "creator_name", fill = FieldFill.INSERT)
private String creatorName; private String creatorName;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ProductPlan.java
package com.yd.csf.service.model; package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
...@@ -209,13 +206,13 @@ public class ProductPlan implements Serializable { ...@@ -209,13 +206,13 @@ public class ProductPlan implements Serializable {
/** /**
* 创建人ID * 创建人ID
*/ */
@TableField("creator_id") @TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId; private String creatorId;
/** /**
* 更新人ID * 更新人ID
*/ */
@TableField("updater_id") @TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId; private String updaterId;
/** /**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ReconciliationCompany.java
...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import lombok.Data;
/** /**
* 对账公司表 * 对账公司表
......
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