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 f210d423..100359e6 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 @@ -165,12 +165,12 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) { return; } - //过滤原始表 - List filterOriginalOrders = filterOriginal(returnGoodsOrders); - //底表存数据库 - if (filterOriginalOrders.size() != 0) { - save(filterOriginalOrders); - } + //过滤仅退款 returnType:0 不退货、exchangeType:0 不换货、refundInd:1 退款 + List refundOnlyData = filterRefundOnly(returnGoodsOrders); + + //保存数据 + saveData(refundOnlyData); + //过滤日志 List filterReturnGoodsOrders = filterData(returnGoodsOrders); if (filterReturnGoodsOrders == null || filterReturnGoodsOrders.size() == 0) { @@ -197,15 +197,14 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { Assert.state(false, "丽知:售后订单(仅退款):{} --->U8C红字应收单,未查询到OFS售后订单(仅退款)", ofsCode); } - //过滤原始表 - List filterOriginalOrders = filterOriginal(returnGoodsOrders); - //底表存数据库 - if (filterOriginalOrders.size() != 0) { - save(filterOriginalOrders); - } -// save(returnGoodsOrders); + //过滤仅退款 returnType:0 不退货、exchangeType:0 不换货、refundInd:1 退款 + List refundOnlyData = filterRefundOnly(returnGoodsOrders); + + //保存数据 + saveData(refundOnlyData); + //过滤日志 - List filterReturnGoodsOrders = filterData(returnGoodsOrders); + List filterReturnGoodsOrders = filterData(refundOnlyData); if (filterReturnGoodsOrders == null || filterReturnGoodsOrders.size() == 0) { Assert.state(false, "丽知:售后订单(仅退款):{} --->U8C红字应收单,该售后订单(仅退款)已被推送成功,请勿重新推送", ofsCode); } @@ -232,12 +231,12 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) { return; } - //过滤原始表 - List filterOriginalOrders = filterOriginal(returnGoodsOrders); - //底表存数据库 - if (filterOriginalOrders.size() != 0) { - save(filterOriginalOrders); - } + //过滤仅退款 returnType:0 不退货、exchangeType:0 不换货、refundInd:1 退款 + List refundOnlyData = filterRefundOnly(returnGoodsOrders); + + //保存数据 + saveData(refundOnlyData); + //过滤日志 List filterReturnGoodsOrders = filterData(returnGoodsOrders); if (filterReturnGoodsOrders == null || filterReturnGoodsOrders.size() == 0) { @@ -251,6 +250,18 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { logger.error("丽知:售后订单(仅退款)--->U8C红字应收单,start(String startTime, String endTime)方法报错:" + e); } } + + /** + * 保存数据 + */ + public void saveData(List refundOnlyData){ + //过滤原始表 + List filterOriginalOrders = filterOriginal(refundOnlyData); + //底表存数据库 + if (filterOriginalOrders.size() != 0) { + save(filterOriginalOrders); + } + } /** * 过滤元数据底表,只过滤表头 * @@ -272,6 +283,22 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { return filterOriginal; } + /** + * returnType:0 不退货、exchangeType:0 不换货、refundInd:1 退款 + * @param rerturnGoodsOrderSearchData + * @return + */ + public List filterRefundOnly(List rerturnGoodsOrderSearchData){ + List filterRefundOnly = new ArrayList<>(); + for (RerturnGoodsOrderSearchData rerturnGoodsOrderSearchDatum : rerturnGoodsOrderSearchData) { + RerturnGoodsOrderSearchHeader header = rerturnGoodsOrderSearchDatum.getHeader(); + if("0".equals(header.getReturnType())&&"0".equals(header.getExchangeType())&&"1".equals(header.getRefundInd())){ + filterRefundOnly.add(rerturnGoodsOrderSearchDatum); + } + } + return filterRefundOnly; + } + /** * 单据号+skuCode * 过滤成功日志,并且过滤子表退款金额==0的数据