From da19c43970cb8e9afa829899fba3cb5c8142c851 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 22 Oct 2024 10:45:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=E8=BF=90=E5=8D=95bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java | 2 +- .../com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml | 7 +++---- .../logpm/trunkline/service/ITrunklineAdvanceService.java | 4 ++-- .../logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 2 +- .../service/impl/TrunklineAdvanceServiceImpl.java | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java index e141769f6..2a6630595 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.java @@ -46,7 +46,7 @@ public interface TrunklineAdvanceMapper extends BaseMapper advancePageListByBussiness(IPage page, @Param("param") AdvanceDTO advanceDTO); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml index b6f7648b0..d1f0b2e08 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceMapper.xml @@ -254,12 +254,11 @@ - + update logpm_trunkline_advance - set waybill_id = null, - waybill_no = null, + set waybill_no = null, waybill_status = '0' - where waybill_id = #{waybillId} + where waybill_no = #{waybillNo} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java index e4fa7ea7a..d492cfed5 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceService.java @@ -48,7 +48,7 @@ public interface ITrunklineAdvanceService extends BaseService advancePageListByBussiness(IPage page, AdvanceDTO advanceDTO); + + void clearWaybillInfoByWaybillNo(String waybillNo); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 2df4f7434..dcf9c6863 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -3981,7 +3981,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { Integer waybillType = waybillEntity.getWaybillType(); if(waybillType.equals(1)){ //订制品 - advanceService.clearWaybillInfoByWaybillId(waybillId); + advanceService.clearWaybillInfoByWaybillNo(waybillNo); advanceDetailService.clearWaybillInfoByWaybillId(waybillId); trunklineWaybillOrderService.deleteByWaybillNo(waybillNo); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 2c798f171..665fb0f48 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -1926,7 +1926,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl Date: Tue, 22 Oct 2024 12:01:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=8F=96=E6=B6=88=E8=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=85=A5=E5=BA=93=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicdataDriverArteryController.java | 12 +++++++++--- .../impl/BasicdataDriverArteryServiceImpl.java | 15 ++++++++------- .../controller/FactoryCommonController.java | 4 ++-- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java index 711134592..b9a233e05 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java @@ -38,6 +38,7 @@ import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; +import org.springblade.common.exception.CustomerException; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.log.exception.ServiceException; @@ -292,9 +293,14 @@ public class BasicdataDriverArteryController extends BladeController { @ApiOperation(value = "导入司机信息", notes = "传入excel") public R importDriverArteryEntry(MultipartFile file) { log.info("传入>>>>>>>{}", file); - BasicdataDriverArteryImporter basicdataDriverArteryImporter = new BasicdataDriverArteryImporter(basicdataDriverArteryService); - ExcelUtil.save(file, basicdataDriverArteryImporter, BasicdataDriverArteryImproterExcel.class); - return R.success("操作成功"); + try { + BasicdataDriverArteryImporter basicdataDriverArteryImporter = new BasicdataDriverArteryImporter(basicdataDriverArteryService); + ExcelUtil.save(file, basicdataDriverArteryImporter, BasicdataDriverArteryImproterExcel.class); + return R.success("操作成功"); + } catch (CustomerException e) { + log.error("导入失败", e); + return R.fail(e.getMessage()); + } } /** diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java index b872b50dd..05e76453b 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java @@ -44,6 +44,7 @@ import org.springblade.common.constant.driver.DriverApprovedDrivingModelConstant import org.springblade.common.constant.driver.DriverBankTypeConverter; import org.springblade.common.constant.driver.DriverPositionTypeConstant; import org.springblade.common.constant.driver.DriverTypeStatusConstant; +import org.springblade.common.exception.CustomerException; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; @@ -268,7 +269,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl { message.getMessageProperties().setHeader("x-delay", 2000); return message; }); - } +// } // R r = factoryDataService.handleStatusData(orderStatusDTO); return R.success("调用成功");