Skip to content

Y
yd-csf
Commit 4941ad5f by zhangxingmin
Options

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

parents 798f9978 85895940
Showing with 866 additions and 369 deletions
yd-csf-api/Dockerfile
......@@ -7,6 +7,6 @@ RUN mkdir -p /home/app
# 拷贝项目jar - 使用可执行的 fat JAR
COPY target/yd-csf-api-1.0-SNAPSHOT-exec.jar /home/app/yd-csf-api.jar
# 执行命令启动jar，并设置JVM内存参数
ENTRYPOINT ["java", "-Xmx256m", "-Xms128m", "-jar", "/home/app/yd-csf-api.jar"]
ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-Xmx256m", "-Xms128m", "-jar", "/home/app/yd-csf-api.jar"]
# 暴露端口
EXPOSE 9202
yd-csf-api/src/main/java/com/yd/csf/api/CsfApiApplication.java
......@@ -12,9 +12,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication(scanBasePackages = "com.yd")
@MapperScan("com.yd.**.dao")
@EnableFeignClients(basePackages = "com.yd")
@ComponentScan(basePackages = {
"com.yd.auth.core" // 包含认证模块的包路径
})
@ComponentScan(basePackages = {"com.yd.auth.core", "com.yd.csf.service.config"})
public class CsfApiApplication {
public static void main(String[] args) {
......
yd-csf-api/src/main/java/com/yd/csf/api/async/ApiExpectedFortuneAsyncService.java
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 org.springframework.scheduling.annotation.Async;
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
@Component
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/ApiCommissionController.java
......@@ -30,6 +30,8 @@ import org.redisson.api.RedissonClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -151,26 +153,28 @@ public class ApiCommissionController {
// 数据处理
List<Commission> entities = processData(dataList, loginUserId, reconciliationYearMonth);
transactionTemplate.execute(status -> {
// 保存来佣数据
commissionService.saveBatch(entities);
return null;
});
// 1. 先保存主数据
commissionService.saveBatch(entities);
// // 转换为 VO
// List<CommissionVO> commissionVOList = commissionService.getCommissionList(entities);
// 开启新事务，比对数据
transactionTemplate.execute(status -> {
try {
commissionAsyncService.commissionCompareBatch(entities);
} catch (Exception e) {
// 比对失败不影响主事务，记录日志即可
e.printStackTrace();
log.error("批量导入, 比对操作执行失败, error: {}", e.getMessage());
}
return null;
});
// 2. 事务提交后执行比对
TransactionSynchronizationManager.registerSynchronization(
new TransactionSynchronization() {
@Override
public void afterCommit() {
try {
// 这里会开启新事务执行更新
commissionAsyncService.commissionCompareBatch(entities);
} catch (Exception e) {
log.error("批量导入, 比对操作执行失败, error: {}", e.getMessage());
// 可以发送告警或记录失败任务
}
}
}
);
return Result.success(true);
}
......
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCommissionExpectedController.java
......@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
......@@ -247,13 +248,20 @@ public class ApiCommissionExpectedController {
if (policy == null) {
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(
policy,
request.getProductLaunchBizId(),
request.getInsuranceCompanyBizId(),
request.getReconciliationCompany(),
request.getReconciliationCompanyCode(),
request.getReconciliationCompanyBizId());
request.getReconciliationCompanyBizId(),
policyFollow.getProfessionalInvestor());
return Result.success(true);
}
......@@ -283,7 +291,7 @@ public class ApiCommissionExpectedController {
if (!CollectionUtils.isEmpty(allExpectedIdList)) {
receivableReportPage = commissionExpectedService.receivableReportPage(reportPage, allExpectedIdList);
}
enrichReceivableReportWithCompanyName(receivableReportPage);
// enrichReceivableReportWithCompanyName(receivableReportPage);
receivableReportPage = convertProductName(receivableReportPage);
// 组装返回结果
ReceivableReportResponse response = new ReceivableReportResponse();
......@@ -389,4 +397,21 @@ public class ApiCommissionExpectedController {
}
return Collections.emptyList();
}
@GetMapping("/test_expected_commission")
@Operation(summary = "测试佣金匹配")
public Result<Boolean> testExpectedCommission(@RequestParam("policyNo") String policyNo,
@RequestParam("effectiveDate") String effectiveDate,
@RequestParam("coolingOffEndDate") String coolingOffEndDate) {
if (StringUtils.isBlank(policyNo)) {
return Result.fail(ResultCode.NULL_ERROR.getCode(), "policyNo不能为空");
}
try {
commissionExpectedService.testExpectedCommission(policyNo, effectiveDate, coolingOffEndDate);
} catch (IOException e) {
return Result.fail(ResultCode.FAIL.getCode(), "读取文件失败");
}
return Result.success(true);
}
}
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiCustomerController.java
......@@ -23,6 +23,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
......@@ -58,7 +59,7 @@ public class ApiCustomerController {
*/
@Operation(summary = "创建客户")
@PostMapping("/add")
public Result<Map<String, Object>> addCustomer(@RequestBody CustomerAddRequest customerAddRequest, HttpServletRequest request) {
public Result<Map<String, Object>> addCustomer(@Validated @RequestBody CustomerAddRequest customerAddRequest, HttpServletRequest request) {
if (customerAddRequest == null) {
return Result.fail(ResultCode.PARAMS_ERROR.getCode(), ResultCode.PARAMS_ERROR.getMessage());
}
......@@ -134,7 +135,7 @@ public class ApiCustomerController {
*/
@PostMapping("/update")
@Operation(summary = "更新客户信息")
public Result<Boolean> updateCustomer(@RequestBody CustomerUpdateRequest customerUpdateRequest) {
public Result<Boolean> updateCustomer(@Validated @RequestBody CustomerUpdateRequest customerUpdateRequest) {
String customerBizId = customerUpdateRequest.getCustomerBizId();
if (ObjectUtils.isEmpty(customerBizId)) {
throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "customerBizId不能为空");
......
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiFortuneController.java
......@@ -37,10 +37,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -529,7 +526,7 @@ public class ApiFortuneController {
// 查询列表数据
QueryWrapper<Fortune> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("expected_fortune_biz_id", fortuneQueryRequest.getExpectedFortuneBizId());
queryWrapper.eq("status", FortuneStatusEnum.SENT.getItemValue());
queryWrapper.in("status", Arrays.asList(FortuneStatusEnum.CHECKED.getItemValue(), FortuneStatusEnum.SENT.getItemValue()));
Page<Fortune> fortunePage = fortuneService.page(new Page<>(current, size),
queryWrapper);
// 组装返回值
......
yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java
package com.yd.csf.api.controller;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelReader;
......@@ -17,10 +18,12 @@ import com.yd.common.enums.ResultCode;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
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.PolicyExcelDTO;
import com.yd.csf.api.dto.PolicyFollowDTO;
import com.yd.csf.api.listener.PolicyDataListener;
import com.yd.csf.api.service.ApiCommissionConditionService;
import com.yd.csf.api.service.ApiExpectedFortuneService;
import com.yd.csf.api.service.ApiPolicyFollowService;
import com.yd.csf.feign.request.expectedfortune.ApiGenerateExpectedFortuneRequest;
......@@ -50,6 +53,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
......@@ -92,14 +96,19 @@ public class ApiPolicyFollowController {
private ApiInsuranceReconciliationCompanyFeignClient apiInsuranceReconciliationCompanyFeignClient;
@Resource
private CommissionExpectedService commissionExpectedService;
@Resource
private ApiPolicyFollowService apiPolicyFollowService;
@Resource
private ApiExpectedFortuneService apiExpectedFortuneService;
// @Resource
// private ApiPolicyFollowService apiPolicyFollowService;
// @Resource
// private ApiExpectedFortuneService apiExpectedFortuneService;
@Resource
private ApiAnnouncementCommissionRatioFeignClient apiAnnouncementCommissionRatioFeignClient;
@Resource
private FeignResultHelper feignResultHelper;
@Resource
private ApiExpectedFortuneAsyncService apiExpectedFortuneAsyncService;
@Autowired
private ApiCommissionConditionService apiCommissionConditionService;
@PostMapping("/upload/excel")
......@@ -544,24 +553,26 @@ public class ApiPolicyFollowController {
if (!hasCommissionInfo) {
return Result.fail(ResultCode.NULL_ERROR.getCode(), "产品未维护发佣信息");
}
//查询产品发佣配置，获取结算币种
ApiAnnouncementCommissionRatioListRequest announcementRatioListRequest = new ApiAnnouncementCommissionRatioListRequest();
announcementRatioListRequest.setProductLaunchBizId(productLaunchBizId);
announcementRatioListRequest.setEffectiveDate(changePolicyFollowStatusRequest.getEffectiveDate());
announcementRatioListRequest.setPaymentTerm(String.valueOf(policyFollow.getIssueNumber()));
try {
feignResultHelper.extractListData(
apiAnnouncementCommissionRatioFeignClient.list(announcementRatioListRequest),
ApiAnnouncementCommissionRatioListResponse.class
);
apiCommissionConditionService.getCommissionRatioList(policyFollow.getPolicyNo(),changePolicyFollowStatusRequest.getEffectiveDate());
// feignResultHelper.extractListData(
// apiAnnouncementCommissionRatioFeignClient.list(announcementRatioListRequest),
// ApiAnnouncementCommissionRatioListResponse.class
// );
} catch (BusinessException e) {
log.info("===== 进入BusinessException catch块 =====");
log.info("查询结算币种->保单号:{}，入参request：{}", policyFollow.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
return Result.fail("查询产品发佣配置，获取结算币种失败，" + e.getMessage());
return Result.fail("未查询到产品发佣配置，查询条件：" + transferMsg(announcementRatioListRequest, policyFollow));
} catch (Exception e) {
log.info("===== 进入Exception catch块 =====");
log.info("查询结算币种->保单号:{}，入参request：{}", policyFollow.getPolicyNo(), JSON.toJSONString(announcementRatioListRequest));
return Result.fail("查询产品发佣配置，获取结算币种失败，" + e.getMessage());
return Result.fail("未查询到产品发佣配置，查询条件：" + transferMsg(announcementRatioListRequest, policyFollow));
}
}
......@@ -572,29 +583,39 @@ public class ApiPolicyFollowController {
if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) {
// 获取Token
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
*/
public Result execute(String token, String policyNo) {
// 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
generateExpectedFortuneRequest.setPolicyNo(policyNo);
log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo);
Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest);
if (result != null && result.getCode() == 200) {
log.info("新单跟进-同步生成预计出账记录成功:保单号={}", policyNo);
}
return Result.success();
}
private String transferMsg(ApiAnnouncementCommissionRatioListRequest announcementRatioListRequest, PolicyFollow policyFollow) {
return String.format("保单生效日: %s, 供款年期: %s, 产品名称: %s, ",
DateUtil.format(announcementRatioListRequest.getEffectiveDate(), DatePattern.NORM_DATE_PATTERN),
policyFollow.getIssueNumber(),
policyFollow.getProductName());
}
// /**
// * 异步处理
// *
// * @return
// */
// public Result execute(String token, String policyNo) {
// // 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
// ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
// generateExpectedFortuneRequest.setPolicyNo(policyNo);
// log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo);
// Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest);
// if (result != null && result.getCode() == 200) {
// log.info("新单跟进-同步生成预计出账记录成功:保单号={}", policyNo);
// }
// return Result.success();
// }
/**
* 新单跟进状态列表查询
......
yd-csf-api/src/main/java/com/yd/csf/api/dto/GenerateExpectedFortuneDto.java
......@@ -16,6 +16,11 @@ import java.util.List;
public class GenerateExpectedFortuneDto {
/**
* 来源 1-销售佣金 2-非销售佣金
*/
private Integer source;
/**
* 保单发佣批次ID
*/
private String batchBizId;
......@@ -31,6 +36,16 @@ public class GenerateExpectedFortuneDto {
private String policyNo;
/**
* 产品业务id
*/
private String productLaunchBizId;
/**
* 保险公司业务id
*/
private String insuranceCompanyBizId;
/**
* 发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
*/
private Integer fortunePeriod;
......
yd-csf-api/src/main/java/com/yd/csf/api/service/ApiCommissionConditionService.java 0 → 100644
package com.yd.csf.api.service;
import com.yd.common.result.Result;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import java.util.Date;
import java.util.List;
public interface ApiCommissionConditionService {
Result<List<ApiAnnouncementCommissionRatioListResponse>> getCommissionRatioList(String policyNo, Date effectiveDate);
}
yd-csf-api/src/main/java/com/yd/csf/api/service/ApiPremiumReconciliationService.java
......@@ -31,9 +31,6 @@ public interface ApiPremiumReconciliationService {
Result editResult(ApiPremiumReconciliationResultEditRequest request);
@Async("commonAsyncExecutor")
void execute(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token);
Result<Boolean> checkReconciliationComplete(String policyNo);
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 {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiProductPlanAdditionalInfoDto apiProductPlanAdditionalInfoDto) {
List<ApiProductPlanAdditionalInfoDto> list = new ArrayList<>();
list.add(apiProductPlanAdditionalInfoDto);
......@@ -100,6 +101,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiProductPlanAdditionalInfoDto apiProductPlanAdditionalInfoDto) {
//编辑预约入参字段校验 - 产品计划信息字段校验 - 编辑产品附加险信息单个对象字段校验
apiAppointmentCheckService.checkEditApiProductPlanAdditionalInfoDto(apiProductPlanAdditionalInfoDto);
......@@ -134,6 +136,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String additionalBizId) {
//校验附加险信息是否存在
Result<Additional> result = checkAdditionalIsExist(additionalBizId);
......@@ -183,6 +186,7 @@ public class ApiAdditionalServiceImpl implements ApiAdditionalService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result batchEditAdditionalData(ApiProductPlanInfoDto productPlanInfoDto, String planBizId) {
if (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;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
......@@ -35,6 +36,7 @@ public class ApiAgentDetailFycServiceImpl implements ApiAgentDetailFycService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveAgentDetailFyc(GenerateAgentDetailFycDto dto) {
List<AlgorithmResDto> algorithmResDtoList = dto.getAlgorithmResDtoList();
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;
import com.yd.csf.service.service.IAgentReferralRelationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.stream.Collectors;
......@@ -25,6 +26,7 @@ public class ApiAgentReferralRelationServiceImpl implements ApiAgentReferralRela
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result save(ApiAgentReferralRelationSaveRequest request) {
//先删后新增
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;
import com.yd.common.constant.RedisConstants;
import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.DictTypeEnum;
import com.yd.common.enums.ProjectEnum;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
import com.yd.common.utils.*;
......@@ -46,6 +47,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import java.util.*;
......@@ -137,6 +139,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiAppointmentFileAddRequest request) {
//获取Security上下文当前用户的登录信息
AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
......@@ -154,6 +157,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiAppointmentFileEditRequest request) {
Result<AppointmentFile> result = checkAppointmentFileIsExist(request.getAppointmentFileBizId());
AppointmentFile appointmentFile = result.getData();
......@@ -168,6 +172,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String appointmentFileBizId) {
Result<AppointmentFile> result = checkAppointmentFileIsExist(appointmentFileBizId);
AppointmentFile appointmentFile = result.getData();
......@@ -181,6 +186,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result download(String appointmentFileBizId) {
return null;
}
......@@ -191,6 +197,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<String> itineraryPdf(String appointmentBizId) {
String url = "";
//查询redis缓存的字典列表信息
......@@ -206,6 +213,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
request.setDataObject(itineraryDto);
request.setObjectId(appointmentBizId);
request.setTemplateType(TemplateTypeEnum.XCD.getItemValue());
request.setProjectBizId(ProjectEnum.CSF_PC.getProjectBizId());
if (StringUtils.isNotBlank(itineraryDto.getName()) &&
StringUtils.isNotBlank(itineraryDto.getArrivalTime())) {
//咨询人和集合日（签单日）都不为空，文件名 = 咨询人 + 集合日（20260103）
......@@ -236,6 +244,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<ApiAppointmentExportExcelResponse> appointmentExportExcel(String appointmentBizId) {
Map<String, Object> data = new HashMap<>();
try {
......@@ -342,6 +351,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
excelRequest.setAppointmentBizId(appointmentBizId);
excelRequest.setData(data);
excelRequest.setTemplateType(TemplateTypeEnum.YYD.getItemValue());
excelRequest.setProjectBizId(ProjectEnum.CSF_PC.getProjectBizId());
Result<ApiOssExportAppointmentExcelResponse> result1 = apiExcelFeignClient.exportAppointment(excelRequest);
ApiOssExportAppointmentExcelResponse excelResponse = result1.getData();
ApiAppointmentExportExcelResponse response = new ApiAppointmentExportExcelResponse();
......@@ -362,6 +372,7 @@ public class ApiAppointmentFileServiceImpl implements ApiAppointmentFileService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<ApiAppointmentImportExcelResponse> appointmentImportExcel(MultipartFile file,
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
@Slf4j
......@@ -25,6 +26,7 @@ public class ApiAppointmentLogServiceImpl implements ApiAppointmentLogService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<String> saveAppointmentLog(Appointment appointment) {
AppointmentLog appointmentLog = new 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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.stream.Collectors;
......@@ -29,6 +30,7 @@ public class ApiAppointmentReferrerLogServiceImpl implements ApiAppointmentRefer
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveAppointmentReferrerLogList(List<ApiAppointmentReferrerDto> referrerDtoList,
String appointmentLogBizId) {
if (CollectionUtils.isEmpty(referrerDtoList)) {
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java
......@@ -18,6 +18,7 @@ import com.yd.csf.feign.dto.appointment.*;
import com.yd.csf.feign.dto.appointmentfile.ApiAppointmentFileDto;
import com.yd.csf.feign.request.appointment.*;
import com.yd.csf.feign.response.appointment.*;
import com.yd.csf.service.dao.AppointmentMapper;
import com.yd.csf.service.dto.PolicySigner;
import com.yd.csf.service.enums.AppointmentStatusEnum;
import com.yd.csf.service.enums.FnaStatusEnum;
......@@ -141,6 +142,8 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
private PolicyBrokerService policyBrokerService;
@Resource
private PolicyAppointmentFileService policyAppointmentFileService;
@Resource
private AppointmentMapper appointmentMapper;
/**
* 预约分页查询
......@@ -277,6 +280,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @param appointmentBizId
* @return
*/
@Transactional(rollbackFor = Exception.class)
public Result addRelObjectMaterialList(String appointmentBizId,
List<ApiAppointmentMaterialDto> dtoList) {
//添加-单个对象和材料列表关系信息
......@@ -494,6 +498,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* 更新关联的FNA状态为"待签单"
* @param fnaBizId FNA业务ID
*/
@Transactional(rollbackFor = Exception.class)
private void updateFnaStatusToPendingSignature(String fnaBizId) {
if (StringUtils.isBlank(fnaBizId)) {
return;
......@@ -511,6 +516,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result editStorage(ApiAppointmentEditStorageRequest request) {
//校验预约信息-客户和fna入参
apiAppointmentCheckService.checkCustomerAndFna(request.getApiAppointmentInfoDto(), "预约信息-");
......@@ -676,13 +682,13 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
// 保單持有人
if (apiPolicyholderInfoDto != null) {
follow.setPolicyHolder(apiPolicyholderInfoDto.getNameCn());
follow.setPolicyHolder(StringUtils.isNotBlank(apiPolicyholderInfoDto.getNameCn()) ? apiPolicyholderInfoDto.getNameCn() : apiPolicyholderInfoDto.getNamePyEn());
}
// 受保人信息
if (!Objects.isNull(apiInsurantInfoDto)) {
// 受保人
follow.setInsured(apiInsurantInfoDto.getNameCn());
follow.setInsured(StringUtils.isNotBlank(apiInsurantInfoDto.getNameCn()) ? apiInsurantInfoDto.getNameCn() : apiInsurantInfoDto.getNamePyEn());
// 受保人业务id
follow.setInsuredBizId(apiInsurantInfoDto.getInsurantBizId());
// 受保人与保單持有人关系
......@@ -1172,6 +1178,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result editStatus(ApiAppointmentEditStatusRequest request) {
//校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
......@@ -1193,6 +1200,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* 取消预约-更新新单跟进状态为取消预约
* @return
*/
@Transactional(rollbackFor = Exception.class)
public Result editFollowStatus(String appointmentBizId) {
List<PolicyFollow> followList = policyFollowService.queryListByAppointmentBizId(appointmentBizId);
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.stream.Collectors;
......@@ -29,6 +30,7 @@ public class ApiAppointmentUserSignLogServiceImpl implements ApiAppointmentUserS
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveAppointmentUserSignLogList(List<ApiAppointmentUserSignDto> userSignDtoList,
String appointmentLogBizId) {
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 {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiBeneficiaryInfoDto apiBeneficiaryInfoDto) {
List<ApiBeneficiaryInfoDto> list = new ArrayList<>();
list.add(apiBeneficiaryInfoDto);
......@@ -99,6 +100,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiBeneficiaryInfoDto apiBeneficiaryInfoDto) {
//编辑预约入参字段校验 - 编辑单个受益人信息字段校验
apiAppointmentCheckService.checkEditApiBeneficiaryInfoDto(apiBeneficiaryInfoDto);
......@@ -118,6 +120,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result batchEdit(ApiBatchEditBeneficiaryRequest request) {
apiAppointmentCheckService.checkEditApiBeneficiaryInfoDtoList(request.getApiBeneficiaryInfoDtoList());
//批量编辑受益人信息表数据
......@@ -131,6 +134,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String beneficiaryBizId) {
//校验受益人信息是否存在
Result<Beneficiary> result = checkBeneficiaryIsExist(beneficiaryBizId);
......@@ -177,6 +181,7 @@ public class ApiBeneficiaryServiceImpl implements ApiBeneficiaryService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result batchEditBeneficiaryData(List<ApiBeneficiaryInfoDto> list,String appointmentBizId) {
if (CollectionUtils.isEmpty(list)){
//为空放行
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiCommissionConditionServiceImpl.java 0 → 100644
package com.yd.csf.api.service.impl;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
import com.yd.csf.api.service.ApiCommissionConditionService;
import com.yd.csf.service.model.PolicyFollow;
import com.yd.csf.service.model.PolicyPolicyholder;
import com.yd.csf.service.service.PolicyFollowService;
import com.yd.csf.service.service.PolicyPolicyholderService;
import com.yd.product.feign.client.announcementcommissionratio.ApiAnnouncementCommissionRatioFeignClient;
import com.yd.product.feign.request.announcementcommissionratio.ApiAnnouncementCommissionRatioListRequest;
import com.yd.product.feign.response.announcementcommissionratio.ApiAnnouncementCommissionRatioListResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 佣金条件服务类
*/
@Slf4j
@Service
public class ApiCommissionConditionServiceImpl implements ApiCommissionConditionService {
@Autowired
private ApiAnnouncementCommissionRatioFeignClient ratioFeignClient;
@Autowired
private PolicyFollowService policyFollowService;
@Autowired
private PolicyPolicyholderService policyPolicyholderService;
/**
* 根据保单号查询保单所参与过滤产品发佣率数据筛选的字段列表数据
* @param policyNo
* @return
*/
@Override
public Result<List<ApiAnnouncementCommissionRatioListResponse>> getCommissionRatioList(String policyNo, Date effectiveDate) {
//根据保单号查询保单跟进表数据
PolicyFollow policyFollow = policyFollowService.queryOneByPolicyNo(policyNo);
if (policyFollow == null) {
throw new BusinessException("新单跟进表信息不存在");
}
//列出固定几个需要参与发佣率筛选数据的保单字段
//供款年期（数字）
String paymentTerm = policyFollow.getIssueNumber().toString();
//投保年龄（区间值）查询保单投保人表数据 0-64 64-
PolicyPolicyholder policyPolicyholder = policyPolicyholderService.queryOne(policyFollow.getPolicyBizId());
String age = "";
if (policyPolicyholder != null) {
age = policyPolicyholder.getAge();
}
//期缴保费（区间值）例：0-10000 10000-
BigDecimal eachIssuePremium = policyFollow.getEachIssuePremium();
//专业投资者（Yes/No）（选项）
String professionalInvestor = policyFollow.getProfessionalInvestor();
//保单币种（选项）
String policyCurrency = policyFollow.getPolicyCurrency();
//保障年期（数字）
String guaranteePeriod = policyFollow.getGuaranteePeriod();
ApiAnnouncementCommissionRatioListRequest ratioListRequest = new ApiAnnouncementCommissionRatioListRequest();
ratioListRequest.setProductLaunchBizId(policyFollow.getProductLaunchBizId());
ratioListRequest.setEffectiveDate(effectiveDate !=null ? effectiveDate:policyFollow.getEffectiveDate());
ratioListRequest.setPaymentTerm(paymentTerm);
ratioListRequest.setAge(age);
ratioListRequest.setEachIssuePremium(eachIssuePremium);
ratioListRequest.setGuaranteePeriod(guaranteePeriod);
ratioListRequest.setPolicyCurrency(policyCurrency);
ratioListRequest.setProfessionalInvestor(professionalInvestor);
Result<List<ApiAnnouncementCommissionRatioListResponse>> result = ratioFeignClient.list(ratioListRequest);
return result;
}
}
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
......@@ -65,6 +66,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiCommissionRuleConfigAddRequest request) {
//校验基本法名称的唯一性
List<CommissionRuleConfig> list = iCommissionRuleConfigService.queryList(CommissionRuleConfigDto.builder()
......@@ -88,6 +90,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiCommissionRuleConfigEditRequest request) {
//校验基本法配置信息是否存在
Result<CommissionRuleConfig> result = checkCommissionRuleConfigIsExist(request.getRuleBizId());
......@@ -113,6 +116,7 @@ public class ApiCommissionRuleConfigServiceImpl implements ApiCommissionRuleConf
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String ruleBizId) {
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
......@@ -72,6 +73,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiConditionConfigAddRequest request) {
//校验条件名称唯一性
List<ConditionConfig> conditionConfigList = iConditionConfigService.queryList(ConditionConfigDto.builder()
......@@ -96,6 +98,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiConditionConfigEditRequest request) {
Result<ConditionConfig> result = checkConditionConfigIsExist(request.getConditionBizId());
ConditionConfig conditionConfig = result.getData();
......@@ -120,6 +123,7 @@ public class ApiConditionConfigServiceImpl implements ApiConditionConfigService
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String conditionBizId) {
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
......@@ -63,6 +64,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiConditionTypeAddRequest request) {
//校验条件类型名称唯一性
List<ConditionType> conditionTypeList = iConditionTypeService.queryList(ConditionTypeDto.builder()
......@@ -86,6 +88,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiConditionTypeEditRequest request) {
Result<ConditionType> result = checkConditionTypeIsExist(request.getConditionTypeBizId());
ConditionType conditionType = result.getData();
......@@ -109,6 +112,7 @@ public class ApiConditionTypeServiceImpl implements ApiConditionTypeService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String conditionTypeBizId) {
return null;
}
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiCsfCommonServiceImpl.java
......@@ -229,16 +229,26 @@ public class ApiCsfCommonServiceImpl implements ApiCsfCommonService {
LocalDate currentDate = LocalDate.now();
if (birthDate.isAfter(currentDate)) {
throw new IllegalArgumentException("生日日期不能晚于当前日期");
throw new IllegalArgumentException("生日日期不能大于当前日期");
}
Period period = Period.between(birthDate, currentDate);
return String.valueOf(period.getYears());
} catch (Exception e) {
throw new IllegalArgumentException("生日格式不正确，应为yyyy-MM-dd格式");
// throw new IllegalArgumentException("生日格式不正确，应为yyyy-MM-dd格式");
throw new IllegalArgumentException(e.getMessage());
}
}
public static void main(String[] args) {
ApiCsfCommonServiceImpl commonService = new ApiCsfCommonServiceImpl();
ApiCsfCalculateRequest request = new ApiCsfCalculateRequest();
request.setRequestValue("310111202603191111");
request.setCalculateType(6);
Result<List<ApiCsfCalculateResponse>> result = commonService.calculate(request);
System.out.println(result);
}
/**
* 身高和体重计算BMI指数
* @param requestValueList
......@@ -283,18 +293,31 @@ public class ApiCsfCommonServiceImpl implements ApiCsfCommonService {
format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
StringBuilder pinyin = new StringBuilder();
boolean lastIsChinese = false; // 标记上一个字符是否为汉字，用于控制空格添加
for (char c : chinese.toCharArray()) {
if (Character.toString(c).matches("[\\u4E00-\\u9FA5]")) {
try {
String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(c, format);
if (pinyinArray != null && pinyinArray.length > 0) {
// 如果上一个字符是汉字且当前也是汉字，则先加空格（避免开头空格）
if (lastIsChinese) {
pinyin.append(' ');
}
pinyin.append(pinyinArray[0]);
lastIsChinese = true;
} else {
// 如果没有拼音，原样追加
pinyin.append(c);
lastIsChinese = false;
}
} catch (BadHanyuPinyinOutputFormatCombination e) {
pinyin.append(c);
lastIsChinese = false;
}
} else {
pinyin.append(c);
lastIsChinese = false;
}
}
return pinyin.toString();
......
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Objects;
......@@ -69,6 +70,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiFormulaConfigAddRequest request) {
//校验公式名称唯一性
List<FormulaConfig> formulaConfigList = iFormulaConfigService.queryList(FormulaConfigDto.builder()
......@@ -94,6 +96,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiFormulaConfigEditRequest request) {
Result<FormulaConfig> result = checkFormulaConfigIsExist(request.getFormulaBizId());
FormulaConfig formulaConfig = result.getData();
......@@ -119,6 +122,7 @@ public class ApiFormulaConfigServiceImpl implements ApiFormulaConfigService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String formulaBizId) {
return null;
}
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiInsurantServiceImpl.java
package com.yd.csf.api.service.impl;
import com.alibaba.fastjson.JSON;
import com.yd.base.feign.client.relobjectcertificate.ApiRelObjectCertificateFeignClient;
import com.yd.base.feign.dto.ApiCertificateDto;
import com.yd.base.feign.request.relobjectcertificate.ApiRelObjectCertificateListAddRequest;
......@@ -108,6 +109,7 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiInsurantInfoDto apiInsurantInfoDto) {
//编辑预约入参字段校验 - 受保人信息字段校验
apiAppointmentCheckService.checkEditApiInsurantInfoDto(apiInsurantInfoDto);
......@@ -224,6 +226,7 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<Insurant> editInsurantData(ApiInsurantInfoDto dto, String appointmentBizId) {
if (Objects.isNull(dto)){
//受保人信息对象不能为空
......@@ -235,15 +238,19 @@ public class ApiInsurantServiceImpl implements ApiInsurantService {
Result<Insurant> result = checkInsurantIsExist(dto.getInsurantBizId());
//受保人信息信息
Insurant insurant = result.getData();
Long insurantId = insurant.getId();
//与投保人关系
if (RelTypeEnum.MYSELF.getItemValue().equals(dto.getPolicyholderRel())) {
//与投保人关系如果是本人，直接查询投保人信息表更新数据到受保人信息表中
Policyholder policyholder = iPolicyholderService.queryOne(appointmentBizId,"");
if (!Objects.isNull(policyholder)) {
log.info("与投保人关系如果是本人，直接查询投保人信息表更新数据到受保人信息表中之前result.getData(),{}", JSON.toJSONString(result));
log.info("与投保人关系如果是本人，直接查询投保人信息表更新数据到受保人信息表中之前,{}", JSON.toJSONString(insurant));
BeanUtils.copyProperties(policyholder,insurant);
insurant.setId(result.getData().getId());
insurant.setId(insurantId);
insurant.setAppointmentBizId(appointmentBizId);
log.info("与投保人关系如果是本人，直接查询投保人信息表更新数据到受保人信息表中之后,{}", JSON.toJSONString(insurant));
iInsurantService.saveOrUpdate(insurant);
//查询投保人税务列表信息
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiPolicyReceiptServiceImpl.java
......@@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
......@@ -79,6 +80,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiPolicyReceiptAddRequest request) {
//校验保单信息是否存在
Policy policy = policyService.queryOne(request.getPolicyNo());
......@@ -101,6 +103,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPolicyReceiptEditRequest request) {
//校验保单回执信息是否存在
PolicyReceipt policyReceipt = iPolicyReceiptService.queryOne(request.getPolicyReceiptBizId());
......@@ -127,6 +130,7 @@ public class ApiPolicyReceiptServiceImpl implements ApiPolicyReceiptService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result editReceiptStatus(String policyReceiptBizId, String receiptStatus) {
PolicyReceipt policyReceipt = iPolicyReceiptService.queryOne(policyReceiptBizId);
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 {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPolicyholderInfoDto apiPolicyholderInfoDto) {
//编辑预约入参字段校验 - 投保人信息字段校验
apiAppointmentCheckService.checkEditApiPolicyholderInfoDto(apiPolicyholderInfoDto);
......@@ -165,6 +166,7 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
* @param apiCertificateDtoList
* @return
*/
@Transactional(rollbackFor = Exception.class)
public Result addRelObjectCertificateList(String objectBizId,
String objectType,
String objectTableName,
......@@ -187,6 +189,7 @@ public class ApiPolicyholderServiceImpl implements ApiPolicyholderService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<Policyholder> editPolicyholderData(ApiPolicyholderInfoDto dto, String appointmentBizId) {
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;
import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result;
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.ApiPremiumReconciliationService;
import com.yd.csf.api.service.ApiPremiumRemittanceService;
......@@ -118,6 +119,9 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
return applicationContext.getBean(ApiPremiumReconciliationService.class);
}
@Resource
private ApiExpectedFortuneAsyncService apiExpectedFortuneAsyncService;
/**
* 分页列表查询-保费对账记录信息
* @param request
......@@ -720,6 +724,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiPremiumReconciliationAddRequest request) {
//根据当前Policy保单信息里面的生效日期、付款频率、缴费宽限期，校验当天是否在缴费期内，不在缴费期内不能保费对账 TODO 校验待定
//保费对账信息
......@@ -812,6 +817,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPremiumReconciliationDto request) {
if (StringUtils.isBlank(request.getPremiumReconciliationBizId())) {
throw new BusinessException("保费对账记录表唯一业务ID不能为空");
......@@ -1171,6 +1177,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
@Override
@Transactional(rollbackFor = Exception.class)
public Result editResult(ApiPremiumReconciliationResultEditRequest request) {
log.info("设置认定结果-保费对账记录信息前effectiveDate生效日期：{}",request.getEffectiveDate());
// 通过 RequestContextHolder 获取 HttpServletRequest
HttpServletRequest httpServletRequest = ((ServletRequestAttributes)
RequestContextHolder.currentRequestAttributes()).getRequest();
......@@ -1212,6 +1219,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
//遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表
// 通过代理对象调用
// getSelf().execute(statusRequest,token);
log.info("changePolicyFollowStatus前effectiveDate生效日期：{}",statusRequest.getEffectiveDate());
Result<Boolean> result1 = changePolicyFollowStatus(statusRequest,token);
if (result1.getCode() != 200) {
throw new BusinessException(result1.getMsg());
......@@ -1229,12 +1237,6 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
return Result.success();
}
@Override
@Async("commonAsyncExecutor")
public void execute(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token) {
changePolicyFollowStatus(changePolicyFollowStatusRequest,token);
}
/**
* 修改跟进状态
*
......@@ -1245,7 +1247,7 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
public Result<Boolean> changePolicyFollowStatus(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token) {
// 设置ThreadLocal Token
FeignTokenInterceptor.setThreadLocalToken(token);
// FeignTokenInterceptor.setThreadLocalToken(token);
if (changePolicyFollowStatusRequest == null || StringUtils.isBlank(changePolicyFollowStatusRequest.getPolicyBizId())) {
return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "policyBizId不能为空");
......@@ -1289,27 +1291,27 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) {
log.info("修改跟进状态获取token：{}", token);
// 同步：根据保单生成预计出账记录
generateExpectedFortuneSync(token, policyFollow.getPolicyNo());
apiExpectedFortuneAsyncService.execute(policyFollow.getPolicyNo(),token);
}
return Result.success(true);
}
/**
* 同步生成预计出账记录
*
* @param token 认证Token
* @param policyNo 保单号
*/
private void generateExpectedFortuneSync(String token, String policyNo) {
// 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
generateExpectedFortuneRequest.setPolicyNo(policyNo);
log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo);
Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest);
if (result != null && result.getCode() == 200) {
log.info("新单跟进-同步生成预计出账记录成功:保单号={}", policyNo);
}
}
// /**
// * 同步生成预计出账记录
// *
// * @param token 认证Token
// * @param policyNo 保单号
// */
// private void generateExpectedFortuneSync(String token, String policyNo) {
// // 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
// ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
// generateExpectedFortuneRequest.setPolicyNo(policyNo);
// log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo);
// Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest);
// if (result != null && result.getCode() == 200) {
// 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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -48,6 +49,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiPremiumRemittanceFileDto request) {
if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) {
throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空");
......@@ -66,6 +68,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPremiumRemittanceFileDto request) {
if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) {
throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空");
......@@ -86,6 +89,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String premiumRemittanceFileBizId) {
Result<PremiumRemittanceFile> result = checkPremiumRemittanceFileIsExist(premiumRemittanceFileBizId);
PremiumRemittanceFile file = result.getData();
......@@ -100,6 +104,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result addPremiumRemittanceFileList(List<ApiPremiumRemittanceFileDto> apiPremiumRemittanceFileDtoList,
String premiumRemittanceBizId) {
if (CollectionUtils.isEmpty(apiPremiumRemittanceFileDtoList)) {
......@@ -124,6 +129,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result savePremiumRemittanceFileList(List<ApiPremiumRemittanceFileDto> apiPremiumRemittanceFileDtoList,
String premiumRemittanceBizId) {
//先删后新增
......@@ -149,6 +155,7 @@ public class ApiPremiumRemittanceFileServiceImpl implements ApiPremiumRemittance
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result delByPremiumRemittanceBizId(String premiumRemittanceBizId) {
iPremiumRemittanceFileService.delByPremiumRemittanceBizId(premiumRemittanceBizId);
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Arrays;
......@@ -55,6 +56,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiPremiumRemittanceDto request) {
if (StringUtils.isBlank(request.getPremiumReconciliationBizId())) {
throw new BusinessException("保费对账记录表唯一业务ID不能为空");
......@@ -72,6 +74,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiPremiumRemittanceDto request) {
if (StringUtils.isBlank(request.getPremiumRemittanceBizId())) {
throw new BusinessException("保费对账-汇款记录表唯一业务ID不能为空");
......@@ -112,6 +115,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String premiumRemittanceBizId) {
checkPremiumRemittanceIsExist(premiumRemittanceBizId);
//删除保费对账汇款记录附件列表
......@@ -128,6 +132,7 @@ public class ApiPremiumRemittanceServiceImpl implements ApiPremiumRemittanceServ
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result addPremiumRemittanceList(List<ApiPremiumRemittanceDto> apiPremiumRemittanceDtoList,
String premiumReconciliationBizId) {
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 {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<String> edit(ApiProductPlanMainInfoDto apiProductPlanMainInfoDto) {
//编辑预约入参字段校验 - 产品计划信息字段校验 - 产品计划主信息字段校验
......@@ -102,6 +103,7 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result editPlan(ApiProductPlanInfoDto apiProductPlanInfoDto) {
//编辑产品计划主体信息
Result<String> result = edit(apiProductPlanInfoDto.getApiProductPlanMainInfoDto());
......@@ -146,6 +148,7 @@ public class ApiProductPlanServiceImpl implements ApiProductPlanService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<ProductPlan> editProductPlanData(ApiProductPlanInfoDto productPlanInfoDto, String appointmentBizId) {
if (Objects.isNull(productPlanInfoDto)
|| ( !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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -32,6 +33,7 @@ public class ApiRelObjectConditionServiceImpl implements ApiRelObjectConditionSe
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveRelList(ApiRelObjectConditionDto 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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -60,6 +61,7 @@ public class ApiRelObjectFormulaServiceImpl implements ApiRelObjectFormulaServic
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveRelList(ApiRelObjectFormulaDto dto) {
//先删后新增
RelObjectFormulaDto relObjectFormulaDto = new RelObjectFormulaDto();
......@@ -86,6 +88,7 @@ public class ApiRelObjectFormulaServiceImpl implements ApiRelObjectFormulaServic
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveObjectList(List<ApiRelObjectFormulaDto> objectList, String 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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -28,6 +29,7 @@ public class ApiRelObjectSqlServiceImpl implements ApiRelObjectSqlService {
private ICommissionSqlTemplateService iCommissionSqlTemplateService;
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveRelList(ApiRelObjectSqlDto dto) {
//先删后新增
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -79,6 +80,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiRuleItemConfigAddRequest request) {
//校验基本法项目名称的唯一性
List<RuleItemConfig> list = iRuleItemConfigService.queryList(RuleItemConfigDto.builder()
......@@ -115,6 +117,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiRuleItemConfigEditRequest request) {
Result<RuleItemConfig> result = checkRuleItemConfigIsExist(request.getRuleItemBizId());
RuleItemConfig ruleItemConfig = result.getData();
......@@ -150,6 +153,7 @@ public class ApiRuleItemConfigServiceImpl implements ApiRuleItemConfigService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String ruleItemBizId) {
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 {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiSecondHolderInfoDto apiSecondHolderInfoDto) {
//编辑预约入参字段校验 - 第二持有人信息字段校验
apiAppointmentCheckService.checkEditApiSecondHolderInfoDto(apiSecondHolderInfoDto);
......@@ -97,6 +98,7 @@ public class ApiSecondHolderServiceImpl implements ApiSecondHolderService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result<SecondHolder> editSecondHolderData(ApiSecondHolderInfoDto dto, String appointmentBizId) {
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
......@@ -32,6 +33,7 @@ public class ApiTaxationServiceImpl implements ApiTaxationService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveTaxationList(ApiObjectTaxationDto dto) {
//先删后新增
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;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
......@@ -93,6 +94,7 @@ public class ApiVariableServiceImpl implements ApiVariableService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result add(ApiVariableAddRequest request) {
//校验变量中文名唯一性
List<Variable> variableList = iVariableService.queryList(VariableDto.builder()
......@@ -150,6 +152,7 @@ public class ApiVariableServiceImpl implements ApiVariableService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiVariableEditRequest request) {
//校验变量信息是否存在
Result<Variable> result = checkVariableIsExist(request.getVariableBizId());
......@@ -209,6 +212,7 @@ public class ApiVariableServiceImpl implements ApiVariableService {
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Result del(String variableBizId) {
return null;
}
......
yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiAppointmentInfoDto.java
......@@ -68,19 +68,19 @@ public class ApiAppointmentInfoDto {
* 签单日
*/
@NotNull(message = "签约信息-签单日不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime signDate;
/**
* 到港时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime arrivalTime;
/**
* 离港时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime departureTime;
/**
......@@ -126,13 +126,13 @@ public class ApiAppointmentInfoDto {
/**
* 开户时间段（开始）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime openAccountStartTime;
/**
* 开户时间段（结束）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime openAccountEndTime;
/**
......
yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiBeneficiaryInfoDto.java
......@@ -59,7 +59,7 @@ public class ApiBeneficiaryInfoDto {
/**
* 出生日期（生日，如果是身份证，自动获取性别和生日）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime birthday;
/**
......
yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiInsurantInfoDto.java
......@@ -49,8 +49,8 @@ public class ApiInsurantInfoDto {
/**
* 姓名-中文
*/
@NotBlank(message = "受保人-姓名（中文）不能为空", groups = GroupValid.NotSelf.class)
@Pattern(regexp = "^[\u4e00-\u9fa5]{2,6}$", message = "受保人-姓名（中文）必须为2-6位汉字", groups = GroupValid.NotSelf.class)
// @NotBlank(message = "受保人-姓名（中文）不能为空", groups = GroupValid.NotSelf.class)
@Pattern(regexp = "^(|[\u4e00-\u9fa5]{2,6})$", message = "受保人-姓名（中文）必须为2-6位汉字", groups = GroupValid.NotSelf.class)
private String nameCn;
/**
......@@ -79,19 +79,19 @@ public class ApiInsurantInfoDto {
* 出生日期（生日，如果是身份证，自动获取性别和生日）
*/
@NotNull(message = "受保人-生日不能为空", groups = GroupValid.NotSelf.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime birthday;
@AssertTrue(message = "受保人-必须大于18周岁", groups = GroupValid.NotSelf.class)
public boolean isBirthdayValid() {
if (birthday == null) {
// @NotNull 会处理空值
return true;
}
LocalDateTime now = LocalDateTime.now();
// 计算年龄
int age = Period.between(birthday.toLocalDate(), now.toLocalDate()).getYears();
return age > 18;
}
// @AssertTrue(message = "受保人-必须大于18周岁", groups = GroupValid.NotSelf.class)
// public boolean isBirthdayValid() {
// if (birthday == null) {
// // @NotNull 会处理空值
// return true;
// }
// LocalDateTime now = LocalDateTime.now();
// // 计算年龄
// int age = Period.between(birthday.toLocalDate(), now.toLocalDate()).getYears();
// return age > 18;
// }
/**
* 年龄（通过生日自动获取年龄）
......
yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiPolicyholderInfoDto.java
......@@ -42,8 +42,8 @@ public class ApiPolicyholderInfoDto {
/**
* 姓名-中文
*/
@NotBlank(message = "投保人-姓名（中文）不能为空")
@Pattern(regexp = "^[\u4e00-\u9fa5]{2,6}$", message = "投保人-姓名（中文）必须为2-6位汉字")
// @NotBlank(message = "投保人-姓名（中文）不能为空")
@Pattern(regexp = "^(|[\u4e00-\u9fa5]{2,6})$",message = "投保人-姓名（中文）必须为2-6位汉字")
private String nameCn;
/**
......@@ -72,7 +72,7 @@ public class ApiPolicyholderInfoDto {
* 出生日期（生日，如果是身份证，自动获取性别和生日）
*/
@NotNull(message = "投保人-生日不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime birthday;
@AssertTrue(message = "投保人-必须大于18周岁")
public boolean isBirthdayValid() {
......
yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiProductPlanMainInfoDto.java
......@@ -127,7 +127,7 @@ public class ApiProductPlanMainInfoDto {
/**
* 回溯日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime backtrackDate;
/**
......
yd-csf-feign/src/main/java/com/yd/csf/feign/dto/appointment/ApiSecondHolderInfoDto.java
......@@ -48,6 +48,6 @@ public class ApiSecondHolderInfoDto {
/**
* 出生日期（生日，如果是身份证，自动获取性别和生日）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime birthday;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentEditConfirmTimeRequest.java
......@@ -19,6 +19,6 @@ public class ApiAppointmentEditConfirmTimeRequest {
* 确定预约时间
*/
@NotNull(message = "确定预约时间不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime confirmAppointmentTime;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentPageRequest.java
......@@ -39,12 +39,12 @@ public class ApiAppointmentPageRequest extends PageDto {
/**
* 确定预约开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
/**
* 确定预约结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/commissionruleconfig/ApiCommissionRuleConfigAddRequest.java
......@@ -24,13 +24,13 @@ public class ApiCommissionRuleConfigAddRequest {
/**
* 生效开始日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime effectiveStart;
/**
* 生效结束日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime effectiveEnd;
/**
......
yd-csf-feign/src/main/java/com/yd/csf/feign/request/commissionruleconfig/ApiCommissionRuleConfigEditRequest.java
......@@ -29,13 +29,13 @@ public class ApiCommissionRuleConfigEditRequest {
/**
* 生效开始日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime effectiveStart;
/**
* 生效结束日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime effectiveEnd;
/**
......
yd-csf-feign/src/main/java/com/yd/csf/feign/request/policyreceipt/ApiPolicyReceiptAddRequest.java
......@@ -21,7 +21,7 @@ public class ApiPolicyReceiptAddRequest {
* 回执日期
*/
@NotNull(message = "回执日期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime receiptDate;
/**
......
yd-csf-feign/src/main/java/com/yd/csf/feign/request/policyreceipt/ApiPolicyReceiptEditRequest.java
......@@ -27,7 +27,7 @@ public class ApiPolicyReceiptEditRequest {
* 回执日期
*/
@NotNull(message = "回执日期不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime receiptDate;
/**
......
yd-csf-feign/src/main/java/com/yd/csf/feign/request/premiumreconciliation/ApiPremiumReconciliationResultEditRequest.java
......@@ -46,13 +46,13 @@ public class ApiPremiumReconciliationResultEditRequest {
/**
* 生效日期（保单生效日）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date effectiveDate;
/**
* 保单核保日
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date underwritingDate;
/**
......@@ -63,13 +63,13 @@ public class ApiPremiumReconciliationResultEditRequest {
/**
* 冷静期结束日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date coolingOffEndDate;
/**
* 保单截止日期
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date policyExpirationDate;
}
yd-csf-service/src/main/java/com/yd/csf/service/component/CommissionAsyncService.java
......@@ -18,6 +18,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
......@@ -40,7 +41,7 @@ public class CommissionAsyncService {
private CommissionCompareRecordService commissionCompareRecordService;
// @Async("commonAsyncExecutor")
@Transactional(rollbackFor = Exception.class)
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void commissionCompareBatch(List<Commission> entities) {
// 根据是否关联保单号，来区分比对方式
List<Commission> hasPolicyNoList = new ArrayList<>();
......
yd-csf-service/src/main/java/com/yd/csf/service/config/AsyncConfig.java
......@@ -4,6 +4,8 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableAsync;
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.ThreadPoolExecutor;
......@@ -37,20 +39,53 @@ public class AsyncConfig {
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")
public Executor commonAsyncExecutor() {
@Bean(name = "commonAsyncExecutor")
public ThreadPoolTaskExecutor commonAsyncExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
executor.setCorePoolSize(5);
executor.setMaxPoolSize(10);
executor.setQueueCapacity(50);
// 设置核心线程数、最大线程数、队列容量等参数...
executor.setCorePoolSize(10);
executor.setMaxPoolSize(20);
executor.setQueueCapacity(100);
executor.setThreadNamePrefix("common-async-");
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
executor.setWaitForTasksToCompleteOnShutdown(true);
executor.setAwaitTerminationSeconds(30);
executor.setKeepAliveSeconds(30);
// 设置 TaskDecorator，用于传递 RequestAttributes
executor.setTaskDecorator(runnable -> {
// 获取当前线程的 RequestAttributes
RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
return () -> {
try {
// 将 RequestAttributes 设置到子线程中
RequestContextHolder.setRequestAttributes(attributes);
runnable.run();
} finally {
// 任务完成后清空，避免内存泄漏
RequestContextHolder.resetRequestAttributes();
}
};
});
executor.initialize();
return executor;
}
......
yd-csf-service/src/main/java/com/yd/csf/service/config/CsfMybatisPlusConfig.java
package com.yd.csf.service.config;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.yd.auth.core.dto.AuthUserDto;
import com.yd.auth.core.utils.SecurityUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import java.time.LocalDateTime;
@Slf4j
@Configuration
public class CsfMybatisPlusConfig {
......@@ -25,21 +31,45 @@ public class CsfMybatisPlusConfig {
}
/**
* 自动填充字段配置（如创建时间、更新时间）
* 自动填充字段配置（如创建人、更新人等）
*/
@Bean
@Primary
public MetaObjectHandler metaObjectHandler() {
log.info("MetaObjectHandler Bean 正在创建...","MetaObjectHandler Bean 正在创建==========");
return new MetaObjectHandler() {
@Override
public void insertFill(MetaObject metaObject) {
this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
//获取Security上下文当前用户的登录信息
AuthUserDto authUserDto = null;
try {
authUserDto = SecurityUtil.getCurrentLoginUser();
}catch (Exception e) {
log.info("获取Security上下文当前用户的登录信息失败，{}",e.getMessage());
}
log.info("metaObjectHandler=======insertFill自动填充获取用户信息：{}", JSON.toJSONString(authUserDto));
if (authUserDto != null) {
//自动注入创建人和创建用户名
this.strictInsertFill(metaObject, "creatorId", String.class, authUserDto.getUserBizId());
this.strictInsertFill(metaObject, "creatorName", String.class, authUserDto.getUsername());
}
}
@Override
public void updateFill(MetaObject metaObject) {
this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
//获取Security上下文当前用户的登录信息
AuthUserDto authUserDto = null;
try {
authUserDto = SecurityUtil.getCurrentLoginUser();
}catch (Exception e) {
log.info("获取Security上下文当前用户的登录信息失败，{}",e.getMessage());
}
log.info("metaObjectHandler=======updateFill自动填充获取用户信息：{}", JSON.toJSONString(authUserDto));
if (authUserDto != null) {
//自动注入更新人和更新用户名
this.strictUpdateFill(metaObject, "updaterId", String.class, authUserDto.getUserBizId());
this.strictUpdateFill(metaObject, "updaterName", String.class, authUserDto.getUsername());
}
}
};
}
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/CommissionExpectedQueryRequest.java
package com.yd.csf.service.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yd.common.dto.PageDto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
......@@ -32,15 +32,13 @@ public class CommissionExpectedQueryRequest extends PageDto {
* 预计入账日期开始 格式：yyyy-MM-dd
*/
@Schema(description = "预计入账日期开始 格式：yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date commissionDateStart;
private LocalDate commissionDateStart;
/**
* 预计入账日期结束 格式：yyyy-MM-dd
*/
@Schema(description = "预计入账日期结束 格式：yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date commissionDateEnd;
private LocalDate commissionDateEnd;
/**
* 入账期数
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/CustomerAddRequest.java
......@@ -5,6 +5,7 @@ import com.yd.csf.service.vo.AddressVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
......@@ -22,9 +23,15 @@ public class CustomerAddRequest implements Serializable {
private String fnaBizId;
/**
* 客户ID
*/
private String customerBizId;
/**
* 姓名-中文
*/
@Schema(description = "姓名-中文")
@Pattern(regexp = "^(|[\u4e00-\u9fa5]{2,6})$",message = "投保人-姓名（中文）必须为2-6位汉字")
private String nameCn;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/CustomerUpdateRequest.java
......@@ -5,6 +5,7 @@ import com.yd.csf.service.vo.AddressVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.Pattern;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
......@@ -32,6 +33,7 @@ public class CustomerUpdateRequest implements Serializable {
* 姓名-中文
*/
@Schema(description = "姓名-中文")
@Pattern(regexp = "^(|[\u4e00-\u9fa5]{2,6})$",message = "投保人-姓名（中文）必须为2-6位汉字")
private String nameCn;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/FortuneAccountExportDTO.java
......@@ -17,9 +17,13 @@ public class FortuneAccountExportDTO implements Serializable {
@ExcelProperty("转介人")
private String broker;
private String brokerBizId;
@ExcelProperty("所属团队")
private String team;
private String teamBizId;
@ExcelProperty("出账币种")
private String currency;
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowDto.java
......@@ -150,7 +150,7 @@ public class PolicyFollowDto implements Serializable {
private String insuranceCompanyBizId;
@Schema(description = "对账公司")
private String reconciliationCompanyName;
private String reconciliationCompany;
@Schema(description = "对账公司编码")
private String reconciliationCode;
......@@ -239,4 +239,7 @@ public class PolicyFollowDto implements Serializable {
@Schema(description = "保单类型: 1-电子, 2-纸质")
private String policyType;
@Schema(description = "专业投资者: Yes/No")
private String professionalInvestor;
}
yd-csf-service/src/main/java/com/yd/csf/service/dto/PolicyFollowQueryRequest.java
......@@ -53,8 +53,7 @@ public class PolicyFollowQueryRequest extends PageDto implements Serializable {
* 最晚缴费日期
*/
@Schema(description = "最晚缴费日期 格式: yyyy-MM-dd", example = "2023-01-01", format = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date latestPaymentDate;
private String latestPaymentDate;
/**
* 投保人业务id列表
......@@ -84,7 +83,7 @@ public class PolicyFollowQueryRequest extends PageDto implements Serializable {
* 缴费年期
*/
@Schema(description = "缴费年期")
private String issueNumber;
private Integer issueNumber;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
yd-csf-service/src/main/java/com/yd/csf/service/dto/QueryPolicyAndBrokerDto.java
......@@ -35,6 +35,11 @@ public class QueryPolicyAndBrokerDto {
private String productCode;
/**
* 保险公司业务id
*/
private String insuranceCompanyBizId;
/**
* 供款年期（字典）
*/
private Integer paymentTerm;
......
yd-csf-service/src/main/java/com/yd/csf/service/enums/CommissionStatusEnum.java
......@@ -30,4 +30,13 @@ public enum CommissionStatusEnum {
public String getItemValue() {
return itemValue;
}
public static String toLabel(String itemValue) {
for (CommissionStatusEnum anEnum : CommissionStatusEnum.values()) {
if (anEnum.itemValue.equals(itemValue)) {
return anEnum.getItemLabel();
}
}
return "";
}
}
yd-csf-service/src/main/java/com/yd/csf/service/enums/CurrencyEnum.java
......@@ -17,8 +17,8 @@ import org.apache.commons.lang3.ObjectUtils;
public enum CurrencyEnum {
// 货币枚举
USD("美元", "USD"),
CNY("人民幣", "CNY"),
HKD("港幣", "HKD"),
CNY("人民币", "CNY"),
HKD("港币", "HKD"),
AUD("澳元", "AUD"),
JPY("日元", "JPY"),
CAD("加元", "CAD"),
......@@ -65,4 +65,13 @@ public enum CurrencyEnum {
public String getItemValue() {
return itemValue;
}
public static String toLabel(String itemValue) {
for (CurrencyEnum anEnum : CurrencyEnum.values()) {
if (anEnum.itemValue.equalsIgnoreCase(itemValue)) {
return anEnum.getItemLabel();
}
}
return "";
}
}
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("-", -1);
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 "GUARANTEE_PERIOD":
return "保障年期";
default:
return typeCode;
}
}
}
yd-csf-service/src/main/java/com/yd/csf/service/model/Additional.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
......@@ -134,13 +131,13 @@ public class Additional implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentAccumulatedFyc.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
......@@ -88,13 +86,13 @@ public class AgentAccumulatedFyc implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentDetailFyc.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
......@@ -118,13 +116,13 @@ public class AgentDetailFyc implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentManageRelation.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 管理关系表（（团队的形成来自这张表，谁在最高级就是团长））
......@@ -87,13 +85,13 @@ public class AgentManageRelation implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentReferralRelation.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 推荐关系表
......@@ -99,13 +97,13 @@ public class AgentReferralRelation implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AgentTutoringRelation.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 辅导关系表
......@@ -93,13 +91,13 @@ public class AgentTutoringRelation implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Appointment.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
......@@ -342,19 +339,19 @@ public class Appointment implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 创建人用户名
*/
@TableField("creator_name")
@TableField(value = "creator_name", fill = FieldFill.INSERT)
private String creatorName;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentFile.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 预约附件信息表
......@@ -72,19 +70,19 @@ public class AppointmentFile implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 创建人名称
*/
@TableField("creator_name")
@TableField(value = "creator_name", fill = FieldFill.INSERT)
private String creatorName;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentLog.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 预约信息日志表（快照表）
......@@ -306,19 +304,19 @@ public class AppointmentLog implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 创建人用户名
*/
@TableField("creator_name")
@TableField(value = "creator_name", fill = FieldFill.INSERT)
private String creatorName;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentReferrer.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 预约-转介人信息表
......@@ -84,13 +82,13 @@ public class AppointmentReferrer implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentReferrerLog.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 预约-转介人信息日志表（快照表）
......@@ -84,13 +82,13 @@ public class AppointmentReferrerLog implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentUserSign.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 预约-签单员信息表
......@@ -114,13 +112,13 @@ public class AppointmentUserSign implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/AppointmentUserSignLog.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 预约-签单员信息日志表（快照表）
......@@ -114,13 +112,13 @@ public class AppointmentUserSignLog implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/BatchPolicy.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
......@@ -88,13 +86,13 @@ public class BatchPolicy implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Beneficiary.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
......@@ -110,13 +107,13 @@ public class Beneficiary implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CarApply.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 车辆预约申请表
......@@ -141,13 +139,13 @@ public class CarApply implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ClientRole.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 客户端角色表
......@@ -87,13 +85,13 @@ public class ClientRole implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/Commission.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.RoundingMode;
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;
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.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* 来佣比对记录表
* @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;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 来佣修改记录表
* @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;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
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;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
......@@ -94,13 +92,13 @@ public class CommissionResult implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionRuleBinding.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 基本法绑定表 - 存储基本法与业务员或团队的绑定关系，支持灵活的权限分配
......@@ -105,13 +103,13 @@ public class CommissionRuleBinding implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionRuleConfig.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 基本法配置表
......@@ -105,13 +103,13 @@ public class CommissionRuleConfig implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionSqlTemplate.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* SQL模板表 - 存储所有佣金计算相关的动态SQL模板，支持灵活配置和参数化查询，实现业务逻辑与代码解耦
......@@ -111,13 +109,13 @@ public class CommissionSqlTemplate implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ConditionConfig.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
......@@ -136,13 +134,13 @@ public class ConditionConfig implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ConditionType.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 条件类型表
......@@ -81,13 +79,13 @@ public class ConditionType implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
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;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
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;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
/**
* CSF客户信息扩展表
*
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortune.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 预计发佣表
......@@ -265,13 +261,13 @@ public class ExpectedFortune implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
private String updaterId;
/**
......
yd-csf-service/src/main/java/com/yd/csf/service/model/ExpectedFortuneLog.java
package com.yd.csf.service.model;
import com.baomidou.mybatisplus.annotation.IdType;
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 com.baomidou.mybatisplus.annotation.*;
import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 生成预计发佣日志记录表
......@@ -63,13 +61,13 @@ public class ExpectedFortuneLog implements Serializable {
/**
* 创建人ID
*/
@TableField("creator_id")
@TableField(value = "creator_id", fill = FieldFill.INSERT)
private String creatorId;
/**
* 更新人ID
*/
@TableField("updater_id")
@TableField(value = "updater_id", fill = FieldFill.UPDATE)
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;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* fna表
......
yd-csf-service/src/main/java/com/yd/csf/service/model/FnaCustomer.java
......@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
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