From 14ae1d0e3966a67b556d44cf35ce1eccc0b82709 Mon Sep 17 00:00:00 2001 From: ljw Date: Sun, 4 Jan 2026 16:21:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E8=A1=A8=E6=A0=BC=E4=B8=AD=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E4=B8=80=E6=A0=8F=E6=8A=8A=E5=86=85=E5=AE=B9=E5=88=86=E5=BC=80?= =?UTF-8?q?=EF=BC=8C=E4=BE=BF=E4=BA=8E=E7=BB=9F=E8=AE=A1=EF=BC=8C=20?= =?UTF-8?q?=E5=A6=82=E4=B8=8B=E5=9B=BE=EF=BC=8C=E6=98=8E=E7=BB=86=E5=88=86?= =?UTF-8?q?=E6=88=90=EF=BC=9A=E7=B1=BB=E5=88=AB=E3=80=81=E5=A4=84=E7=BD=AE?= =?UTF-8?q?=E8=B4=B9=E5=92=8C=E4=B8=AD=E8=BD=AC=E8=BF=90=E8=90=A5=E8=B4=B9?= =?UTF-8?q?=E4=B8=89=E5=88=97=EF=BC=8C=E5=85=B6=E4=B8=AD=E4=B8=AD=E8=BD=AC?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E8=B4=B9=E4=BB=85=E4=B8=BA=E6=95=B0=E5=AD=97?= =?UTF-8?q?=EF=BC=8C=E4=BE=BF=E4=BA=8E=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expense/contant/ExpenseItemCategory.java | 1 + .../service/ExpenseItemsConfigService.java | 5 ++- .../pojo/result/OrderExportDetailResult.java | 5 +++ .../order/pojo/result/OrderExportResult.java | 5 +++ .../order/service/OrderInfoService.java | 43 +++++++++++++------ .../mapper/order/OrderInfoMapper.xml | 7 ++- 6 files changed, 51 insertions(+), 15 deletions(-) diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/expense/contant/ExpenseItemCategory.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/expense/contant/ExpenseItemCategory.java index c75e656..ed6bf78 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/expense/contant/ExpenseItemCategory.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/expense/contant/ExpenseItemCategory.java @@ -15,6 +15,7 @@ public enum ExpenseItemCategory implements DictStr { ChanPin("ChanPin", "产品"), QingYunFuWuFei("QingYunFuWuFei", "清运服务费"), YunFei("YunFei", "运费"), + ZhongZhuanYunYingFei("ZhongZhuanYunYingFei", "中转运营费"), ; private final String val; private final String txt; diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/expense/service/ExpenseItemsConfigService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/expense/service/ExpenseItemsConfigService.java index 03b1a70..ba1c7e5 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/expense/service/ExpenseItemsConfigService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/expense/service/ExpenseItemsConfigService.java @@ -25,7 +25,7 @@ public class ExpenseItemsConfigService extends ServiceImpl paging(PageParam pageParam, ExpenseItemsConfigEntity expenseItemsConfigEntity) { - return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(expenseItemsConfigEntity))); + expenseItemsConfigEntity.setDeleted(Boolean.FALSE); + return PageResult.of(this.page(pageParam.toPage(), Wrappers.query(expenseItemsConfigEntity))); } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportDetailResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportDetailResult.java index 82ad8dc..2f22611 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportDetailResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportDetailResult.java @@ -18,6 +18,11 @@ public class OrderExportDetailResult { */ private Long orderId; + /** + * 付费项类型 + */ + private String expenseItemCategory; + /** * 产品名称 */ diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportResult.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportResult.java index e4f4411..0a09cf2 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportResult.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderExportResult.java @@ -95,4 +95,9 @@ public class OrderExportResult { */ private String checkerMemo; + /** + * 产品名称 + */ + private String goodsName; + } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java index 259a8db..a40540c 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java @@ -56,6 +56,8 @@ import com.njzscloud.supervisory.order.utils.FileUtil; import com.njzscloud.supervisory.station.pojo.entity.StationManageEntity; import com.njzscloud.supervisory.station.service.StationManageService; import com.njzscloud.supervisory.sys.auth.pojo.result.MyResult; +import com.njzscloud.supervisory.sys.dict.pojo.DictItemEntity; +import com.njzscloud.supervisory.sys.dict.service.DictItemService; import com.njzscloud.supervisory.sys.role.pojo.entity.RoleEntity; import com.njzscloud.supervisory.sys.role.service.RoleService; import com.njzscloud.supervisory.sys.stationletter.constant.WarnCategory; @@ -117,6 +119,7 @@ public class OrderInfoService extends ServiceImpl discountList = discountManageService.list(Wrappers.lambdaQuery(DiscountManageEntity.class) @@ -1766,6 +1771,10 @@ public class OrderInfoService extends ServiceImpl list = baseMapper.exportList(ew); List detailResults = baseMapper.exportDetailList(ew); List> downList = new ArrayList<>(); + List dictItems = dictItemService.list(Wrappers.lambdaQuery() + .eq(DictItemEntity::getDictKey, "expense_item_category") + .eq(DictItemEntity::getDeleted, Boolean.FALSE) + .orderByAsc(DictItemEntity::getSort)); int i = 1; for (OrderExportResult result : list) { Map map = new LinkedHashMap<>(); @@ -1784,19 +1793,29 @@ public class OrderInfoService extends ServiceImpl 0) { - List details = detailResults.stream().filter(t -> t.getOrderId() - .equals(result.getId())).collect(Collectors.toList()); - List detailList = new ArrayList<>(); - if (details.size() > 0) { - for (OrderExportDetailResult detailResult : details) { - detailList.add(detailResult.getExpenseItemName() + detailResult.getSettleMoney() + "元"); + map.put("产品", result.getGoodsName()); + List details = detailResults.stream() + .filter(t -> t.getOrderId().equals(result.getId())) + .collect(Collectors.toList()); + // 根据dictItems动态添加费用列 + if (null != dictItems && !dictItems.isEmpty()) { + for (DictItemEntity dictItem : dictItems) { + String headerName = "ChanPin".equals(dictItem.getVal()) ? "处置费" : dictItem.getTxt(); + BigDecimal amount = BigDecimal.ZERO; + + if (!details.isEmpty()) { + Optional matchedDetail = details.stream() + .filter(detail -> dictItem.getVal().equals(detail.getExpenseItemCategory())) + .findFirst(); + if (matchedDetail.isPresent()) { + amount = matchedDetail.get().getSettleMoney(); + } } - map.put("明细", JSONObject.toJSONString(detailList)); - } else { - map.put("明细", ""); + + map.put(headerName, amount); } } + map.put("备注", result.getCheckerMemo()); downList.add(map); i++; diff --git a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml index 400cdb8..9df3891 100644 --- a/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml +++ b/njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml @@ -228,10 +228,12 @@ + + @@ -261,7 +263,8 @@ ROUND( ocio.tare_weight / 1000, 2 ) AS tare_weight, ROUND( ocio.settle_weight / 1000, 2 ) AS settle_weight, f.driver_name, - a.checker_memo + a.checker_memo, + og.goods_name FROM order_info a LEFT JOIN biz_company b ON b.id = a.station_id @@ -273,6 +276,7 @@ LEFT JOIN sys_user su ON a.user_id = su.id LEFT JOIN order_cargo_place h ON h.id = a.cargo_place_id LEFT JOIN biz_driver f ON f.id = a.driver_id + LEFT JOIN order_goods og ON og.id = a.goods_id ${ew.customSqlSegment} @@ -283,6 +287,7 @@