Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1849,30 +1849,36 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         } else {
             insOrdersVo = selectById(Long.parseLong(ordersNo));
         }
+        HttpResult<List<SysArea>> sysAreasResult;
+        try{
+            sysAreasResult = orgClient.queryAllParent(insOrdersVo.getOwnersInfo().getCountyCode());
+            if(sysAreasResult.getCode() == 200) {
+                List<SysArea> sysAreas = sysAreasResult.getData();
+                insOrdersVo.getOwnersInfo().setProvince(sysAreas.get(3).getAreaCname());
+                insOrdersVo.getOwnersInfo().setCity(sysAreas.get(2).getAreaCname());
+                insOrdersVo.getOwnersInfo().setCounty(sysAreas.get(1).getAreaCname());
+            }
+            HttpResult<List<SysArea>> sysPoliCyAreasResult = orgClient.queryAllParent(insOrdersVo.getPolicyHolderInfo().getCountyCode());
+            if(sysPoliCyAreasResult.getCode() == 200) {
+                List<SysArea> sysAreas = sysAreasResult.getData();
+                insOrdersVo.getPolicyHolderInfo().setProvince(sysAreas.get(3).getAreaCname());
+                insOrdersVo.getPolicyHolderInfo().setCity(sysAreas.get(2).getAreaCname());
+                insOrdersVo.getPolicyHolderInfo().setCounty(sysAreas.get(1).getAreaCname());
+            }
 
-        HttpResult<List<SysArea>> sysAreasResult = orgClient.queryAllParent(insOrdersVo.getOwnersInfo().getCountyCode());
-        if(sysAreasResult.getCode() == 200) {
-            List<SysArea> sysAreas = sysAreasResult.getData();
-            insOrdersVo.getOwnersInfo().setProvince(sysAreas.get(3).getAreaCname());
-            insOrdersVo.getOwnersInfo().setCity(sysAreas.get(2).getAreaCname());
-            insOrdersVo.getOwnersInfo().setCounty(sysAreas.get(1).getAreaCname());
+            HttpResult<List<SysArea>> sysInsuredAreasResult = orgClient.queryAllParent(insOrdersVo.getInsuredPersonInfo().getCountyCode());
+            if(sysInsuredAreasResult.getCode() == 200) {
+                List<SysArea> sysAreas = sysAreasResult.getData();
+                insOrdersVo.getInsuredPersonInfo().setProvince(sysAreas.get(3).getAreaCname());
+                insOrdersVo.getInsuredPersonInfo().setCity(sysAreas.get(2).getAreaCname());
+                insOrdersVo.getInsuredPersonInfo().setCounty(sysAreas.get(1).getAreaCname());
+            }
+        }catch (Exception e){
+            log.info("处理地址异常");
         }
 
-        HttpResult<List<SysArea>> sysPoliCyAreasResult = orgClient.queryAllParent(insOrdersVo.getPolicyHolderInfo().getCountyCode());
-        if(sysPoliCyAreasResult.getCode() == 200) {
-            List<SysArea> sysAreas = sysAreasResult.getData();
-            insOrdersVo.getPolicyHolderInfo().setProvince(sysAreas.get(3).getAreaCname());
-            insOrdersVo.getPolicyHolderInfo().setCity(sysAreas.get(2).getAreaCname());
-            insOrdersVo.getPolicyHolderInfo().setCounty(sysAreas.get(1).getAreaCname());
-        }
 
-        HttpResult<List<SysArea>> sysInsuredAreasResult = orgClient.queryAllParent(insOrdersVo.getInsuredPersonInfo().getCountyCode());
-        if(sysInsuredAreasResult.getCode() == 200) {
-            List<SysArea> sysAreas = sysAreasResult.getData();
-            insOrdersVo.getInsuredPersonInfo().setProvince(sysAreas.get(3).getAreaCname());
-            insOrdersVo.getInsuredPersonInfo().setCity(sysAreas.get(2).getAreaCname());
-            insOrdersVo.getInsuredPersonInfo().setCounty(sysAreas.get(1).getAreaCname());
-        }
+
 
         log.info("根据orderNo=[{}]查询到的订单明细[{}]", ordersNo, JSONUtil.toJsonStr(insOrdersVo));
         AssertionUtils.isFail(Objects.isNull(insOrdersVo), "订单不存在");