From 2faa905bfb9834f91b1b845b122b3e677c78e5b8 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 27 Jun 2023 17:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0bug=EF=BC=8C=E5=8F=91=E7=A5=A8=E9=87=8D?= =?UTF-8?q?=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thrsys/ThirdUploadSetController.java | 1 + .../glxp/api/service/sync/HeartService.java | 34 +++++++++---------- .../mybatis/mapper/basic/ProductInfoDao.xml | 2 +- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java index 301bd24e3..bd062819f 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java @@ -74,6 +74,7 @@ public class ThirdUploadSetController { thrOrderUploadBustypesEntity.setOrderStatus(3); thrOrderUploadBustypesEntity.setUpdateTime(new Date()); thrOrderUploadBustypesEntity.setCreateTime(new Date()); + thrOrderUploadBustypesEntity.setId(null); thrOrderUploadBustypesEntity.setOrderSource(Arrays.asList("2")); thrOrderUploadBustypesService.save(thrOrderUploadBustypesEntity); } diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index e25752254..6e495f75b 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -1951,15 +1951,15 @@ public class HeartService { } } - //更新发票信息 - if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) { - List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); - for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { - if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { - ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity); - } - } - } +// //更新发票信息 +// if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) { +// List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); +// for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { +// if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { +// ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity); +// } +// } +// } } @Resource @@ -1995,14 +1995,14 @@ public class HeartService { } //更新发票信息 - if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) { - List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); - for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { - if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { - ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity); - } - } - } +// if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) { +// List orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities(); +// for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { +// if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { +// ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity); +// } +// } +// } } diff --git a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index f07a02b15..6c928354b 100644 --- a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -472,7 +472,7 @@ #{sfwwjbz}, #{syqsfxyjxmj}, #{qtxxdwzlj}, - #{mjfs}，#{categoryName}) + #{mjfs},#{categoryName})