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; 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(); }