From 210eebc4e569d4d7227ff35b48e472622b071fe9 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 9 Aug 2024 09:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4TOC=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/SoSaleOutPluginInitializerToC.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 2e0d2a8b..6a75fadd 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -307,6 +307,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { BdDeptdocEntity bdDeptdocEntity = oldValue.get(0).getBdDeptdocEntity();//业务部门 BdCumandocEntity bdCumandocEntity = oldValue.get(0).getBdCumandocEntity();//客商管理档案 BdCubasdocEntity bdCubasdocEntity = oldValue.get(0).getBdCubasdocEntity();//客商基本档案 + BdDefdocEntity platformArchives = oldValue.get(0).getPlatformArchives();//U8C平台档案 try { checkArchives(oldValue.get(0)); @@ -330,7 +331,16 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { saleorderRequestParentDto.setDapprovedate(generateBusinessDate);//审核日期 saleorderRequestParentDto.setNdiscountrate("100.000000");//整单折扣 saleorderRequestParentDto.setPk_corp(bdCorpEntity.getPkCorp());//公司id - saleorderRequestParentDto.setVdef18(keyGroup);//汇总单号=汇总维度 + + //汇总单号=汇总维度 + saleorderRequestParentDto.setVdef18(keyGroup); + + //平台 + saleorderRequestParentDto.setPk_defdoc2(platformArchives.getPkDefdoc()); + saleorderRequestParentDto.setVdef2(platformArchives.getDocname()); + + //TODO 2024年8月8日 17:17:58 店铺档案自定义项1，先不传，后续维护好之后再传! + saleorderRequestDto.setParentvo(saleorderRequestParentDto); List saleorderRequestChildrenDtoList = new ArrayList<>(); @@ -406,6 +416,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { Map> stringStringMap = new HashMap<>(); stringStringMap.put("saleorder", saleorderRequestDtoList); SoSaleResultRootDto soSaleResultRootDto = sendU8CTOCOrder(JSON.toJSONString(stringStringMap)); + logger.info("销售订单编号：{} 销售公司：{}", soSaleResultRootDto.getParentvo().getVreceiptcode(), soSaleResultRootDto.getParentvo().getPk_corp()); //记录成功 } catch (Exception e) { logger.error("TOC业务转换成U8C对象过程中、或者单据推送到U8C出现异常！", e); @@ -509,6 +520,10 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { BdCumandocEntity bdCumandocEntity = BasicArchivesCacheUtil.stringBdCumandocEntityMap.get(bdCubasdocEntity.getPkCubasdoc() + bdCorpEntity.getPkCorp()); Assert.notNull(bdCumandocEntity, "无法匹配到客商档案 店铺名称：{}", "天猫intoyou旗舰店-自营"); + //查找平台 + BdDefdocEntity bdDefdocEntity = BasicArchivesCacheUtil.stringBdDefdocEntityHashMap.get(header.getSourcePlatformCode()); + Assert.notNull(bdDefdocEntity, "根据O平台编码({})无法匹配到平台", header.getSourcePlatformCode()); + //字段拷贝 for (int j = 0; j < details.size(); j++) { DetailsDto detailsDto = details.get(j); @@ -527,6 +542,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { sonDetailsDto.setBdDeptdocEntity(bdDeptdocEntity); sonDetailsDto.setBdCumandocEntity(bdCumandocEntity); sonDetailsDto.setBdCubasdocEntity(bdCubasdocEntity); + sonDetailsDto.setPlatformArchives(bdDefdocEntity); BeanUtil.copyPropertiesV2(detailsDto, sonDetailsDto); sonDetailsDtoList.add(sonDetailsDto); @@ -777,6 +793,9 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { long endLong = System.currentTimeMillis(); logger.info("TOC接口请求耗时：" + (endLong - startLong)); + JSONObject jsonObject = JSON.parseObject(result); + result = String.valueOf(jsonObject.get("attribute")); + boolean isSuccess = false; SoSaleResultRootDto soSaleResultRootDto = null; if (result != null && !"".equals(result)) { @@ -812,4 +831,6 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { } return null; } + + } \ No newline at end of file