From 643a4df394ae07a5c2e97d34ef26534a3d5b599a Mon Sep 17 00:00:00 2001 From: zhengyf Date: Wed, 20 Nov 2024 14:09:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E4=BB=85=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=96=B0=E5=A2=9E=E9=80=80=E6=AC=BE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java | 2 +- .../returngoodordersearch/RerturnGoodsOrderSearchHeader.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java index 9744e15c..fa26583d 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java @@ -380,7 +380,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { } //分组：公司+店铺+部门+单据日期(退款日期),仅退款没有仓库，固不去 - Map> collect = allHeader.stream().collect(Collectors.groupingBy(index -> index.getCompanyCode() + "_" + index.getStoreCode() + "_" + index.getSaleDeptCode() + "_" + index.getSourceModifiedAt().substring(0, 10))); + Map> collect = allHeader.stream().collect(Collectors.groupingBy(index -> index.getCompanyCode() + "_" + index.getStoreCode() + "_" + index.getSaleDeptCode() + "_" + index.getRefundedAt().substring(0, 10))); collect.forEach((k, v) -> { String[] split = k.split("_");//[0]公司 [1]店铺 [2]部门 [3]单据日期 diff --git a/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchHeader.java b/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchHeader.java index a109d539..1a74cf30 100755 --- a/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchHeader.java +++ b/service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchHeader.java @@ -63,6 +63,7 @@ public class RerturnGoodsOrderSearchHeader { private String sourceModifiedAt; private String agNumberOfRetries; private String realReturnReason; + private String refundedAt; //平台优惠 private String platformDiscounts;