valhalla / fw-valhalla

Commit 754746055d6a25e1548ab10bebbb0491e862f722

Authored by 张志伟
2 parents 467a4d8a d70c5e5d

Merge remote-tracking branch 'origin/dev' into test

Inline Side-by-side
Showing 2 changed files with 6 additions and 2 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/OriginalDataBizService.java
  View file @7547460
... ... @@ -16,6 +16,7 @@ import org.springframework.context.ApplicationEventPublisher;
16 16 import org.springframework.stereotype.Service;
17 17 import org.springframework.transaction.annotation.Transactional;
18 18  
  19 +import java.sql.Timestamp;
19 20 import java.util.Date;
20 21 import java.util.Objects;
21 22  
... ... @@ -62,7 +63,10 @@ public class OriginalDataBizService {
62 63 }
63 64 BeanUtils.copyProperties(dataDTO, originalData);
64 65 if (DataTypeEnum.BI.equals(dataDTO.getType())) {
65   - originalData.setGenerateTime(DateUtil.getExpiredYear(dataDTO.getGenerateTime(), 1));
  66 + Timestamp insExpireTime = DateUtil.getExpiredYear(dataDTO.getGenerateTime(), 1);
  67 + customer.setInsuranceExpires(insExpireTime);
  68 + customerService.updateById(customer);
  69 + originalData.setGenerateTime(insExpireTime);
66 70 }
67 71 originalData.setSolved(Boolean.FALSE);
68 72 originalData.setCreateTime(new Date());
... ...
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
  View file @7547460
... ... @@ -319,7 +319,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
319 319 pool.setOriginalShopName(shop.getShopName());
320 320 }
321 321 pool.setOriginalShopId(customer.getShopId());
322   - List<PostUserDTO> userByRole = userService.getUserByRole(originalData.getShopId(), RoleCode.XBGJ);
  322 + List<PostUserDTO> userByRole = userService.getUserByRole(customer.getShopId(), RoleCode.XBGJ);
323 323 BV.isFalse(CollectionUtils.isEmpty(userByRole), () -> "该门店没有续保跟进人员");
324 324 Collections.shuffle(userByRole);
325 325 PostUserDTO userDTO = userByRole.get(0);
... ...