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;