预约-v1版本

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

@@ -398,10 +398,13 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
                 //当前为已取消状态——>状态更新为预约中
                 //当前为已取消状态——>状态更新为预约中
                 status = AppointmentStatusEnum.YYZ.getItemValue();
                 status = AppointmentStatusEnum.YYZ.getItemValue();
             }else if (AppointmentStatusEnum.YYZ.getItemValue().equals(appointmentCheck.getStatus())) {
             }else if (AppointmentStatusEnum.YYZ.getItemValue().equals(appointmentCheck.getStatus())) {
+                if (request.getSource() == 2) {
+                    //当前生成新单跟进提交：
                     //当前状态为预约中 ——> 状态更新为预约成功 ——> 新增新单跟进记录
                     //当前状态为预约中 ——> 状态更新为预约成功 ——> 新增新单跟进记录
                     status = AppointmentStatusEnum.YY_CG.getItemValue();
                     status = AppointmentStatusEnum.YY_CG.getItemValue();
                 }
                 }
             }
             }
+        }
 
 
         //编辑预约提交-编辑预约信息主表数据
         //编辑预约提交-编辑预约信息主表数据
         if (Objects.isNull(request.getApiAppointmentInfoDto())) {
         if (Objects.isNull(request.getApiAppointmentInfoDto())) {
@@ -443,7 +446,10 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
             apiQuestionnairesFeignClient.answerSave(answerSaveRequest);
             apiQuestionnairesFeignClient.answerSave(answerSaveRequest);
         }
         }
 
 
-        if (!Objects.isNull(appointmentCheck) && AppointmentStatusEnum.YYZ.getItemValue().equals(appointmentCheck.getStatus())) {
+        if (!Objects.isNull(appointmentCheck)
+                && request.getSource() == 2
+                && AppointmentStatusEnum.YYZ.getItemValue().equals(appointmentCheck.getStatus())) {
+            //生成新单跟进提交
             //当前状态为预约中 ——> 状态更新为预约成功 ——> 更新FNA预约业务id和预约编号、新增新单跟进记录
             //当前状态为预约中 ——> 状态更新为预约成功 ——> 更新FNA预约业务id和预约编号、新增新单跟进记录
             //更新FNA预约业务id和预约编号
             //更新FNA预约业务id和预约编号
             updateFnaBizIdAndNo(appointment.getFnaBizId(), appointment.getAppointmentBizId(), appointment.getAppointmentNo());
             updateFnaBizIdAndNo(appointment.getFnaBizId(), appointment.getAppointmentBizId(), appointment.getAppointmentNo());

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentEditRequest.java

@@ -14,9 +14,9 @@ import java.util.List;
 public class ApiAppointmentEditRequest {
 public class ApiAppointmentEditRequest {
 
 
     /**
     /**
-     * 来源 1-编辑提交 2-生成新单跟进
+     * 来源 1-编辑提交 2-生成新单跟进提交
      */
      */
-    private Integer source;
+    private Integer source = 1;
 
 
     /**
     /**
      * 预约信息
      * 预约信息

yd-csf-service/src/main/java/com/yd/csf/service/model/Appointment.java

@@ -95,7 +95,12 @@ public class Appointment implements Serializable {
     private String togetherAppointmentNo;
     private String togetherAppointmentNo;
 
 
     /**
     /**
-     * 预约状态: 0-暂存 1-待预约, 2-待签署 3-已签署 4-已取消（字典）
+     * 预约状态
+     *  DWS("待完善",0),
+     *  YYZ("预约中",1),
+     *  YY_CG("预约成功",2),
+     *  YQD("已签单",3),
+     *  YQX("已取消",4)
      */
      */
     @TableField("status")
     @TableField("status")
     private Integer status;
     private Integer status;