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 1548f42e..f210d423 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 @@ -161,7 +161,23 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO(); queryReturnOrderRequestVO.setRefundedAt_start(startTimeStr); queryReturnOrderRequestVO.setRefundedAt_end(endTimeStr); -// queryOfsOnlyReturnOrders(queryReturnOrderRequestVO); + List returnGoodsOrders = queryOfsOnlyReturnOrders(queryReturnOrderRequestVO); + if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) { + return; + } + //过滤原始表 + List filterOriginalOrders = filterOriginal(returnGoodsOrders); + //底表存数据库 + if (filterOriginalOrders.size() != 0) { + save(filterOriginalOrders); + } + //过滤日志 + List filterReturnGoodsOrders = filterData(returnGoodsOrders); + if (filterReturnGoodsOrders == null || filterReturnGoodsOrders.size() == 0) { + return; + } + //推送 + implement(filterReturnGoodsOrders); } catch (Exception e) { @@ -202,6 +218,39 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { } } + public void start(String startTime, String endTime) { + try { + Date business_start = DateUtil.parse(startTime); + Date business_end = DateUtil.parse(endTime); + String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00"; + String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59"; + + QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO(); + queryReturnOrderRequestVO.setRefundedAt_start(start); + queryReturnOrderRequestVO.setRefundedAt_end(end); + List returnGoodsOrders = queryOfsOnlyReturnOrders(queryReturnOrderRequestVO); + if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) { + return; + } + //过滤原始表 + List filterOriginalOrders = filterOriginal(returnGoodsOrders); + //底表存数据库 + if (filterOriginalOrders.size() != 0) { + save(filterOriginalOrders); + } + //过滤日志 + List filterReturnGoodsOrders = filterData(returnGoodsOrders); + if (filterReturnGoodsOrders == null || filterReturnGoodsOrders.size() == 0) { + return; + } + //推送 + implement(filterReturnGoodsOrders); + + + } catch (Exception e) { + logger.error("丽知:售后订单(仅退款)--->U8C红字应收单,start(String startTime, String endTime)方法报错:" + e); + } + } /** * 过滤元数据底表,只过滤表头 * @@ -223,24 +272,6 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { return filterOriginal; } - public void start(String startTime, String endTime) { - try { - Date business_start = DateUtil.parse(startTime); - Date business_end = DateUtil.parse(endTime); - String start = DateUtil.format(business_start, "yyyy-MM-dd") + " 00:00:00"; - String end = DateUtil.format(business_end, "yyyy-MM-dd") + " 23:59:59"; - - QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO(); - queryReturnOrderRequestVO.setRefundedAt_start(start); - queryReturnOrderRequestVO.setRefundedAt_end(end); -// queryOfsOnlyReturnOrders(queryReturnOrderRequestVO); - - - } catch (Exception e) { - logger.error("丽知:售后订单(仅退款)--->U8C红字应收单,start(String startTime, String endTime)方法报错:" + e); - } - } - /** * 单据号+skuCode * 过滤成功日志,并且过滤子表退款金额==0的数据 @@ -380,6 +411,10 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { for (RerturnGoodsOrderSearchDetails ofsDetail : ofsDetails) { ArapDjzbVO.Childrenn childrenn = new ArapDjzbVO.Childrenn(); + + //ddh 订单号 + childrenn.setDdh(ofsDetail.getReturnOrderCode()); + //cinventoryid 存货 childrenn.setCinventoryid(ofsDetail.getSkuCode()); //jfbbje jfybje 借方本币金额/借方原币金额