Merge branch 'dev-hzfpxf' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java

@@ -82,9 +82,14 @@ public class OrderProcessServiceImpl implements OrderProcessService {
         log.debug("订单查询，当前页：{},页面条数:{}", currPage, pageSize);
         PageHelper.startPage(currPage, pageSize);
         List<OrderProcessInfo> list = orderProcessInfoMapper.queryOrderInfo(paramMap, shList, entList);
-        List<DeptEntity> taxpayerEntityList = userInfoService.getTaxpayerEntityList();
-        Map<String, String> collect = taxpayerEntityList.stream().collect(Collectors.toMap(t -> t.getDeptId(), t -> t.getName()));
-        list.forEach(op -> {
+        Map<String, String> collect = null;
+        try {
+            List<DeptEntity> taxpayerEntityList = userInfoService.getTaxpayerEntityList();
+            collect = taxpayerEntityList.stream().collect(Collectors.toMap(t -> t.getDeptId(), t -> t.getName()));
+        } catch (Exception e) {
+            log.error("订单查询异常{}",e.getMessage());
+        }
+        for (OrderProcessInfo op : list) {
             //如果是红票，将清单标志改为0，（红票没有清单）
             if (OrderInfoEnum.ORDER_BILLING_INVOICE_TYPE_1.getKey().equals(op.getKplx())) {
                 op.setQdbz("0");
@@ -93,8 +98,10 @@ public class OrderProcessServiceImpl implements OrderProcessService {
             if (Objects.isNull(op.getDyztms())) {
                 op.setDyztms("");
             }
-            op.setTaxpayerName(StringUtils.isNotBlank(collect.get(op.getEntId()))?collect.get(op.getEntId()):"");
-        });
+            if(collect != null){
+                op.setTaxpayerName(StringUtils.isNotBlank(collect.get(op.getEntId()))?collect.get(op.getEntId()):"");
+            }
+        }
         PageInfo<OrderProcessInfo> pageInfo = new PageInfo<>(list);
         return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(),
                 pageInfo.getPageNum());