Fna接口34

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiFnaController.java

@@ -39,8 +39,7 @@ public class ApiFnaController {
 
     @Resource
     private FnaService fnaService;
-    @Resource
-    private CustomerService customerService;
+
     @Resource
     private ApiAppointmentService appointmentService;
 
@@ -88,34 +87,16 @@ public class ApiFnaController {
         if (fnaUpdateRequest == null || StringUtils.isBlank(fnaUpdateRequest.getFnaBizId())) {
             throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
         }
-
-        // 判断是否存在
-        String fnaBizId = fnaUpdateRequest.getFnaBizId();
-        Fna fna = fnaService.getByBizId(fnaBizId);
-        if (fna == null) {
-            throw new BusinessException(ErrorCode.NOT_FOUND_ERROR.getCode(), ErrorCode.NOT_FOUND_ERROR.getMessage());
-        }
-
-        BeanUtils.copyProperties(fnaUpdateRequest, fna,"fnaBizId");
-
-        if (StringUtils.isNotBlank(fnaUpdateRequest.getCustomerBizId())) {
-            Customer customer = customerService.getByCustomerBizId(fnaUpdateRequest.getCustomerBizId());
-            fna.setCustomerName(customer.getName());
-        }
+        String appointmentNo = null;
         if (StringUtils.isNotBlank(fnaUpdateRequest.getAppointmentBizId())) {
             Result<ApiAppointmentInfoDto> apiAppointmentInfoDtoResult = appointmentService.mainDetail(fnaUpdateRequest.getAppointmentBizId());
             if (apiAppointmentInfoDtoResult.getData() != null) {
                 ApiAppointmentInfoDto apiAppointmentInfoDto = apiAppointmentInfoDtoResult.getData();
-                fna.setAppointmentNo(apiAppointmentInfoDto.getAppointmentNo());
+                appointmentNo = apiAppointmentInfoDto.getAppointmentNo();
             }
         }
 
-        // 操作数据库
-        boolean result = fnaService.updateById(fna);
-        if (!result) {
-            return Result.fail(ErrorCode.OPERATION_ERROR.getCode(), ErrorCode.OPERATION_ERROR.getMessage());
-        }
-        return Result.success(true);
+        return Result.success(fnaService.updateFna(fnaUpdateRequest, appointmentNo));
     }
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaFormAddRequest.java

@@ -50,19 +50,19 @@ public class FnaFormAddRequest implements Serializable {
     /**
      * 平均月收入
      */
-    @Schema(description = "平均月收入")
+    @Schema(description = "在过去24个月里，你从所有所得的收入来源所得的平均每月收入为?(包括薪金、花红、佣金、其他薪酬红利、银行存款利息、债券利息及股息等")
     private String monthlyIncome;
 
     /**
      * 平均月支出
      */
-    @Schema(description = "平均月支出")
+    @Schema(description = "过去24个月每月里，你每月的平均开支为?")
     private String monthlyExpense;
 
     /**
      * 累积流动资产
      */
-    @Schema(description = "累积流动资产")
+    @Schema(description = "您现时的累积流动资产约有多少?")
     private String liquidAssets;
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/dto/FnaFormUpdateRequest.java

@@ -55,19 +55,19 @@ public class FnaFormUpdateRequest implements Serializable {
     /**
      * 平均月收入
      */
-    @Schema(description = "平均月收入")
+    @Schema(description = "在过去24个月里，你从所有所得的收入来源所得的平均每月收入为?(包括薪金、花红、佣金、其他薪酬红利、银行存款利息、债券利息及股息等。")
     private String monthlyIncome;
 
     /**
      * 平均月支出
      */
-    @Schema(description = "平均月支出")
+    @Schema(description = "过去24个月每月里，你每月的平均开支为?")
     private String monthlyExpense;
 
     /**
      * 累积流动资产
      */
-    @Schema(description = "累积流动资产")
+    @Schema(description = "您现时的累积流动资产约有多少?")
     private String liquidAssets;
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/service/FnaService.java

@@ -6,6 +6,7 @@ import com.yd.csf.service.dto.DeleteFnaRequest;
 import com.yd.csf.service.dto.FnaAddRequest;
 import com.yd.csf.service.dto.FnaQueryRequest;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yd.csf.service.dto.FnaUpdateRequest;
 import com.yd.csf.service.model.Fna;
 import com.yd.csf.service.vo.FnaVO;
 
@@ -51,4 +52,6 @@ public interface FnaService extends IService<Fna> {
     Boolean deleteFna(DeleteFnaRequest deleteRequest);
 
     Fna queryOne(String fnaBizId);
+
+    Boolean updateFna(FnaUpdateRequest fnaUpdateRequest, String appointmentNo);
 }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaServiceImpl.java

@@ -13,13 +13,17 @@ import com.yd.common.enums.CommonEnum;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
+import com.yd.csf.feign.dto.appointment.ApiAppointmentInfoDto;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dao.FnaMapper;
 import com.yd.csf.service.dto.DeleteFnaRequest;
 import com.yd.csf.service.dto.FnaAddRequest;
 import com.yd.csf.service.dto.FnaQueryRequest;
+import com.yd.csf.service.dto.FnaUpdateRequest;
+import com.yd.csf.service.model.Customer;
 import com.yd.csf.service.model.Fna;
 import com.yd.csf.service.model.FnaForm;
+import com.yd.csf.service.service.CustomerService;
 import com.yd.csf.service.service.FnaFormService;
 import com.yd.csf.service.service.FnaService;
 import com.yd.csf.service.vo.FnaVO;
@@ -31,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
@@ -53,6 +58,11 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
     @Autowired
     private FnaFormService fnaFormService;
 
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private AppointmentServiceImpl appointmentService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -72,7 +82,7 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
 
         fna.setCreatorId(userBizId);
         fna.setUpdaterId(userBizId);
-        fna.setStatus("UNCOMPLETED");
+        fna.setStatus("DRAFT");
 
         Date date = new Date();
         fna.setCreateTime(date);
@@ -255,4 +265,36 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
         return this.getOne(new LambdaQueryWrapper<Fna>().eq(Fna::getFnaBizId,fnaBizId));
     }
 
+    @Override
+    public Boolean updateFna(FnaUpdateRequest fnaUpdateRequest, String appointmentNo) {
+        // 判断是否存在
+        String fnaBizId = fnaUpdateRequest.getFnaBizId();
+        Fna fna = this.getByBizId(fnaBizId);
+        if (fna == null) {
+            throw new BusinessException(ErrorCode.NOT_FOUND_ERROR.getCode(), ErrorCode.NOT_FOUND_ERROR.getMessage());
+        }
+
+        BeanUtils.copyProperties(fnaUpdateRequest, fna,"fnaBizId");
+
+        if (StringUtils.isNotBlank(fnaUpdateRequest.getCustomerBizId())) {
+            Customer customer = customerService.getByCustomerBizId(fnaUpdateRequest.getCustomerBizId());
+            fna.setCustomerName(customer.getName());
+        }
+        // 设置 状态
+        String customerBizId = fnaUpdateRequest.getCustomerBizId();
+        String fnaFormBizId = fnaUpdateRequest.getFnaFormBizId();
+
+        if (StringUtils.isNotBlank(customerBizId) || StringUtils.isNotBlank(fnaFormBizId) || StringUtils.isBlank(appointmentNo) ) {
+            fna.setStatus("UNCOMPLETED");
+        }
+
+        if (StringUtils.isNotBlank(customerBizId) && StringUtils.isNotBlank(fnaFormBizId) && StringUtils.isBlank(appointmentNo)) {
+            fna.setStatus("COMPLETED");
+        }
+
+        // 操作数据库
+        fna.setAppointmentNo(appointmentNo);
+        return this.updateById(fna);
+    }
+
 }

yd-csf-service/src/main/java/com/yd/csf/service/vo/FnaFormVO.java

@@ -70,13 +70,13 @@ public class FnaFormVO implements Serializable {
     /**
      * 平均月支出
      */
-    @Schema(description = "过去24个月每月里，你每月的平均开支为")
+    @Schema(description = "过去24个月每月里，你每月的平均开支为?")
     private String monthlyExpense;
 
     /**
      * 累积流动资产
      */
-    @Schema(description = "您现时的累积流动资产约有多少")
+    @Schema(description = "您现时的累积流动资产约有多少?")
     private String liquidAssets;
 
     /**

yd-csf-service/src/main/java/com/yd/csf/service/vo/FnaVO.java

@@ -61,7 +61,7 @@ public class FnaVO implements Serializable {
     /**
      * FNA表单 状态
      */
-    @Schema(description = "FNA表单 状态 'UNCOMPLETED'-未完成, 'COMPLETED'-已完成")
+    @Schema(description = "FNA表单 状态 'DRAFT'-草稿, 'UNCOMPLETED'-未完成, 'COMPLETED'-已完成")
     private String fnaFormStatus;
 
     /**