Commit 5ac1a6d0 authored by 周健威's avatar 周健威

修改bug

parent 9aea141a
...@@ -161,15 +161,35 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O ...@@ -161,15 +161,35 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
if(SYS_TRUE == vo.getNeedPersonInsurance() && StrUtil.isNotBlank(vo.getInsureUserIds())){ if(SYS_TRUE == vo.getNeedPersonInsurance() && StrUtil.isNotBlank(vo.getInsureUserIds())){
String buyInsureIdCard = ""; String buyInsureIdCard = "";
String buyInsureName = ""; String buyInsureName = "";
String buyInsurePhone = vo.getAppUserDTO().getUsername();
IdInformation idInformation = thirdFeign.getOneByUserId(vo.getAppUserDTO().getUserid()); IdInformation idInformation = thirdFeign.getOneByUserId(vo.getAppUserDTO().getUserid());
if(null == idInformation) { if(null == idInformation) {
String finalBuyInsurePhone = buyInsurePhone;
List<InsureUser> insureUsers = insureUserBiz.selectList(new InsureUser(){{ List<InsureUser> insureUsers = insureUserBiz.selectList(new InsureUser(){{
setUserid(vo.getAppUserDTO().getUserid()); setUserid(vo.getAppUserDTO().getUserid());
setPhone(vo.getAppUserDTO().getUsername()); setPhone(finalBuyInsurePhone);
setIsdel(SYS_FALSE); setIsdel(SYS_FALSE);
}}); }});
if(CollUtil.isEmpty(insureUsers)) { if(CollUtil.isEmpty(insureUsers)) {
throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("无法获取投保人信息")); List<InsureUser> insureUsers2 = insureUserBiz.selectByWeekend(w -> {
w.andEqualTo(InsureUser::getUserid, vo.getAppUserDTO().getUserid());
w.andEqualTo(InsureUser::getIsdel, SYS_FALSE);
w.andIsNotNull(InsureUser::getPhone);
return w;
});
if(CollUtil.isEmpty(insureUsers2)) {
List<InsureUser> insureUsers3 = insureUserBiz.selectByWeekend(w -> {
w.andEqualTo(InsureUser::getUserid, vo.getAppUserDTO().getUserid());
w.andEqualTo(InsureUser::getIsdel, SYS_FALSE);
return w;
});
buyInsureIdCard = insureUsers3.get(0).getIdCard();
buyInsureName = insureUsers3.get(0).getName();
}else {
buyInsureIdCard = insureUsers2.get(0).getIdCard();
buyInsureName = insureUsers2.get(0).getName();
buyInsurePhone = insureUsers2.get(0).getPhone();
}
}else{ }else{
buyInsureIdCard = insureUsers.get(0).getIdCard(); buyInsureIdCard = insureUsers.get(0).getIdCard();
buyInsureName = insureUsers.get(0).getName(); buyInsureName = insureUsers.get(0).getName();
...@@ -187,10 +207,11 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O ...@@ -187,10 +207,11 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
}else { }else {
String finalBuyInsureIdCard = buyInsureIdCard; String finalBuyInsureIdCard = buyInsureIdCard;
String finalBuyInsureName = buyInsureName; String finalBuyInsureName = buyInsureName;
String finalBuyInsurePhone1 = buyInsurePhone;
bo.getInsurances().add(new OrderPersonInsurance(){{ bo.getInsurances().add(new OrderPersonInsurance(){{
setBuyInsureIdCard(finalBuyInsureIdCard); setBuyInsureIdCard(finalBuyInsureIdCard);
setBuyInsureName(finalBuyInsureName); setBuyInsureName(finalBuyInsureName);
setBuyInsurePhone(vo.getAppUserDTO().getUsername()); setBuyInsurePhone(finalBuyInsurePhone1);
setIdCard(insureUser.getIdCard()); setIdCard(insureUser.getIdCard());
setName(insureUser.getName()); setName(insureUser.getName());
}}); }});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment