From f4388eea968d21a5fae4fb74fa87c2b2ac729772 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 25 Jul 2023 11:28:20 +0800 Subject: [PATCH] =?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=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/model/OrderProcessInfo.java | 4 +++ .../service/impl/PushInvoiceServiceImpl.java | 30 ++++++++++--------- .../openapi/protocol/v5/order/DdfpxxV5.java | 6 ++++ .../service/impl/InterfaceServiceImplV5.java | 1 + .../consumer/utils/BeanTransitionV5Utils.java | 7 +++++ 5 files changed, 34 insertions(+), 14 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 98470115..7bc1d388 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 @@ -193,6 +193,10 @@ public class OrderProcessInfo implements Serializable { * 公司代码 */ private String gsdm; + /** + * 公司对应client + */ + private String gsClients; /** * 驳回状态 */ 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 472f9416..9ea14812 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 @@ -1315,11 +1315,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { if(OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_1.getKey().equals(fpTsMqData.getPushType())){ - OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpTsMqData().getFpqqlsh(), null); - OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo(); - orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh()); - OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, null); - List gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm()); +// OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpTsMqData().getFpqqlsh(), null); +// OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo(); +// orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh()); +// OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, null); +// List gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm()); //发票开具推送 List ddfpzxxV5s = JsonUtils.getInstance().jsonToList(content, DdfpzxxV5.class); @@ -1331,8 +1331,8 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { FpkjtsReqSap fpkjtsReqSap = new FpkjtsReqSap(); List itemList = new ArrayList<>(); //主信息 - if(!OrderInfoEnum.SYS_SOURCE_FPPAGE.getKey().equals(orderProcessInfo.getXtly())){ - fpkjtsReqSap.setZJSDH(orderProcessInfo.getOriginDdh()); + if(!OrderInfoEnum.SYS_SOURCE_FPPAGE.getKey().equals(ddfpxx.getXtly())){ + fpkjtsReqSap.setZJSDH(ddfpxx.getDDH()); }else { fpkjtsReqSap.setZJSDH(""); } @@ -1364,11 +1364,11 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { fpkjtsReqSap.setZGFDH(ddfpxx.getGMFDH()); fpkjtsReqSap.setZXFDH(ddfpxx.getXHFDH()); fpkjtsReqSap.setZXFZH(ddfpxx.getXHFZH()); - fpkjtsReqSap.setZGSDM(orderProcessInfo.getGsdm()); - fpkjtsReqSap.setZYWDJ(orderProcessInfo.getBzdh()); - fpkjtsReqSap.setIMGID(orderInvoiceInfo.getDocuId()); - if(OrderInfoEnum.SYS_SOURCE_DSXT01.getKey().equals(orderProcessInfo.getXtly()) || - OrderInfoEnum.SYS_SOURCE_DSXT02.getKey().equals(orderProcessInfo.getXtly())){ + fpkjtsReqSap.setZGSDM(ddfpxx.getCompanyCode()); + fpkjtsReqSap.setZYWDJ(ddfpxx.getBillNum()); + fpkjtsReqSap.setIMGID(ddfpxx.getDocuId()); + if(OrderInfoEnum.SYS_SOURCE_DSXT01.getKey().equals(ddfpxx.getXtly()) || + OrderInfoEnum.SYS_SOURCE_DSXT02.getKey().equals(ddfpxx.getXtly())){ fpkjtsReqSap.setPDFZJL(ddfpxx.getPDFZJL()); fpkjtsReqSap.setZJLLX(ddfpxx.getZJLLX()); } @@ -1376,7 +1376,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { ddmxxx.stream().forEach(f -> { FpkjtsMxSap detail = new FpkjtsMxSap(); //主信息 - detail.setZJSDH(StringUtils.isNotBlank(orderProcessInfo.getOriginDdh())?orderProcessInfo.getOriginDdh():orderProcessInfo.getDdh()); + detail.setZJSDH(ddfpxx.getDDH()); // detail.setZJSDH(ddfpxx.getDDH()); detail.setZFPDM(ddfpxx.getFPDM()); detail.setZFPHM(ddfpxx.getFPHM()); @@ -1412,7 +1412,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { isInput.setIFYWID(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJTS.getKey()); isInput.setBSKEY(apiInvoiceCommonMapperService.getGenerateShotKey()); isInput.setZORG(""); - isInput.setZFILED5(gsClients.size()>0?gsClients.get(0).getClient():""); + isInput.setZFILED5(ddfpxx.getGsClients()); mainList.add(fpkjtsReqSap); String jsonString = JsonUtils.getInstance().toJsonString(mainList); isInput.setZDATA(jsonString); @@ -1477,6 +1477,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { String pushWjl = pushInfo.getPushWjl(); List orderProcessInfoList = new ArrayList<>(); OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpqqlsh(), shList); + List gsClients = gsClientMapper.selectByGsdm(orderProcessInfo.getGsdm()); 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); @@ -1499,6 +1500,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { List ddfpzxxV5s = new ArrayList<>(); try { for (OrderProcessInfo processInfo : orderProcessInfoList) { + processInfo.setGsClients(gsClients.size()>0?gsClients.get(0).getClient():""); DdfpzxxV5 interfaceOrderV5 = interfaceServiceV5.getInterfaceOrderV5(processInfo, shList, ConfigureConstant.STRING_0); ddfpzxxV5s.add(interfaceOrderV5); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/order/DdfpxxV5.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/order/DdfpxxV5.java index 4e97f4f0..77bcf2fa 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/order/DdfpxxV5.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v5/order/DdfpxxV5.java @@ -348,6 +348,12 @@ public class DdfpxxV5 { * 数据权限ID */ private String ENTID; + + private String docuId; + + private String xtly; + + private String gsClients; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java index aefbe2fe..31fa21e2 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.csp.sentinel.annotation.SentinelResource; import com.dxhy.order.constant.*; import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper; +import com.dxhy.order.consumer.modules.order.model.GsClient; import com.dxhy.order.exception.InterfaceException; import com.dxhy.order.exception.OrderReceiveException; import com.dxhy.order.model.*; 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 08199e65..7efe1d05 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 @@ -44,6 +44,12 @@ public class BeanTransitionV5Utils { ddfpxxV5.setDDLX(orderProcessInfo.getDdlx()); ddfpxxV5.setBillNum(orderProcessInfo.getBzdh()); ddfpxxV5.setCompanyCode(orderProcessInfo.getGsdm()); + ddfpxxV5.setXtly(orderProcessInfo.getXtly()); + ddfpxxV5.setGsClients(orderProcessInfo.getGsClients()); + //gsClients.size()>0?gsClients.get(0).getClient():"" + if(StringUtils.isNotBlank(orderProcessInfo.getOriginDdh())){ + ddfpxxV5.setDDH(orderProcessInfo.getOriginDdh()); + } if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){ try { String requestData = generateQdInvoice.getRequestData(); @@ -122,6 +128,7 @@ public class BeanTransitionV5Utils { ddfpxxV5.setHZXXBBH(StringUtils.isEmpty(orderInvoiceInfo.getHzxxbbh()) ? "" : orderInvoiceInfo.getHzxxbbh()); ddfpxxV5.setZFBZ(StringUtils.isEmpty(orderInvoiceInfo.getZfBz()) ? "" : orderInvoiceInfo.getZfBz()); ddfpxxV5.setCHBZ(StringUtils.isEmpty(orderInvoiceInfo.getChBz()) ? "" : orderInvoiceInfo.getChBz()); + ddfpxxV5.setDocuId(StringUtils.isEmpty(orderInvoiceInfo.getDocuId()) ? "" : orderInvoiceInfo.getDocuId()); } else { ddfpxxV5.setJQBH(""); ddfpxxV5.setFPDM("");