From 2a8f951cbd9b17a4dfd55033e4b21f1026f8d3d5 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 28 Jul 2023 11:03:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feature=EF=BC=9A=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7=E8=87=AA=E5=8A=A8=E6=8E=A8=E9=80=81?= =?UTF-8?q?SAP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderInfoController.java | 7 +++++-- .../modules/order/service/OrderInfoService.java | 2 +- .../order/service/impl/OrderInfoServiceImpl.java | 15 +++++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index ee5d09f0..2d1f59fd 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -165,12 +165,15 @@ public class OrderInfoController { @PostMapping("/updateBillNumber") @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号") @SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理") - public R updateBillNumber(@RequestParam("bzdh") String bzdh, @RequestParam("orderInfoId") String orderInfoId) { + public R updateBillNumber(@RequestParam("bzdh") String bzdh, + @RequestParam("orderInfoId") String orderInfoId, + @RequestParam("fpqqlsh")String fpqqlsh, + @RequestParam("xhfNsrsbh")String xhfNsrsbh) { if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){ return R.error("请求参数有误"); } try { - int i = orderInfoService.updateBillNumber(bzdh, orderInfoId); + int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh); if(i > 0){ return R.ok(); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java index c366bf0b..35a61a6c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java @@ -222,7 +222,7 @@ public interface OrderInfoService { R ratioConversion(List orderInfoIds,String ratio,String xhfNsrsbh,String originUnit,String newUnit); - int updateBillNumber(String bzdh,String orderInfoId); + int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh); @Transactional R logicalDeleteByOrderInfoId(List pageRequestList); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 46adad4d..5ff39aaa 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -31,6 +31,7 @@ import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.model.OderDetailInfo; import com.dxhy.order.consumer.model.PageOrderExt; import com.dxhy.order.consumer.model.page.PageRequestVO; +import com.dxhy.order.consumer.modules.manager.service.InvoiceDataService; import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem; import com.dxhy.order.consumer.modules.order.model.PageKySlReq; import com.dxhy.order.consumer.modules.order.model.PageKySlRsp; @@ -188,6 +189,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Resource private OrderMergeService orderMergeService; + @Resource + private InvoiceDataService invoiceDataService; + DecimalFormat format = new DecimalFormat("#.###"); @Override @@ -1743,11 +1747,18 @@ public class OrderInfoServiceImpl implements OrderInfoService { } @Override - public int updateBillNumber(String bzdh,String orderInfoId){ + public int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh){ OrderProcessInfo orderProcessInfo = new OrderProcessInfo(); orderProcessInfo.setBzdh(bzdh); orderProcessInfo.setOrderInfoId(orderInfoId); - return orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo,null); + int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null); + if(i > 0) { + Map map = new HashMap(); + map.put("ddqqlsh",""); + map.put("xhfNsrsbh",""); + invoiceDataService.manualPushInvoice(Arrays.asList(map)); + } + return i; } @Override From 13eeec0920c72638d2bf28b984dbd88f64e9d6b0 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 28 Jul 2023 11:20:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feature=EF=BC=9A=E5=8F=91=E7=A5=A8=E5=9B=9E?= =?UTF-8?q?=E6=8E=A8bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 4 ++-- .../service/impl/PushTicketPoolServiceImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index d0e20937..c64a3631 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -230,7 +230,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { //推送票池 try { - if (StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFpdm()) && StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFphm())) { + if (StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFphm())) { pushTicketPoolService.pushTicketPool(commonTsMqData.getFpTsMqData().getFpdm(), commonTsMqData.getFpTsMqData().getFphm(), commonTsMqData.getNsrsbh()); } @@ -251,7 +251,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } //推送票池 try { - if (StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFpdm()) && StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFphm())) { + if (StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFphm())) { pushTicketPoolService.pushTicketPool(commonTsMqData.getZfTsMqData().getFpdm(), commonTsMqData.getZfTsMqData().getFphm(), commonTsMqData.getNsrsbh()); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java index d1262ac0..b2dbd139 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/ticketpool/service/impl/PushTicketPoolServiceImpl.java @@ -85,10 +85,10 @@ public class PushTicketPoolServiceImpl implements PushTicketPoolService { OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo)); - if (ObjectUtil.isEmpty(orderInvoiceInfo) || !OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) { - log.warn("{}发票数据不存在,或者发票状态不是开票中,数据不进行推送", LOGGER_MSG); - return R.ok(); - } +// if (ObjectUtil.isEmpty(orderInvoiceInfo) || !OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) { +// log.warn("{}发票数据不存在,或者发票状态不是开票中,数据不进行推送", LOGGER_MSG); +// return R.ok(); +// } if (ConfigureConstant.STRING_Y.equals(openApiConfig.configPushTicketPoolStatus())) { From fe06981c635f066e7a2ef9197648005e74aba8fe Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 1 Aug 2023 10:42:55 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD=E6=98=93?= =?UTF-8?q?=E8=A1=8C=E8=B4=9F=E6=95=B0=E5=8F=91=E7=A5=A8=E5=9B=9E=E6=8E=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index c64a3631..d2e46303 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1495,7 +1495,13 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { log.info("{}推送接口orderProcessInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo)); if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){ List orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList); - int count = (int)orderProcessInfos.stream().filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt())).count(); + int count = (int)orderProcessInfos.stream().filter(t ->{ + if(new BigDecimal(orderProcessInfo.getKphjje()).compareTo(BigDecimal.ZERO) > 0){ + return OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()); + }else{ + return OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt()); + } + }).count(); if(orderProcessInfos.size() != count){ return null; } From 715853b5091a023b236a9b3ba8258eb966032d7b Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 2 Aug 2023 13:42:10 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD=E6=98=93?= =?UTF-8?q?=E8=A1=8C=E5=9B=9E=E6=8E=A8=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=8F=B7=E7=A0=81=E3=80=81=E4=BB=A3=E7=A0=81=E3=80=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 10 +++++++++- .../dxhy/order/consumer/utils/BeanTransitionUtils.java | 9 --------- .../order/consumer/utils/BeanTransitionV5Utils.java | 4 ++-- .../service/impl/OrderInvoiceInfoServiceImpl.java | 1 + 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index d2e46303..203a3267 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1352,7 +1352,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { fpkjtsReqSap.setZHSJEY(ddfpxx.getJSHJ()); fpkjtsReqSap.setZHSJE(ddfpxx.getJSHJ()); fpkjtsReqSap.setZZBZ(ddfpxx.getBZ()); - fpkjtsReqSap.setZFPZT(ConfigureConstant.STRING_0);//0-正常、1-作废 + fpkjtsReqSap.setZFPZT(ddfpxx.getZFBZ());//0-正常、1-作废 String formatKprq = ""; try { Date date = (Date) new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ddfpxx.getKPRQ()); @@ -1381,6 +1381,14 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { fpkjtsReqSap.setZYWDJ(ddfpxx.getBillNum()); fpkjtsReqSap.setIMGID(ddfpxx.getDocuId()); fpkjtsReqSap.setZBZDH(ddfpxx.getBillNum()); +// String zfbz = ddfpxx.getZFBZ(); +// String chbz = ddfpxx.getCHBZ(); +// fpkjtsReqSap.setZFPZT(); + if(StringUtils.isNotBlank(ddfpxx.getYFPHM())){ + fpkjtsReqSap.setZYFPDM(ddfpxx.getYFPDM()); + fpkjtsReqSap.setZYFPHM(ddfpxx.getYFPHM()); + fpkjtsReqSap.setZHZXXB(StringUtils.isNotBlank(ddfpxx.getHZXXBBH())?ddfpxx.getHZXXBBH():""); + } if(OrderInfoEnum.SYS_SOURCE_DSXT01.getKey().equals(ddfpxx.getXtly()) || OrderInfoEnum.SYS_SOURCE_DSXT02.getKey().equals(ddfpxx.getXtly())){ fpkjtsReqSap.setPDFZJL(ddfpxx.getPDFZJL()); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 5ffc128f..c0379279 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3694,15 +3694,6 @@ public class BeanTransitionUtils { return ddpcxxReqBO; } - public static void main(String[] args) { - String zje = DecimalCalculateUtil.bigDecimalAdd("2", "1"); - if(DecimalCalculateUtil.stringCompare(zje,"3") != 0){ - System.out.println("00"); - } - System.out.println("988989"); - - } - /** * @Description: 将标准开票响应参数转换成PO接口开票响应参数 * @Param: [ddpcxxRspV5] diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java index 7efe1d05..a6fb6b37 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java @@ -111,9 +111,9 @@ public class BeanTransitionV5Utils { ddfpxxV5.setDDH(orderInfo.getDdh()); ddfpxxV5.setDDSJ(DateUtil.formatDateTime(orderInfo.getDdrq())); //初始化为未作废 - ddfpxxV5.setZFBZ(OrderInfoEnum.INVALID_INVOICE_0.getKey()); + ddfpxxV5.setZFBZ(orderInvoiceInfo.getZfBz()); //初始化为未冲红 - ddfpxxV5.setCHBZ(OrderInfoEnum.INTERFACE_RED_INVOICE_0.getKey()); + ddfpxxV5.setCHBZ(orderInvoiceInfo.getChBz()); // TODO: 2018/9/21 后期考虑添加订单类型和订单状态等数据. if (ObjectUtil.isNotNull(orderInvoiceInfo)) { 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 ffbe8e45..94d06e5f 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 @@ -1097,6 +1097,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { //开票成功后并且是红票需要更新对应蓝票状态,冲红标志和剩余可冲红金额 if (hzfp) { + //全电冲红后修改蓝字的冲红标志 dealRedInvoice(orderInvoiceInfo.getFpqqlsh(), rabbitMqCommonInvoice.getKpzt(), shList); } From 83d25aa3f06293d0c0b4e7d05f70522a95009d65 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 2 Aug 2023 13:50:29 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feature=EF=BC=9A=E5=85=A8=E7=94=B5=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E6=8E=A8=E9=80=81=E6=8A=A5=E9=94=80=E5=BD=B1=E5=83=8F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index e3e705a6..c58e5828 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1910,7 +1910,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { resultToyxVo.setBuyerName(orderInvoiceInfo.getGhfMc()); resultToyxVo.setSellerName(orderInvoiceInfo.getXhfMc()); String terminalCode = orderInvoiceInfo.getSksbdm(); - if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm())){ + if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getValue().equals(orderInvoiceInfo.getFpzlDm()) + ){ OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); List fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,""); if (ObjectUtil.isNotEmpty(fileDownLoadList)) { From 229a3f9ee59feff1014380c768b2f9e46db7efdf Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 2 Aug 2023 15:25:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD=E6=98=93?= =?UTF-8?q?=E8=A1=8C=E8=B4=9F=E6=95=B0=E5=BC=80=E5=85=B7=E5=9B=9E=E6=8E=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=8F=91=E7=A5=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E3=80=81=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index 203a3267..9eaf9f90 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1818,7 +1818,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { resultToyxVo.setBuyerName(orderInvoiceInfo.getGhfMc()); resultToyxVo.setSellerName(orderInvoiceInfo.getXhfMc()); String terminalCode = orderInvoiceInfo.getSksbdm(); - if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm())){ + if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getValue().equals(orderInvoiceInfo.getFpzlDm()) + ){ OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); List fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,""); if (ObjectUtil.isNotEmpty(fileDownLoadList)) {