From 744f3afccdfd3e675b77a0fa2521998f8c82a0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 20 Aug 2024 16:16:38 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E6=97=B6=E7=A9=BA=E5=92=8C=E7=94=A8?= =?UTF-8?q?=E5=8F=8B=E5=9B=9E=E6=8E=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/rabbitmq/InvoiceFptsHandler.java | 1 + .../consumer/dao/TInvoiceInvmapMapper.java | 12 +++ .../order/consumer/dao/YyOrderMapper.java | 5 - .../service/impl/SkOrderServiceImpl.java | 20 ++++ .../service/impl/YyOrderServiceImpl.java | 16 ++-- .../mybatis/mapper/TInvoiceInvmapMapper.xml | 96 +++++++++++++++++++ .../mybatis/mapper/YyOrderMapper.xml | 89 ----------------- 7 files changed, 139 insertions(+), 100 deletions(-) create mode 100644 order-management-order/src/main/java/com/dxhy/order/consumer/dao/TInvoiceInvmapMapper.java create mode 100644 order-management-order/src/main/resources/mybatis/mapper/TInvoiceInvmapMapper.xml diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceFptsHandler.java b/order-management-order/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceFptsHandler.java index 7ade87f..9e83842 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceFptsHandler.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/config/rabbitmq/InvoiceFptsHandler.java @@ -72,6 +72,7 @@ public class InvoiceFptsHandler implements BaseListener { */ public void reverse(String message) { + message = JsonUtils.getInstance().parseObject(message, String.class); orderHandleService.backMsg(message); // message = JsonUtils.getInstance().parseObject(message, String.class); diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/TInvoiceInvmapMapper.java b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/TInvoiceInvmapMapper.java new file mode 100644 index 0000000..02a973c --- /dev/null +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/TInvoiceInvmapMapper.java @@ -0,0 +1,12 @@ +package com.dxhy.order.consumer.dao; + +import com.dxhy.order.consumer.modules.bespoke.model.yy.NewTable; + +public interface TInvoiceInvmapMapper { + + //插入回写信息 + int insertBackMsg(NewTable newTable); + + //删除原信息 + int deleteBackMsg(String cdlCode); +} diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderMapper.java b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderMapper.java index c011afa..52f19de 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderMapper.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/dao/YyOrderMapper.java @@ -17,13 +17,8 @@ public interface YyOrderMapper { //订单明细读取 List findOrderDetailList(String sbvid); - //插入回写信息 - int insertBackMsg(NewTable newTable); - //根据订单编号查询订单信息 List getDdbh(String cdlCode); int updateBackMsg(@Param("fild") String reBackFild, @Param("ddh") String originDdh, @Param("fph") String sdfphm); - - int deleteBackMsg(String cdlCode); } diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index 9664c27..fbc23a5 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -22,12 +22,14 @@ import com.dxhy.order.baseservice.model.OrderOriginExtendInfo; import com.dxhy.order.consumer.dao.SkOrderInfoMapper; import com.dxhy.order.consumer.dao.SkOrderItemInfoMapper; import com.dxhy.order.consumer.dao.SkOrderMapper; +import com.dxhy.order.consumer.dao.TInvoiceInvmapMapper; import com.dxhy.order.consumer.modules.bespoke.config.datasource.config.DynamicContextHolder; import com.dxhy.order.consumer.modules.bespoke.model.req.FileModel; import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; import com.dxhy.order.consumer.modules.bespoke.model.sk.BackProduct; import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderInfo; import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderItemInfo; +import com.dxhy.order.consumer.modules.bespoke.model.yy.NewTable; import com.dxhy.order.consumer.modules.bespoke.service.OrderService; import com.dxhy.order.consumer.openapi.protocol.v4.order.*; import com.dxhy.order.consumer.openapi.protocol.v6.order.QdTxxBO; @@ -75,6 +77,9 @@ public class SkOrderServiceImpl implements OrderService { @Resource private OrderItemInfoMapper orderItemInfoMapper; + @Resource + private TInvoiceInvmapMapper tInvoiceInvmapMapper; + // 订单读入 @Override public R orderRead(ReqParam reqParam) { @@ -197,7 +202,22 @@ public class SkOrderServiceImpl implements OrderService { backProduct.setDjbh(ddh); backProduct.setMark(ConfigureConstant.CH); } + DynamicContextHolder.push(orderInvoiceInfo.getXhfNsrsbh()); skOrderMapper.callProcedure(backProduct); + + //回写创建表 + DynamicContextHolder.push(ConfigureConstant.MAIN); + NewTable newTable = new NewTable(); + newTable.setCDLCode(orderOriginExtendInfo.getOriginDdh()); + newTable.setInvoiceCode(orderInvoiceInfo.getSdfphm()); + newTable.setInvoiceTime(orderInvoiceInfo.getKprq()); + newTable.setInvoiceAmount(orderInvoiceInfo.getKphjje()); + newTable.setInvoicePhoto(fileModel.getFilePath()); + newTable.setInvoiceFilename(fileModel.getFileName()); + newTable.setOperater(orderInvoiceInfo.getKpr()); + newTable.setOperateDate(orderInvoiceInfo.getKprq()); + tInvoiceInvmapMapper.deleteBackMsg(newTable.getCDLCode()); + tInvoiceInvmapMapper.insertBackMsg(newTable); } } 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 ae1f4f1..09b4ba4 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 @@ -18,6 +18,7 @@ import com.dxhy.order.baseservice.constant.ConfigurerInfo; import com.dxhy.order.baseservice.constant.OrderValidateEnum; import com.dxhy.order.baseservice.model.OrderInvoiceInfo; import com.dxhy.order.baseservice.model.OrderOriginExtendInfo; +import com.dxhy.order.consumer.dao.TInvoiceInvmapMapper; import com.dxhy.order.consumer.dao.YyOrderInfoMapper; import com.dxhy.order.consumer.dao.YyOrderItemInfoMapper; import com.dxhy.order.consumer.dao.YyOrderMapper; @@ -78,6 +79,9 @@ public class YyOrderServiceImpl implements OrderService { @Resource private FildConfig fildConfig; + @Resource + private TInvoiceInvmapMapper tInvoiceInvmapMapper; + //订单读入 @Override public R orderRead(ReqParam reqParam) { @@ -207,8 +211,7 @@ public class YyOrderServiceImpl implements OrderService { } log.debug("待回传数据：{}", JSON.toJSONString(newTableList)); - DynamicContextHolder.push(orderInvoiceInfo.getXhfNsrsbh()); - int count = accressReback(newTableList); + int count = accressReback(newTableList,orderInvoiceInfo.getXhfNsrsbh()); if (count >=newTableList.size()){ return R.ok("成功回传" + count + "条数据"); @@ -217,21 +220,22 @@ public class YyOrderServiceImpl implements OrderService { return R.error("回传失败"); } - @Transactional - public int accressReback(List newTableList) { + public int accressReback(List newTableList,String nsrsbh) { int count = ConfigureConstant.INT_0; for (NewTable newTable : newTableList) { + DynamicContextHolder.push(nsrsbh); List ddbhList = yyOrderMapper.getDdbh(newTable.getCDLCode()); log.debug("查询到中间表信息:{}", JSON.toJSONString(ddbhList)); if (CollectionUtils.isNotEmpty(ddbhList)){ - yyOrderMapper.deleteBackMsg(newTable.getCDLCode()); + DynamicContextHolder.push(ConfigureConstant.MAIN); + tInvoiceInvmapMapper.deleteBackMsg(newTable.getCDLCode()); for (InvoiceBpmmap invoiceBpmmap : ddbhList) { NewTable newTableFull = new NewTable(); BeanUtil.copyProperties(newTable, newTableFull); newTableFull.setBpmNo(invoiceBpmmap.getBpmno()); newTableFull.setBpmlsNo(invoiceBpmmap.getBpmlsno()); - count+= yyOrderMapper.insertBackMsg(newTableFull); + count+= tInvoiceInvmapMapper.insertBackMsg(newTableFull); } } diff --git a/order-management-order/src/main/resources/mybatis/mapper/TInvoiceInvmapMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/TInvoiceInvmapMapper.xml new file mode 100644 index 0000000..fe7da2b --- /dev/null +++ b/order-management-order/src/main/resources/mybatis/mapper/TInvoiceInvmapMapper.xml @@ -0,0 +1,96 @@ + + + + + + insert into T_INVOICE_INVMAP + + + cDLCode, + + + invoiceNo, + + + invoiceCode, + + + invoiceTime, + + + invoiceAmount, + + + invoicePhoto, + + + invoiceFilename, + + + bpmlsNo, + + + bpmNo, + + + operater, + + + operateDate, + + + shipper, + + + status, + + + + + #{cDLCode}, + + + #{invoiceNo}, + + + #{invoiceCode}, + + + #{invoiceTime}, + + + #{invoiceAmount}, + + + #{invoicePhoto}, + + + #{invoiceFilename}, + + + #{bpmlsNo}, + + + #{bpmNo}, + + + #{operater}, + + + #{operateDate}, + + + #{shipper}, + + + #{status}, + + + + + + + delete from T_INVOICE_INVMAP where cdlcode = #{cdlCode} + + + diff --git a/order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml index 9593906..78d38da 100644 --- a/order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml +++ b/order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml @@ -44,91 +44,6 @@ where sbvid = #{sbvid} - - insert into NewTable - - - cDLCode, - - - invoiceNo, - - - invoiceCode, - - - invoiceTime, - - - invoiceAmount, - - - invoicePhoto, - - - invoiceFilename, - - - bpmlsNo, - - - bpmNo, - - - operater, - - - operateDate, - - - shipper, - - - status, - - - - - #{cDLCode}, - - - #{invoiceNo}, - - - #{invoiceCode}, - - - #{invoiceTime}, - - - #{invoiceAmount}, - - - #{invoicePhoto}, - - - #{invoiceFilename}, - - - #{bpmlsNo}, - - - #{bpmNo}, - - - #{operater}, - - - #{operateDate}, - - - #{shipper}, - - - #{status}, - - -