push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java

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