From 30f8f45deb4c93ab57febf310d77a80fc58d5463 Mon Sep 17 00:00:00 2001
From: Kurisu <makise_kurisuu@outlook.jp>
Date: Tue, 19 Oct 2021 16:45:24 +0800
Subject: [PATCH] :alien: 对接保险新的sdk

---
 fw-valhalla-service/src/main/java/cn/fw/valhalla/component/InsuranceConsumer.java | 37 +++++++++++++++++++------------------
 pom.xml                                                                           |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/component/InsuranceConsumer.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/component/InsuranceConsumer.java
index a5c7676..cd56478 100644
--- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/component/InsuranceConsumer.java
+++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/component/InsuranceConsumer.java
@@ -2,7 +2,6 @@ package cn.fw.valhalla.component;
 
 import cn.fw.angel.sdk.result.InsuOrderMqDTO;
 import cn.fw.valhalla.common.utils.DateUtil;
-import cn.fw.valhalla.common.utils.StringUtils;
 import cn.fw.valhalla.domain.db.OriginalData;
 import cn.fw.valhalla.domain.db.customer.Customer;
 import cn.fw.valhalla.sdk.enums.DataTypeEnum;
@@ -62,25 +61,27 @@ public class InsuranceConsumer implements RocketMQListener<InsuOrderMqDTO> {
         }
         originalData = new OriginalData();
 
+        if (1 == t.getInsuranceType() || 2 == t.getInsuranceType()) {
+            Date startTime = t.getStartTime();
+            String detaId = t.getOrderNo();
 
-        Date startTime = Objects.isNull(t.getTciStartTime()) ? t.getVciStartTime() : t.getTciStartTime();
-        String detaId = StringUtils.isEmpty(t.getTciOrderNo()) ? t.getVciOrderNo() : t.getTciOrderNo();
+            Timestamp insExpireTime = DateUtil.getExpiredYear(startTime, 1);
+            customer.setInsuranceExpires(insExpireTime);
+            customerService.updateById(customer);
 
-        Timestamp insExpireTime = DateUtil.getExpiredYear(startTime, 1);
-        customer.setInsuranceExpires(insExpireTime);
-        customerService.updateById(customer);
+            originalData.setType(DataTypeEnum.BI);
+            originalData.setCustomerId(customer.getId());
+            originalData.setPlateNo(customer.getPlateNo());
+            originalData.setUserId(t.getUploaderId());
+            originalData.setGenerateTime(insExpireTime);
+            originalData.setDetailId(detaId);
+            originalData.setSolved(Boolean.FALSE);
+            originalData.setShopId(t.getShopId());
+            originalData.setGroupId(t.getGroupId());
+            originalData.setCreateTime(new Date());
+            originalData.setUpdateTime(new Date());
+            originalDataService.save(originalData);
+        }
 
-        originalData.setType(DataTypeEnum.BI);
-        originalData.setCustomerId(customer.getId());
-        originalData.setPlateNo(customer.getPlateNo());
-        originalData.setUserId(t.getUploaderId());
-        originalData.setGenerateTime(insExpireTime);
-        originalData.setDetailId(detaId);
-        originalData.setSolved(Boolean.FALSE);
-        originalData.setShopId(t.getShopId());
-        originalData.setGroupId(t.getGroupId());
-        originalData.setCreateTime(new Date());
-        originalData.setUpdateTime(new Date());
-        originalDataService.save(originalData);
     }
 }
diff --git a/pom.xml b/pom.xml
index 2d73c73..b4cc041 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
         <fw-qywx-sdk.version>1.0</fw-qywx-sdk.version>
         <fw-flow-sdk.version>1.0.0</fw-flow-sdk.version>
         <fw-order-sdk.version>2.0.0</fw-order-sdk.version>
-        <fw-angel-sdk.version>1.0</fw-angel-sdk.version>
+        <fw-angel-sdk.version>3.0.0</fw-angel-sdk.version>
         <redis.spring.boot.starter>1.0</redis.spring.boot.starter>
         <javase>3.0.0</javase>
         <caffeine>2.5.3</caffeine>
--
libgit2 0.22.2