From 715853b5091a023b236a9b3ba8258eb966032d7b Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 2 Aug 2023 13:42:10 +0800 Subject: [PATCH 1/2] =?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 229a3f9ee59feff1014380c768b2f9e46db7efdf Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 2 Aug 2023 15:25:35 +0800 Subject: [PATCH 2/2] =?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)) {