修改区域获取

src/main/java/com/ydtech/modules/order/service/impl/YongchengOrderApiServiceImpl.java

@@ -1384,10 +1384,26 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
 
         //车主地区信息
         PersonAreaVo ownerPersonAreaVo = sysAreaService.queryByAddress(owner.getAddr(), owner.getIdentifyNumber());
-        //投保人地区信息
-        PersonAreaVo insuredPersonAreaVo = sysAreaService.queryByAddress(insured.getAddr(), insured.getIdentifyNumber());
-        //被保人地区信息
-        PersonAreaVo applicantPersonAreaVo = sysAreaService.queryByAddress(applicant.getAddr(), applicant.getIdentifyNumber());
+        PersonAreaVo insuredPersonAreaVo;
+        PersonAreaVo applicantPersonAreaVo;
+
+        //车主是否与投保人相同
+        if(owner.getIdentifyNumber().equals(insured.getIdentifyNumber())){
+            insuredPersonAreaVo = ownerPersonAreaVo;
+        }else{
+            //投保人地区信息
+            insuredPersonAreaVo = sysAreaService.queryByAddress(insured.getAddr(), insured.getIdentifyNumber());
+        }
+
+        //车主是否与被保人相同
+        if(owner.getIdentifyNumber().equals(applicant.getIdentifyNumber())) {
+            applicantPersonAreaVo = ownerPersonAreaVo;
+        }else  //投保人是否与被保人相同
+        if(insured.getIdentifyNumber().equals(applicant.getIdentifyNumber())) {
+            applicantPersonAreaVo = insuredPersonAreaVo;
+        }else{
+            applicantPersonAreaVo = sysAreaService.queryByAddress(applicant.getAddr(), applicant.getIdentifyNumber());
+        }
 
         if (!Objects.isNull(ownerPersonAreaVo)) {
             ownerProvinceData.add(ownerPersonAreaVo.getCountyCode().toString());