From e05d842dc2b6176238c6ff957bf0d0e6ad8250c5 Mon Sep 17 00:00:00 2001
From: 15815213711 <a13118667520@163.com>
Date: 星期三, 30 七月 2025 11:23:44 +0800
Subject: [PATCH] 修改ID，修改加密方式
---
service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java
index 602e6f3..58e4e9a 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java
@@ -284,50 +284,35 @@
@DataSource(DataSourceType.CWSJ)
public List<DispatchOrderItemVo> selectDispatchOrderItems( Set<String> nos) {
// 浣跨敤Map鏉ヤ复鏃跺瓨鍌ㄥ垎缁勭粨鏋�
- Map<String, DispatchOrderItemVo> summaryMap = new HashMap<>();
-
+ List<DispatchOrderItemVo> vos = new ArrayList<>();
List<DispatchOrderItem> dispatchOrderItems=dispatchOrderMapper.selectDispatchOrderItemByNos(nos);
- Set<String> settableFeeItemSet = null;
for (DispatchOrderItem dispatchOrderItem : dispatchOrderItems) {
- String settableFeeItems = dispatchOrderItem.getSettableFeeItems();
- if (settableFeeItemSet==null) {
- settableFeeItemSet = new HashSet<>(
- Arrays.asList(settableFeeItems.split(",")));
- }
+ HashSet<String> settableFeeItemSet = new HashSet<>(
+ Arrays.asList(Optional.ofNullable(dispatchOrderItem.getSettableFeeItems()).orElse("").split(",")));
+
// 鍒ゆ柇鏄惁鍙粨绠�
- String feeItem = dispatchOrderItem.getFeeItem();
- int isSettable = isFeeItemSettable(feeItem, settableFeeItemSet);
+ String feeItem = Optional.ofNullable(dispatchOrderItem.getFeeItem()).orElse("");
+ int isSettable = settableFeeItemSet.contains(feeItem)?1:0;
// 濡傛灉Map涓笉瀛樺湪璇ヨ垂鐢ㄧ被鍨嬶紝鍒欏垱寤烘柊鏉＄洰
- if (!summaryMap.containsKey(feeItem)) {
+
DispatchOrderItemVo summary = new DispatchOrderItemVo();
summary.setDispatchNo(dispatchOrderItem.getDispatchNo());
summary.setFeeItem(feeItem);
summary.setReceivableFee(BigDecimal.ZERO);
summary.setActualFee(BigDecimal.ZERO);
summary.setIsSettlement(isSettable);
- summaryMap.put(feeItem, summary);
- }
- // 鏍规嵁璐﹀崟绫诲瀷绱姞閲戦
- DispatchOrderItemVo summary = summaryMap.get(feeItem);
+
if ("R".equals(dispatchOrderItem.getBillType())) { // 搴旀敹
- summary.setReceivableFee(summary.getReceivableFee().add(dispatchOrderItem.getSettleFee()));
+ summary.setReceivableFee(dispatchOrderItem.getSettleFee());
summary.setReceivableFeeCurrency(dispatchOrderItem.getCurrencyType());
} else if ("P".equals(dispatchOrderItem.getBillType())) { // 搴斾粯
- summary.setActualFee(summary.getActualFee().add(dispatchOrderItem.getSettleFee()));
+ summary.setActualFee(dispatchOrderItem.getSettleFee());
summary.setActualFeeCurrency(dispatchOrderItem.getCurrencyType());
}
+ vos.add( summary);
}
- // 杞崲涓篖ist骞惰繃婊ゃ�佹帓搴�
- return summaryMap.values().stream()
- // 杩囨护鎺夊簲鏀跺簲浠橀兘涓�0鐨勮褰�
- .filter(dto -> dto.getReceivableFee().compareTo(BigDecimal.ZERO) != 0
- || dto.getActualFee().compareTo(BigDecimal.ZERO) != 0)
- // 鎺掑簭锛氬彲缁撶畻鐨勫湪鍓嶏紝涓嶅彲缁撶畻鐨勫湪鍚庯紱鐒跺悗鎸夋�婚噾棰濋檷搴�
- .sorted(Comparator.comparing(DispatchOrderItemVo::getIsSettlement).reversed()
- .thenComparing(dto -> dto.getReceivableFee().add(dto.getActualFee()),
- Comparator.reverseOrder()))
- .collect(Collectors.toList());
+ return vos;
}
--
Gitblit v1.8.0