From 8cb095693ce86e294be999b45823b2c9e5970dff Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 16 Aug 2023 14:41:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=B8=8B=E8=BD=BD=E5=BC=82=E5=B8=B8=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index d7f4989fe..b1b34a179 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -34,7 +34,6 @@ import java.util.List; @Slf4j @Service -@Transactional(rollbackFor = Exception.class) public class ThrOrderServiceImpl implements ThrOrderService { @Resource private ThrOrderDao thrOrderDao; @@ -168,26 +167,31 @@ public class ThrOrderServiceImpl implements ThrOrderService { } @Override + @Transactional(rollbackFor = Exception.class) public boolean insertThrOrder(ThrOrderEntity thrCorpEntity) { return thrOrderDao.insertThrOrder(thrCorpEntity); } @Override + @Transactional(rollbackFor = Exception.class) public boolean insertThrOrders(List thrOrderEntities) { return thrOrderDao.insertThrOrders(thrOrderEntities); } @Override + @Transactional(rollbackFor = Exception.class) public int updateThrOrder(ThrOrderEntity thrOrderEntity) { return thrOrderDao.updateById(thrOrderEntity); } @Override + @Transactional(rollbackFor = Exception.class) public boolean deleteById(String id) { return thrOrderDao.deleteById(id); } @Override + @Transactional(rollbackFor = Exception.class) public boolean deleteAll() { return thrOrderDao.deleteAll(); } From 2ac43431a49a02a2c1f6c67069c0db6f4cd4aa4b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 17 Aug 2023 11:30:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=8D=95=E6=8D=AE=E4=B8=8B=E8=BD=BD=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java | 1 - .../java/com/glxp/api/service/thrsys/ThrOrdersDlService.java | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index afa29631f..91c11d0e3 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -1,6 +1,5 @@ package com.glxp.api.entity.basic; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java index 466133ebb..804a7de74 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java @@ -316,7 +316,7 @@ public class ThrOrdersDlService { for (ThrOrderResponse erpOrderResponse : erpOrderResponses) { ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); - ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thrOrderEntity.getThirdSysFk()); + ThrOrderEntity originEntity = thrOrderService.findByUnique(thrOrderEntity.getBillNo(), thirdSys); if (originEntity != null) { thrOrderService.deleteById(originEntity.getId() + ""); thrOrderDetailService.deleteByOrderIdFk(originEntity.getBillNo() + ""); @@ -352,6 +352,7 @@ public class ThrOrdersDlService { } return -1; } + public List getThrOrders(FilterThrOrderRequest filterThrOrderRequest) { ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("orderQueryUrl", filterThrOrderRequest.getThirdSysFk()); int page = 1;