valhalla / fw-valhalla

Commit 2fe30da15e01af637d5855922c8047fabb0fb85f

Authored by 夏天
1 parent e9b3cf04

fix-bug

Inline Side-by-side
Showing 1 changed file with 11 additions and 22 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
  View file @2fe30da
@@ -7,40 +7,25 @@ import cn.fw.common.web.auth.LoginAuthBean; @@ -7,40 +7,25 @@ import cn.fw.common.web.auth.LoginAuthBean;
7 import cn.fw.valhalla.common.constant.RoleCode; 7 import cn.fw.valhalla.common.constant.RoleCode;
8 import cn.fw.valhalla.common.utils.BeanUtils; 8 import cn.fw.valhalla.common.utils.BeanUtils;
9 import cn.fw.valhalla.common.utils.DateUtil; 9 import cn.fw.valhalla.common.utils.DateUtil;
10 -import cn.fw.valhalla.domain.db.CompanyWechatJoin;  
11 -import cn.fw.valhalla.domain.db.MemberVehicle;  
12 -import cn.fw.valhalla.domain.db.WechatSubscribe; 10 +import cn.fw.valhalla.domain.db.*;
13 import cn.fw.valhalla.domain.db.customer.*; 11 import cn.fw.valhalla.domain.db.customer.*;
14 -import cn.fw.valhalla.domain.db.follow.ClueTask;  
15 -import cn.fw.valhalla.domain.db.follow.FollowClue;  
16 -import cn.fw.valhalla.domain.db.follow.FollowRecord;  
17 -import cn.fw.valhalla.domain.db.pool.PublicCluePool;  
18 -import cn.fw.valhalla.domain.db.pool.PublicPool;  
19 -import cn.fw.valhalla.domain.db.pool.StammkundePool; 12 +import cn.fw.valhalla.domain.db.follow.*;
  13 +import cn.fw.valhalla.domain.db.pool.*;
20 import cn.fw.valhalla.domain.dto.CustomerDetailDto; 14 import cn.fw.valhalla.domain.dto.CustomerDetailDto;
21 import cn.fw.valhalla.domain.enums.*; 15 import cn.fw.valhalla.domain.enums.*;
22 -import cn.fw.valhalla.domain.query.CustomCustomerQuery;  
23 -import cn.fw.valhalla.domain.query.CustomerQueryVO;  
24 -import cn.fw.valhalla.domain.query.StammkundeAnalyseQueryVO; 16 +import cn.fw.valhalla.domain.query.*;
25 import cn.fw.valhalla.domain.vo.customer.*; 17 import cn.fw.valhalla.domain.vo.customer.*;
26 import cn.fw.valhalla.domain.vo.setting.SettingVO; 18 import cn.fw.valhalla.domain.vo.setting.SettingVO;
27 import cn.fw.valhalla.rpc.angel.dto.InsuranceDTO; 19 import cn.fw.valhalla.rpc.angel.dto.InsuranceDTO;
28 -import cn.fw.valhalla.rpc.erp.dto.PostUserDTO;  
29 -import cn.fw.valhalla.rpc.erp.dto.UserInfoDTO;  
30 -import cn.fw.valhalla.rpc.erp.dto.UserRoleDataRangeDTO; 20 +import cn.fw.valhalla.rpc.erp.dto.*;
31 import cn.fw.valhalla.rpc.member.MemberRpcService; 21 import cn.fw.valhalla.rpc.member.MemberRpcService;
32 import cn.fw.valhalla.rpc.member.dto.MemberUserDTO; 22 import cn.fw.valhalla.rpc.member.dto.MemberUserDTO;
33 import cn.fw.valhalla.rpc.oop.OopService; 23 import cn.fw.valhalla.rpc.oop.OopService;
34 import cn.fw.valhalla.rpc.oop.dto.ShopDTO; 24 import cn.fw.valhalla.rpc.oop.dto.ShopDTO;
35 import cn.fw.valhalla.rpc.oop.dto.SpecDTO; 25 import cn.fw.valhalla.rpc.oop.dto.SpecDTO;
36 import cn.fw.valhalla.sdk.enums.CusTypeEnum; 26 import cn.fw.valhalla.sdk.enums.CusTypeEnum;
37 -import cn.fw.valhalla.sdk.param.ChangeSpecCodeReq;  
38 -import cn.fw.valhalla.sdk.param.CustomerParams;  
39 -import cn.fw.valhalla.sdk.param.CustomerQueryReq;  
40 -import cn.fw.valhalla.sdk.result.BasicsCustomerDTO;  
41 -import cn.fw.valhalla.sdk.result.CustomerInfoDto;  
42 -import cn.fw.valhalla.sdk.result.MemberVehicleDTO;  
43 -import cn.fw.valhalla.sdk.result.ReceptionResultDto; 27 +import cn.fw.valhalla.sdk.param.*;
  28 +import cn.fw.valhalla.sdk.result.*;
44 import cn.fw.valhalla.service.bus.StammkundeBizService; 29 import cn.fw.valhalla.service.bus.StammkundeBizService;
45 import cn.fw.valhalla.service.bus.setting.SettingBizService; 30 import cn.fw.valhalla.service.bus.setting.SettingBizService;
46 import cn.fw.valhalla.service.data.*; 31 import cn.fw.valhalla.service.data.*;
@@ -716,6 +701,10 @@ public class CustomerBizService extends AbstractCustomerService { @@ -716,6 +701,10 @@ public class CustomerBizService extends AbstractCustomerService {
716 dto.setAdviserId(null); 701 dto.setAdviserId(null);
717 dto.setAdviserName(null); 702 dto.setAdviserName(null);
718 } 703 }
  704 + if (Objects.nonNull(customer) && Objects.isNull(customer.getRegDate())) {
  705 + MemberVehicle memberVehicle = memberVehicleService.getVehicle(frameNo);
  706 + customer.setRegDate(Objects.nonNull(memberVehicle) ? memberVehicle.getRegDate() : null);
  707 + }
719 return dto; 708 return dto;
720 } 709 }
721 710