feature(*): 原始数据处理逻辑调整

- 原始数据处理逻辑调整

feature(*): 原始数据处理逻辑调整
- 原始数据处理逻辑调整
张志伟
1 parent 80a5bb97
Showing 4 changed files with 30 additions and 11 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/OriginalDataDTO.java
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/FollowOriginalParam.java
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/FollowApiServiceImpl.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/OriginalDataBizService.java
@@ -26,7 +26,7 @@ public class OriginalDataDTO {
      */
     private String detailId;
     /**
-     * 数据产生时间
+     * 数据产生时间 [保险类型是为保险到期时间]
      */
     private Date generateTime;
     private Long shopId;
@@ -25,7 +25,6 @@ public class FollowOriginalParam {
     /**
      * 档案id
      */
-    @NotNull(message = "保有客档案id不能为空")
     private Long customerId;
     /**
      * 车架号
@@ -37,6 +36,7 @@ public class FollowOriginalParam {
     private String plateNo;
     /**
      * 数据产生时间
+     * [保险类型是为保险到期时间]
      */
     @NotNull(message = "产生时间不能为空")
     private Date generateTime;
@@ -2,6 +2,7 @@ package cn.fw.valhalla.controller.api;
  
 import cn.fw.common.web.annotation.ControllerMethod;
 import cn.fw.data.base.domain.common.Message;
+import cn.fw.valhalla.common.utils.StringUtils;
 import cn.fw.valhalla.domain.dto.OriginalDataDTO;
 import cn.fw.valhalla.sdk.api.FollowApiService;
 import cn.fw.valhalla.sdk.enums.DataTypeEnum;
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
  
 import javax.validation.Valid;
+import java.util.Objects;
  
 import static cn.fw.common.businessvalidator.Validator.BV;
 import static cn.fw.common.web.util.ResultBuilder.success;
@@ -39,6 +41,10 @@ public class FollowApiServiceImpl implements FollowApiService {
     @PostMapping("/origin/save")
     @ControllerMethod("业务元数据保存")
     public Message<Void> saveOriginal(@Valid @RequestBody FollowOriginalParam originalParam) {
+        String frameNo = originalParam.getFrameNo();
+        Long customerId = originalParam.getCustomerId();
+        boolean bool = Objects.nonNull(customerId) || StringUtils.isValid(frameNo);
+        BV.isTrue(bool, () -> "档案id或者车架号不能为空");
         OriginalDataDTO dataDTO = new OriginalDataDTO();
         BeanUtils.copyProperties(originalParam, dataDTO);
         originalDataBizService.saveOrigin(dataDTO);
@@ -50,6 +50,13 @@ public class OriginalDataBizService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void saveOrigin(OriginalDataDTO dataDTO) {
+        String frameNo = dataDTO.getFrameNo();
+        Long customerId = dataDTO.getCustomerId();
+        String plateNo = dataDTO.getPlateNo();
+
+        if (StringUtils.isEmpty(frameNo) && Objects.isNull(customerId)) {
+            return;
+        }
         OriginalData originalData = originalDataService.getOne(Wrappers.<OriginalData>lambdaQuery()
                 .eq(OriginalData::getType, dataDTO.getType())
                 .eq(OriginalData::getDetailId, dataDTO.getDetailId())
@@ -58,22 +65,28 @@ public class OriginalDataBizService {
             return;
         }
         originalData = new OriginalData();
-        Customer customer = customerService.queryById(dataDTO.getCustomerId());
-        if (Objects.isNull(customer)) {
-            return;
+        Customer customer;
+        if (StringUtils.isValid(frameNo)) {
+            customer = customerService.queryByFrameNo(frameNo, originalData.getGroupId());
+        } else {
+            customer = customerService.queryById(customerId);
         }
         BeanUtils.copyProperties(dataDTO, originalData);
+
         if (DataTypeEnum.BI.equals(dataDTO.getType())) {
             LocalDate dateTime = DateUtil.date2LocalDate(dataDTO.getGenerateTime());
-            assert dateTime != null;
-            Date insuranceExpires = DateUtil.localDateTime2Date(dateTime.plusYears(1L).atStartOfDay());
-            customer.setInsuranceExpires(insuranceExpires);
-            customerService.updateById(customer);
+            Date insuranceExpires = DateUtil.localDateTime2Date(dateTime.atStartOfDay());
+            originalData.setGenerateTime(insuranceExpires);
+            if (Objects.nonNull(customer)) {
+                customer.setInsuranceExpires(insuranceExpires);
+                customerService.updateById(customer);
+            }
         }
-        if (StringUtils.isEmpty(originalData.getFrameNo())) {
+
+        if (StringUtils.isEmpty(frameNo) && Objects.nonNull(customer)) {
             originalData.setFrameNo(customer.getFrameNo());
         }
-        if (StringUtils.isEmpty(originalData.getPlateNo())) {
+        if (StringUtils.isEmpty(plateNo) && Objects.nonNull(customer)) {
             originalData.setPlateNo(customer.getPlateNo());
         }
         originalData.setSolved(Boolean.FALSE);