From c4aaa03699cdcadaa9c7d1167bae823625013f93 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 18 Dec 2024 14:36:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=BD=A6=E6=AC=A1=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改报表逻辑 --- .../com/logpm/statistics/feign/IExpenseDispatchClient.java | 2 +- .../receiver/report/DeliverFinishReportListener.java | 2 +- .../com/logpm/statistics/feign/ExpenseDispatchClient.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IExpenseDispatchClient.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IExpenseDispatchClient.java index cb10bb7c0..13b876899 100644 --- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IExpenseDispatchClient.java +++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IExpenseDispatchClient.java @@ -17,7 +17,7 @@ public interface IExpenseDispatchClient { String API_PREFIX = "expenseDispatch/client"; @GetMapping(API_PREFIX + "/findPriceByDriverId") - ExpenseDispatchClientDTO findPriceByDriverId(@RequestParam Long warehouseId, @RequestParam Long driverId, @RequestParam String carType, @RequestParam String dispatchType); + ExpenseDispatchClientDTO findPriceByDriverId(@RequestParam Long warehouseId, @RequestParam Long driverId, @RequestParam Long carType, @RequestParam String dispatchType); @PostMapping(API_PREFIX + "/saveTrainDetailEntity") void saveTrainDetailEntity(@RequestBody ExpenseDispatchTrainDetailEntity entity); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index ff914be75..8a1b7f056 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -177,7 +177,7 @@ public class DeliverFinishReportListener implements ReportService { if(StrUtil.isEmpty(qualityDeliverEntity.getSignCarType())){ continue; } - ExpenseDispatchClientDTO expenseDispatchClientDTO = expenseDispatchClient.findPriceByDriverId(qualityDeliverEntity.getWarehouseId(), driverId, qualityDeliverEntity.getSignCarType(), qualityDeliverEntity.getDeliveryType()); + ExpenseDispatchClientDTO expenseDispatchClientDTO = expenseDispatchClient.findPriceByDriverId(qualityDeliverEntity.getWarehouseId(), driverId, qualityDeliverEntity.getSignCarTypeId(), qualityDeliverEntity.getDeliveryType()); if (ObjectUtil.isNotEmpty(expenseDispatchClientDTO)) { ExpenseDispatchPriceVO priceVO = expenseDispatchClientDTO.getPriceVO(); if (ObjectUtil.isEmpty(priceVO)) { diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java index 8b0e11cad..d77477edc 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/feign/ExpenseDispatchClient.java @@ -1,6 +1,7 @@ package com.logpm.statistics.feign; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -36,7 +37,7 @@ public class ExpenseDispatchClient implements IExpenseDispatchClient { private final IExpenseDispatchTrainDetailService trainDetailService; @Override - public ExpenseDispatchClientDTO findPriceByDriverId(Long warehouseId, Long driverId, String carType, String dispatchType) { + public ExpenseDispatchClientDTO findPriceByDriverId(Long warehouseId, Long driverId, Long carType, String dispatchType) { List list = serviceService.list(Wrappers.lambdaQuery() .eq(ExpenseDispatchPriceServiceEntity::getWarehouseId, warehouseId) .eq(ExpenseDispatchPriceServiceEntity::getDriverId, driverId) @@ -53,7 +54,7 @@ public class ExpenseDispatchClient implements IExpenseDispatchClient { dto.setRule(expenseDispatchPriceRuleDTO); } ExpenseDispatchPriceEntity param = new ExpenseDispatchPriceVO(); - param.setCarModel(carType); + param.setCarModel(Convert.toStr(carType)); param.setTemplateId(templateId); param.setType(StrUtil.equals(dispatchType, "商配") ? 1: 2); ExpenseDispatchPriceVO detail = priceService.detail(param);