From c06610b90c1fa819fc27bb3fee77e3244c461b9c Mon Sep 17 00:00:00 2001 From: zhengyf Date: Sat, 14 Dec 2024 15:15:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A1=E3=80=81toc/tob?= =?UTF-8?q?=E4=BB=85=E9=80=80=E6=AC=BE=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=97=AE=E9=A2=98=EF=BC=8823=EF=BC=9A59?= =?UTF-8?q?=EF=BC=9A59=E5=8F=96=E4=B8=8D=E5=88=B0=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/RefundOnlyPluginInitializerToB.java | 18 +++---- .../sales/RefundOnlyPluginInitializerToC.java | 50 ++++++++++--------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java index 5f6d378a..7376a954 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java @@ -58,6 +58,7 @@ import java.util.stream.Collectors; * refundInd:1 退款 *

* 按天推送 + * 因为ofs 的接口查询限制原因>= < 故取2024-12-12当天单据时 : 2024-12-12 00:00:00 / 2024-12-13 00:00:00 ，单据日期为12-12丹当天的所有数据，tmdofs * * @Date：2024/9/21 17:19 */ @@ -163,8 +164,8 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { String previousDay = today.minusDays(1).toString(); QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO(); - queryReturnOrderRequestVO.setRefundedAt_start(previousDay+" 00:00:00"); - queryReturnOrderRequestVO.setRefundedAt_end(previousDay+" 23:59:59"); + queryReturnOrderRequestVO.setRefundedAt_start(previousDay + " 00:00:00"); + queryReturnOrderRequestVO.setRefundedAt_end(today + " 00:00:00"); List returnGoodsOrders = queryOfsOnlyReturnOrders(queryReturnOrderRequestVO); if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) { return; @@ -224,16 +225,15 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { /** * 退款时间区间 - * - * @param startTime - * @param endTime */ 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"; + LocalDate start_parse = LocalDate.parse(startTime); + LocalDate end_parse = LocalDate.parse(endTime).plusDays(1); + + String start = start_parse + " 00:00:00"; + String end = end_parse + " 00:00:00"; + QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO(); queryReturnOrderRequestVO.setRefundedAt_start(start); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java index 772f8958..7eac29cf 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java @@ -48,6 +48,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -60,6 +61,7 @@ import java.util.stream.Collectors; * refundInd:1 退款 *

* 按天推送 + * 因为ofs 的接口查询限制原因>= < 故取2024-12-12当天单据时 : 2024-12-12 00:00:00 / 2024-12-13 00:00:00 ，单据日期为12-12丹当天的所有数据，tmdofs * * @Date：2024/9/21 17:19 */ @@ -165,8 +167,8 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { String previousDay = today.minusDays(1).toString(); QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO(); - queryReturnOrderRequestVO.setRefundedAt_start(previousDay+" 00:00:00"); - queryReturnOrderRequestVO.setRefundedAt_end(previousDay+" 23:59:59"); + queryReturnOrderRequestVO.setRefundedAt_start(previousDay + " 00:00:00"); + queryReturnOrderRequestVO.setRefundedAt_end(today + " 00:00:00"); List returnGoodsOrders = queryOfsOnlyReturnOrders(queryReturnOrderRequestVO); if (returnGoodsOrders == null || returnGoodsOrders.size() == 0) { return; @@ -226,16 +228,15 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { /** * 退款时间区间 - * - * @param startTime - * @param endTime */ 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"; + + LocalDate start_parse = LocalDate.parse(startTime); + LocalDate end_parse = LocalDate.parse(endTime).plusDays(1); + + String start = start_parse + " 00:00:00"; + String end = end_parse + " 00:00:00"; QueryReturnOrderRequestVO queryReturnOrderRequestVO = new QueryReturnOrderRequestVO(); queryReturnOrderRequestVO.setRefundedAt_start(start); @@ -307,7 +308,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { 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())&&("300".equals(header.getReturnNode())||"200".equals(header.getReturnNode()))) { + if ("0".equals(header.getReturnType()) && "0".equals(header.getExchangeType()) && "1".equals(header.getRefundInd()) && ("300".equals(header.getReturnNode()) || "200".equals(header.getReturnNode()))) { filterRefundOnly.add(rerturnGoodsOrderSearchDatum); } } @@ -324,7 +325,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { RerturnGoodsOrderSearchHeader header = returnGoodsOrder.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if("NMNS".equals(header.getCompanyCode())||"YNS".equals(header.getCompanyCode())||"HJ".equals(header.getCompanyCode())){ + if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { continue; } @@ -421,13 +422,13 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { parentvo.setWldx("0"); //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); - if(entity==null){ - Assert.state(false,"根据客商自定义项1：{},未查询到客商基本档案，请假查。",split[1]); + if (entity == null) { + Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); } parentvo.setHbbm(entity.getCustcode()); //根据店铺区分tob、toc,区分业务流程 String s = checkFlow(parentvo, split[1]); - if("TOB".equals(s)){ + if ("TOB".equals(s)) { continue; } //deptid 部门 @@ -474,7 +475,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { //20241127：没有sku编码的过滤 r1.clear(); for (RerturnGoodsOrderSearchDetails logDetail : logDetails) { - if(logDetail.getSkuCode()==null||"".equals(logDetail.getSkuCode())) { + if (logDetail.getSkuCode() == null || "".equals(logDetail.getSkuCode())) { continue; // IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); // integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); @@ -486,11 +487,11 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { // integrationTaskLivingDetailsEntity.setRootAppBill(logDetail.getReturnOrderCode()); // integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); // saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); - }else { + } else { r1.add(logDetail); } } - if(r1.size()==0){ + if (r1.size() == 0) { continue; } @@ -605,7 +606,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setBusinessDate(format); integrationTaskLivingDetailsEntity.setRootAppPk(ofsDetail.getReturnOrderCode() + "_" + ofsDetail.getSkuCode()); integrationTaskLivingDetailsEntity.setRootAppBill(ofsDetail.getReturnOrderCode());//仅退款单号 - integrationTaskLivingDetailsEntity.setNewSystemNumber(split[0]+"_"+djbh); + integrationTaskLivingDetailsEntity.setNewSystemNumber(split[0] + "_" + djbh); integrationTaskLivingDetailsEntity.setNewSystemPrimary(vouchid); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -665,10 +666,11 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { /** * 公司转换 + * * @param allHeader */ - public void transCorp(List allHeader){ - if(allHeader.size()==0){ + public void transCorp(List allHeader) { + if (allHeader.size() == 0) { return; } @@ -680,20 +682,22 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { * TOC仅退款:JTK TOB仅退款:BJTK * parentvo.setXslxbm("JTK"); * 非b及c + * * @param parentvo * @param shop */ @Autowired private ShopTobOrToCUtil shopTobOrToCUtil; - public String checkFlow(ArapDjzbVO.Parentt parentvo,String shop){ + + public String checkFlow(ArapDjzbVO.Parentt parentvo, String shop) { String tobShop = shopTobOrToCUtil.getCommaShop("TOB"); String tocShop = shopTobOrToCUtil.getCommaShop("TOC"); System.out.println(tobShop); System.out.println(tocShop); - if(tobShop.contains(shop)){ + if (tobShop.contains(shop)) { // parentvo.setXslxbm("BJTK");//TOB return "TOB"; - }else { + } else { // parentvo.setXslxbm("JTK");//TOC return "TOC"; }