Commit f757847c by zhangxingmin

push

parent 0825bb52
...@@ -201,6 +201,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -201,6 +201,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* 提交待预约状态,预约信息更新到Fna表的预约业务id和预约编号 * 提交待预约状态,预约信息更新到Fna表的预约业务id和预约编号
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result updateFnaBizIdAndNo(String fnaBizId,String appointmentBizId,String appointmentNo) { public Result updateFnaBizIdAndNo(String fnaBizId,String appointmentBizId,String appointmentNo) {
Fna fna = fnaService.queryOne(fnaBizId); Fna fna = fnaService.queryOne(fnaBizId);
if (!Objects.isNull(fna)) { if (!Objects.isNull(fna)) {
...@@ -218,6 +219,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -218,6 +219,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result addStorage(ApiAppointmentAddStorageRequest request) { public Result addStorage(ApiAppointmentAddStorageRequest request) {
if (Objects.isNull(request.getApiAppointmentInfoDto())) { if (Objects.isNull(request.getApiAppointmentInfoDto())) {
request.setApiAppointmentInfoDto(new ApiAppointmentInfoDto()); request.setApiAppointmentInfoDto(new ApiAppointmentInfoDto());
...@@ -261,6 +263,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -261,6 +263,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @param dto * @param dto
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result<Appointment> addAppointmentData(ApiAppointmentInfoDto dto,Integer status) { public Result<Appointment> addAppointmentData(ApiAppointmentInfoDto dto,Integer status) {
if (Objects.isNull(dto)) { if (Objects.isNull(dto)) {
//为空设置,方便新建暂存公用方法 //为空设置,方便新建暂存公用方法
...@@ -287,6 +290,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -287,6 +290,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result edit(ApiAppointmentEditRequest request) { public Result edit(ApiAppointmentEditRequest request) {
//编辑预约入参字段校验(非库校验) //编辑预约入参字段校验(非库校验)
apiAppointmentCheckService.checkEditRequest(request); apiAppointmentCheckService.checkEditRequest(request);
...@@ -358,6 +362,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -358,6 +362,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result editConfirmTime(ApiAppointmentEditConfirmTimeRequest request) { public Result editConfirmTime(ApiAppointmentEditConfirmTimeRequest request) {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId()); Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
...@@ -386,6 +391,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -386,6 +391,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* 确定预约时间提交 (流程流转到新单跟进) - 新增新单跟进记录 * 确定预约时间提交 (流程流转到新单跟进) - 新增新单跟进记录
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result savePolicyFollow(Appointment appointment) { public Result savePolicyFollow(Appointment appointment) {
Result<ApiAppointmentDetailResponse> result = detail(appointment.getAppointmentBizId()); Result<ApiAppointmentDetailResponse> result = detail(appointment.getAppointmentBizId());
ApiAppointmentDetailResponse response = result.getData(); ApiAppointmentDetailResponse response = result.getData();
...@@ -436,7 +442,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -436,7 +442,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
//币种 //币种
follow.setCurrency(apiProductPlanMainInfoDto.getCurrency()); follow.setCurrency(apiProductPlanMainInfoDto.getCurrency());
//生效日期 //生效日期
if (!Objects.isNull(apiProductPlanMainInfoDto.getPolicyEffectiveDate())) {
follow.setEffectiveDate(Date.from(apiProductPlanMainInfoDto.getPolicyEffectiveDate().atZone(ZoneId.systemDefault()).toInstant())); follow.setEffectiveDate(Date.from(apiProductPlanMainInfoDto.getPolicyEffectiveDate().atZone(ZoneId.systemDefault()).toInstant()));
}
//首期保费(不含徽费,预缴保费)每期保费 //首期保费(不含徽费,预缴保费)每期保费
follow.setInitialPremium(apiProductPlanMainInfoDto.getEachIssuePremium()); follow.setInitialPremium(apiProductPlanMainInfoDto.getEachIssuePremium());
//保险公司 //保险公司
...@@ -444,7 +452,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -444,7 +452,9 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
//是否预缴 //是否预缴
follow.setIsPrepaid(apiProductPlanMainInfoDto.getIsPrepay()); follow.setIsPrepaid(apiProductPlanMainInfoDto.getIsPrepay());
//供款年期 //供款年期
if (StringUtils.isNotBlank(apiProductPlanMainInfoDto.getPaymentTerm())) {
follow.setPaymentTerm(Integer.getInteger(apiProductPlanMainInfoDto.getPaymentTerm())); follow.setPaymentTerm(Integer.getInteger(apiProductPlanMainInfoDto.getPaymentTerm()));
}
//产品名称 //产品名称
follow.setProductName(apiProductPlanMainInfoDto.getProductName()); follow.setProductName(apiProductPlanMainInfoDto.getProductName());
} }
...@@ -460,6 +470,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -460,6 +470,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result singleEdit(ApiAppointmentInfoDto apiAppointmentInfoDto) { public Result singleEdit(ApiAppointmentInfoDto apiAppointmentInfoDto) {
//编辑预约入参字段校验 - 预约信息字段校验 //编辑预约入参字段校验 - 预约信息字段校验
...@@ -475,6 +486,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -475,6 +486,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @param dto * @param dto
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result<Appointment> editAppointmentData(ApiAppointmentInfoDto dto,Integer status) { public Result<Appointment> editAppointmentData(ApiAppointmentInfoDto dto,Integer status) {
if (Objects.isNull(dto)) { if (Objects.isNull(dto)) {
//预约信息对象不能为空 //预约信息对象不能为空
...@@ -499,6 +511,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -499,6 +511,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result editFna(ApiAppointmentEditFnaRequest request) { public Result editFna(ApiAppointmentEditFnaRequest request) {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId()); Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
...@@ -517,6 +530,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -517,6 +530,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result removeFna(ApiAppointmentRemoveFnaRequest request) { public Result removeFna(ApiAppointmentRemoveFnaRequest request) {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId()); Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
...@@ -535,6 +549,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -535,6 +549,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result editProposal(ApiAppointmentEditProposalRequest request) { public Result editProposal(ApiAppointmentEditProposalRequest request) {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId()); Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
...@@ -553,6 +568,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -553,6 +568,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result removeProposal(ApiAppointmentRemoveProposalRequest request) { public Result removeProposal(ApiAppointmentRemoveProposalRequest request) {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId()); Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
...@@ -571,6 +587,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -571,6 +587,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result editPolicyTransfer(ApiPolicyTransferRequest request) { public Result editPolicyTransfer(ApiPolicyTransferRequest request) {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId()); Result<Appointment> result = checkAppointmentIsExist(request.getAppointmentBizId());
...@@ -587,6 +604,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -587,6 +604,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public Result del(String appointmentBizId) { public Result del(String appointmentBizId) {
//校验预约信息是否存在 //校验预约信息是否存在
Result<Appointment> result = checkAppointmentIsExist(appointmentBizId); Result<Appointment> result = checkAppointmentIsExist(appointmentBizId);
...@@ -599,6 +617,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService { ...@@ -599,6 +617,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
* 新增健康问卷和预约对象关系绑定 * 新增健康问卷和预约对象关系绑定
* @return * @return
*/ */
@Transactional(rollbackFor = Exception.class)
public Result objectSaveJkQuestion(String appointmentBizId) { public Result objectSaveJkQuestion(String appointmentBizId) {
ApiObjectSaveRequest apiObjectSaveRequest = new ApiObjectSaveRequest(); ApiObjectSaveRequest apiObjectSaveRequest = new ApiObjectSaveRequest();
apiObjectSaveRequest.setObjectBizId(appointmentBizId); apiObjectSaveRequest.setObjectBizId(appointmentBizId);
......
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