Merge remote-tracking branch 'origin/test'

张志伟
2 parents c8a68b33 1245c464
Showing 4 changed files with 46 additions and 29 deletions
fw-valhalla-rpc/src/main/java/cn/fw/valhalla/rpc/angel/InsurerRpcService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/component/InsuranceConsumer.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/LeaveNeedDoServiceImpl.java
pom.xml
@@ -17,8 +17,10 @@ import org.springframework.data.redis.core.BoundValueOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -84,25 +86,37 @@ public class InsurerRpcService {
             if (StringUtils.isValid(cache)) {
                 return JSONObject.parseObject(cache, InsuranceDTO.class);
             }
-            Message<InsuranceOrderDTO> msg = insuranceEstimateApiService.getCusLatest(customerId);
+            Message<List<InsuranceOrderDTO>> msg = insuranceEstimateApiService.getCusLatest(customerId);
+
             log.info("查询正在生效的保险信息:{}", msg.getResult());
-            InsuranceOrderDTO data = msg.getData();
-            if (!msg.isSuccess() || Objects.isNull(data) || Objects.isNull(data.getInsuranceInfo())) {
+            List<InsuranceOrderDTO> data = msg.getData();
+            if (!msg.isSuccess() || CollectionUtils.isEmpty(data)) {
                 return null;
             }
-            Date tciEndTime = data.getInsuranceInfo().getTciEndTime();
-            Date vciEndTime = data.getInsuranceInfo().getVciEndTime();
+            Date tciEndTime = null;
+            Date vciEndTime = null;
+            Date tciStartTime = null;
+            Date vciStartTime = null;
+            for (InsuranceOrderDTO insuranceOrderDTO : data) {
+                if (1 == insuranceOrderDTO.getInsuranceInfo().getInsuranceType()) {
+                    tciEndTime = insuranceOrderDTO.getInsuranceInfo().getEndTime();
+                    tciStartTime = insuranceOrderDTO.getInsuranceInfo().getStartTime();
+                } else if (2 == insuranceOrderDTO.getInsuranceInfo().getInsuranceType()) {
+                    vciEndTime = insuranceOrderDTO.getInsuranceInfo().getEndTime();
+                    vciStartTime = insuranceOrderDTO.getInsuranceInfo().getStartTime();
+                }
+            }
             final Date now = new Date();
             boolean before1 = !Objects.isNull(tciEndTime) && now.before(tciEndTime);
-            boolean before2 = !Objects.isNull(tciEndTime) && now.before(vciEndTime);
+            boolean before2 = !Objects.isNull(vciEndTime) && now.before(vciEndTime);
             if (before1 || before2) {
                 InsuranceDTO dto = new InsuranceDTO();
                 BeanUtils.copyProperties(data, dto);
-                dto.setEffectDate(data.getInsuranceInfo().getVciStartTime());
-                dto.setExpiryDate(data.getInsuranceInfo().getVciEndTime());
-                dto.setTciEffectDate(data.getInsuranceInfo().getTciStartTime());
-                dto.setTciExpiryDate(data.getInsuranceInfo().getTciEndTime());
+                dto.setEffectDate(vciStartTime);
+                dto.setExpiryDate(vciEndTime);
+                dto.setTciEffectDate(tciStartTime);
+                dto.setTciExpiryDate(tciEndTime);
                 setToCache(key, JSONObject.toJSONString(dto), 30);
                 return dto;
             }
@@ -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&lt;InsuOrderMqDTO&gt; {
         }
         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);
     }
 }
@@ -12,6 +12,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import java.util.Date;
 import java.util.List;
 /**
@@ -42,6 +43,7 @@ public class LeaveNeedDoServiceImpl extends ServiceImpl&lt;LeaveNeedDoMapper, Leave
     public void dealById(@NonNull Long id) {
         update(Wrappers.<LeaveNeedDo>lambdaUpdate()
                 .set(LeaveNeedDo::getDone, Boolean.TRUE)
+                .set(LeaveNeedDo::getUpdateTime, new Date())
                 .eq(LeaveNeedDo::getId, id)
         );
     }
@@ -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>