From 5c151a08ff9436e451c96a3ad3220480f0675ddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 9 Sep 2024 10:08:18 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E7=94=A8=E5=8F=8B=E5=9B=9E=E5=86=99?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=97=E5=8F=B7=E5=88=86=E5=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YyOrderServiceImpl.java | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java index 8c147f6..0c614c3 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java @@ -295,20 +295,34 @@ public class YyOrderServiceImpl implements OrderService { DynamicContextHolder.push(ConfigureConstant.MAIN); tInvoiceInvmapMapper.deleteBackMsg(fphm); for (NewTable newTable : newTableList) { - DynamicContextHolder.push(nsrsbh); - List ddbhList = yyOrderMapper.getDdbh(newTable.getCDLCode()); - log.debug("查询到中间表信息:{}", JSON.toJSONString(ddbhList)); - if (CollectionUtils.isNotEmpty(ddbhList)) { - for (InvoiceBpmmap invoiceBpmmap : ddbhList) { - NewTable newTableFull = new NewTable(); - BeanUtil.copyProperties(newTable, newTableFull); - newTableFull.setBpmNo(invoiceBpmmap.getBpmno()); - newTableFull.setBpmlsNo(invoiceBpmmap.getBpmlsno()); - DynamicContextHolder.push(ConfigureConstant.MAIN); - count += tInvoiceInvmapMapper.insertBackMsg(newTableFull); - } + //判断是否存在逗号 + log.debug("cdlCode:{}", newTable.getCDLCode()); + List ddhList = new ArrayList<>(); + if (newTable.getCDLCode().contains(",") || newTable.getCDLCode().contains(",")){ + String[] ddhs = newTable.getCDLCode().replace(",", ",").split(","); + ddhList = Arrays.asList(ddhs); + }else { + ddhList.add(newTable.getCDLCode()); + } + log.debug("cdlCodeList:{}", JSON.toJSONString(ddhList)); + for (String cdlCode : ddhList) { + DynamicContextHolder.push(nsrsbh); + List ddbhList = yyOrderMapper.getDdbh(cdlCode); + log.debug("查询到中间表信息:{}", JSON.toJSONString(ddbhList)); + if (CollectionUtils.isNotEmpty(ddbhList)) { + for (InvoiceBpmmap invoiceBpmmap : ddbhList) { + NewTable newTableFull = new NewTable(); + BeanUtil.copyProperties(newTable, newTableFull); + newTableFull.setBpmNo(invoiceBpmmap.getBpmno()); + newTableFull.setBpmlsNo(invoiceBpmmap.getBpmlsno()); + newTableFull.setCDLCode(cdlCode); + DynamicContextHolder.push(ConfigureConstant.MAIN); + count += tInvoiceInvmapMapper.insertBackMsg(newTableFull); + } + } } + } return count;