Commit 30f8f45deb4c93ab57febf310d77a80fc58d5463

Authored by 张志伟
1 parent fa72c708

:alien: 对接保险新的sdk

fw-valhalla-service/src/main/java/cn/fw/valhalla/component/InsuranceConsumer.java
@@ -2,7 +2,6 @@ package cn.fw.valhalla.component; @@ -2,7 +2,6 @@ package cn.fw.valhalla.component;
2 2
3 import cn.fw.angel.sdk.result.InsuOrderMqDTO; 3 import cn.fw.angel.sdk.result.InsuOrderMqDTO;
4 import cn.fw.valhalla.common.utils.DateUtil; 4 import cn.fw.valhalla.common.utils.DateUtil;
5 -import cn.fw.valhalla.common.utils.StringUtils;  
6 import cn.fw.valhalla.domain.db.OriginalData; 5 import cn.fw.valhalla.domain.db.OriginalData;
7 import cn.fw.valhalla.domain.db.customer.Customer; 6 import cn.fw.valhalla.domain.db.customer.Customer;
8 import cn.fw.valhalla.sdk.enums.DataTypeEnum; 7 import cn.fw.valhalla.sdk.enums.DataTypeEnum;
@@ -62,25 +61,27 @@ public class InsuranceConsumer implements RocketMQListener<InsuOrderMqDTO> { @@ -62,25 +61,27 @@ public class InsuranceConsumer implements RocketMQListener<InsuOrderMqDTO> {
62 } 61 }
63 originalData = new OriginalData(); 62 originalData = new OriginalData();
64 63
  64 + if (1 == t.getInsuranceType() || 2 == t.getInsuranceType()) {
  65 + Date startTime = t.getStartTime();
  66 + String detaId = t.getOrderNo();
65 67
66 - Date startTime = Objects.isNull(t.getTciStartTime()) ? t.getVciStartTime() : t.getTciStartTime();  
67 - String detaId = StringUtils.isEmpty(t.getTciOrderNo()) ? t.getVciOrderNo() : t.getTciOrderNo(); 68 + Timestamp insExpireTime = DateUtil.getExpiredYear(startTime, 1);
  69 + customer.setInsuranceExpires(insExpireTime);
  70 + customerService.updateById(customer);
68 71
69 - Timestamp insExpireTime = DateUtil.getExpiredYear(startTime, 1);  
70 - customer.setInsuranceExpires(insExpireTime);  
71 - customerService.updateById(customer); 72 + originalData.setType(DataTypeEnum.BI);
  73 + originalData.setCustomerId(customer.getId());
  74 + originalData.setPlateNo(customer.getPlateNo());
  75 + originalData.setUserId(t.getUploaderId());
  76 + originalData.setGenerateTime(insExpireTime);
  77 + originalData.setDetailId(detaId);
  78 + originalData.setSolved(Boolean.FALSE);
  79 + originalData.setShopId(t.getShopId());
  80 + originalData.setGroupId(t.getGroupId());
  81 + originalData.setCreateTime(new Date());
  82 + originalData.setUpdateTime(new Date());
  83 + originalDataService.save(originalData);
  84 + }
72 85
73 - originalData.setType(DataTypeEnum.BI);  
74 - originalData.setCustomerId(customer.getId());  
75 - originalData.setPlateNo(customer.getPlateNo());  
76 - originalData.setUserId(t.getUploaderId());  
77 - originalData.setGenerateTime(insExpireTime);  
78 - originalData.setDetailId(detaId);  
79 - originalData.setSolved(Boolean.FALSE);  
80 - originalData.setShopId(t.getShopId());  
81 - originalData.setGroupId(t.getGroupId());  
82 - originalData.setCreateTime(new Date());  
83 - originalData.setUpdateTime(new Date());  
84 - originalDataService.save(originalData);  
85 } 86 }
86 } 87 }
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 <fw-qywx-sdk.version>1.0</fw-qywx-sdk.version> 48 <fw-qywx-sdk.version>1.0</fw-qywx-sdk.version>
49 <fw-flow-sdk.version>1.0.0</fw-flow-sdk.version> 49 <fw-flow-sdk.version>1.0.0</fw-flow-sdk.version>
50 <fw-order-sdk.version>2.0.0</fw-order-sdk.version> 50 <fw-order-sdk.version>2.0.0</fw-order-sdk.version>
51 - <fw-angel-sdk.version>1.0</fw-angel-sdk.version> 51 + <fw-angel-sdk.version>3.0.0</fw-angel-sdk.version>
52 <redis.spring.boot.starter>1.0</redis.spring.boot.starter> 52 <redis.spring.boot.starter>1.0</redis.spring.boot.starter>
53 <javase>3.0.0</javase> 53 <javase>3.0.0</javase>
54 <caffeine>2.5.3</caffeine> 54 <caffeine>2.5.3</caffeine>