From acd95dc9887af3a063daa7459bf63c05ac510ff0 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 3 May 2023 16:06:42 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=8F=91=E7=A5=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/order/model/OrderProcessInfo.java | 4 ++++ .../order/service/impl/OrderProcessServiceImpl.java | 8 ++++++++ .../openapi/service/impl/SDEnregyServiceImpl.java | 4 ++-- .../module/invoice/model/vo/OrderInvoiceDetailVO.java | 2 +- .../invoice/service/impl/OrderInvoiceInfoServiceImpl.java | 7 +++++++ 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java index d3c604b2..98470115 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderProcessInfo.java @@ -246,5 +246,9 @@ public class OrderProcessInfo implements Serializable { * yhbh 用户编号 */ private String yhbh; + /** + * 所属组织 + */ + private String taxpayerName; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java index fedc9aff..8f8d297b 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java @@ -3,6 +3,8 @@ package com.dxhy.order.consumer.modules.order.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; +import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoEnum; import com.dxhy.order.model.OrderInvoiceInfo; @@ -27,6 +29,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; /** * 订单处理业务实现 @@ -46,6 +49,8 @@ public class OrderProcessServiceImpl implements OrderProcessService { @Resource private OrderInvoiceInfoService orderInvoiceInfoService; + @Resource + private UserInfoService userInfoService; @Override public OrderProcessInfo selectOrderProcessInfoByProcessId(String id, List shList) { @@ -70,6 +75,8 @@ public class OrderProcessServiceImpl implements OrderProcessService { log.debug("订单查询，当前页：{},页面条数:{}", currPage, pageSize); PageHelper.startPage(currPage, pageSize); List list = orderProcessInfoMapper.queryOrderInfo(paramMap, shList, entList); + List taxpayerEntityList = userInfoService.getTaxpayerEntityList(); + Map collect = taxpayerEntityList.stream().collect(Collectors.toMap(t -> t.getDeptId(), t -> t.getName())); list.forEach(op -> { //如果是红票，将清单标志改为0，（红票没有清单） if (OrderInfoEnum.ORDER_BILLING_INVOICE_TYPE_1.getKey().equals(op.getKplx())) { @@ -79,6 +86,7 @@ public class OrderProcessServiceImpl implements OrderProcessService { if (Objects.isNull(op.getDyztms())) { op.setDyztms(""); } + op.setTaxpayerName(StringUtils.isNotBlank(collect.get(op.getEntId()))?collect.get(op.getEntId()):""); }); PageInfo pageInfo = new PageInfo<>(list); return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index 0eb2e696..02f38ff0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -537,11 +537,11 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { String resp = response.body(); log.info("[MDM主动同步物料]响应结果：{}", resp); if(StringUtils.isBlank(resp)){ - return R.error("获取物料信息失败，请检查客户编码是否正确"); + return R.error("获取物料信息失败，请检查物料编码是否正确"); } SDEnergyMdmBaseBO baseBO = JSONObject.parseObject(resp, SDEnergyMdmBaseBO.class); if(baseBO == null || baseBO.getESB() == null|| baseBO.getESB().getDATA()==null){ - return R.error("获取物料信息失败，请检查客户编码是否正确"); + return R.error("获取物料信息失败，请检查物料编码是否正确"); } List mdmGmfxxtbReqBOS = (List) Optional.of(baseBO) .map(SDEnergyMdmBaseBO::getESB) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/vo/OrderInvoiceDetailVO.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/vo/OrderInvoiceDetailVO.java index a96fbe98..d3228130 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/vo/OrderInvoiceDetailVO.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/model/vo/OrderInvoiceDetailVO.java @@ -90,7 +90,7 @@ public class OrderInvoiceDetailVO implements Serializable { */ private String sksbdm; private String entId; - + private String taxpayerName; /** * 报账单号 diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java index f6f32a01..81e2abab 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java @@ -17,6 +17,8 @@ import com.dxhy.order.baseservice.module.thirdservice.rabbitmq.service.RabbitMqS import com.dxhy.order.baseservice.module.thirdservice.redis.service.RedisService; import com.dxhy.order.baseservice.module.thirdservice.simsback.model.PushPauseInvoice; import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; +import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity; +import com.dxhy.order.baseservice.module.thirdservice.user.service.UserInfoService; import com.dxhy.order.constant.*; import com.dxhy.order.invoice.config.InvoiceConfig; import com.dxhy.order.invoice.module.invoice.dao.*; @@ -120,6 +122,8 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { @Resource private InvoiceKpdInfoService invoiceKpdInfoService; + @Resource + private UserInfoService userInfoService; @Autowired @Qualifier("asyncExecutor") private Executor voucherTaskExecutor; @@ -238,8 +242,11 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { PageInfo orderInvoiceDetailPageInfo = new PageInfo<>(list); //添加发票查询-特殊票种值（0：其他；1：成品油发票；2：收购发票；3：机动车专票；） List orderInvoiceDetailVOList = new ArrayList<>(list.size()); + List taxpayerEntityList = userInfoService.getTaxpayerEntityList(); + Map collect = taxpayerEntityList.stream().collect(Collectors.toMap(t -> t.getDeptId(), t -> t.getName())); list.forEach(orderInvoiceDetail -> { OrderInvoiceDetailVO orderInvoiceDetailVO = convertOrderInvoiceDetailVO(orderInvoiceDetail); + orderInvoiceDetailVO.setTaxpayerName(StringUtils.isNotBlank(collect.get(orderInvoiceDetail.getEntId()))?collect.get(orderInvoiceDetail.getEntId()):""); orderInvoiceDetailVOList.add(orderInvoiceDetailVO); }); return new PageUtils(orderInvoiceDetailVOList, (int) orderInvoiceDetailPageInfo.getTotal(),