From 955e840eb2ddc99ad9d18bba29065c014bfb56bd Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 25 Sep 2024 15:42:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=9A=E5=A4=9A=E4=B8=AA=E6=8F=92=E4=BB=B6=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=97=B6=E8=BF=94=E5=9B=9E=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更改内容： - 在多个插件初始化器中修改executeBusiness方法的返回值为BaseResult.getSuccessMessageEntity("插件执行成功") -参与修改的插件包括：CustdocAutoAllotPluginInitializer, ShopPluginInitializer, SupplierPluginInitializer等 影响： - 优化了插件执行成功的反馈机制，统一了返回的成功消息格式 --- .../CustdocAutoAllotPluginInitializer.java | 3 +- .../plugin/base/ShopPluginInitializer.java | 11 ++-- .../base/SupplierPluginInitializer.java | 5 +- .../plugin/outsourc/ConsignmachiningIn.java | 3 +- .../outsourc/ConsignmachiningInReturn.java | 3 +- .../plugin/purchase/ProxyPurchaseReturn.java | 3 +- .../purchase/ProxyPurchaseWarehousOrder.java | 3 +- .../ProxyPurchaseWarehousWarehouse.java | 3 +- .../sales/RefundOnlyPluginInitializer.java | 55 ++++++++++--------- .../sales/SoSaleOutPluginInitializerToB.java | 3 +- .../sales/SoSaleOutPluginInitializerToC.java | 3 +- .../SoSaleReturnPluginInitializerToB.java | 5 +- .../SoSaleReturnPluginInitializerToC.java | 3 +- 13 files changed, 58 insertions(+), 45 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java index 874084cc..7dfe7fc1 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/CustdocAutoAllotPluginInitializer.java @@ -24,6 +24,7 @@ import com.hzya.frame.plugin.lets.util.pushData.ZTResult; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OfsShopDto; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -113,7 +114,7 @@ public class CustdocAutoAllotPluginInitializer extends PluginBaseEntity { } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) { start(); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java index 0fe8ddea..200cde7a 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java @@ -25,6 +25,7 @@ import com.hzya.frame.ttxofs.dto.InterfaceParamByU8CApiDto; import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OfsShopDto; import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OfsShopReturnMessageDto; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -126,7 +127,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) { startImplement(); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } @@ -217,7 +218,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { Assert.notNull(shopEntityList, "shopEntityList不能为空"); String businessFormat = null; for (OfsShopDto shopEntity : shopEntityList) { - businessFormat=shopEntity.getLastUpdated(); + businessFormat = shopEntity.getLastUpdated(); String response = ""; try { String lastUpdated = shopEntity.getLastUpdated(); @@ -301,7 +302,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { String businessFormat = null; for (OfsShopDto shopEntity : shopEntityList) { String response = ""; - businessFormat=shopEntity.getLastUpdated(); + businessFormat = shopEntity.getLastUpdated(); try { DefdocRequestVo defdocRequestVo = new DefdocRequestVo(); @@ -352,7 +353,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); integrationTaskLivingDetailsEntity.setRootAppPk("defdoc_" + shopEntity.getBizCode()); - integrationTaskLivingDetailsEntity.setRootAppBill("defdoc_" +shopEntity.getBizCode()); + integrationTaskLivingDetailsEntity.setRootAppBill("defdoc_" + shopEntity.getBizCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -367,7 +368,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); integrationTaskLivingDetailsEntity.setRootAppPk("defdoc_" + shopEntity.getBizCode()); - integrationTaskLivingDetailsEntity.setRootAppBill("defdoc_" +shopEntity.getBizCode()); + integrationTaskLivingDetailsEntity.setRootAppBill("defdoc_" + shopEntity.getBizCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java index 81cb8451..496155c5 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java @@ -27,6 +27,7 @@ import com.hzya.frame.ttxofs.dto.InterfaceParamByU8CApiDto; import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OfsSupplierDto; import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OfsSupplierReturnMessageDto; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -125,7 +126,7 @@ public class SupplierPluginInitializer extends PluginBaseEntity { } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) { startImplement(); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } @@ -211,7 +212,7 @@ public class SupplierPluginInitializer extends PluginBaseEntity { //业务时间 String businessFormat = null; for (OfsSupplierDto supplierEntity : shopEntityList) { - businessFormat=supplierEntity.getLastUpdated(); + businessFormat = supplierEntity.getLastUpdated(); CustdocEntityDto parentvo = new CustdocEntityDto(); BankVo bankVo = new BankVo(); CustdocRequestVo CustdocEntityDto = new CustdocRequestVo(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java index 6c784b0e..4e852aba 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java @@ -24,6 +24,7 @@ import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderData; import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderDetails; import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderHeader; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -187,7 +188,7 @@ public class ConsignmachiningIn extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } /** diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java index 9fd2592f..6a982005 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java @@ -29,6 +29,7 @@ import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.DetailsDto; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -189,7 +190,7 @@ public class ConsignmachiningInReturn extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } /** diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java index c623fce3..e1102bc2 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java @@ -29,6 +29,7 @@ import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.web.exception.BaseSystemException; import org.slf4j.Logger; @@ -185,7 +186,7 @@ public class ProxyPurchaseReturn extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } /** diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java index 5660e4e3..65166f4c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java @@ -25,6 +25,7 @@ import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderDetails; import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderHeader; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -180,7 +181,7 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } /** diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java index 2b9130a0..df27a3f7 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java @@ -23,6 +23,7 @@ import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderDetails; import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderHeader; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -183,7 +184,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } /** 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 c0526933..1548f42e 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 @@ -34,6 +34,7 @@ import com.hzya.frame.ttxofs.dto.returngoodordersearch.RerturnGoodsOrderSearchDe import com.hzya.frame.ttxofs.dto.returngoodordersearch.RerturnGoodsOrderSearchHeader; import com.hzya.frame.ttxofs.dto.returngoodordersearch.RerturnGoodsOrderSearchJsonRootBean; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -145,7 +146,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } public void start() { @@ -250,13 +251,13 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { RerturnGoodsOrderSearchHeader header = returnGoodsOrder.getHeader(); - List filterDetails=new ArrayList<>(); + List filterDetails = new ArrayList<>(); List details = returnGoodsOrder.getDetails(); for (RerturnGoodsOrderSearchDetails detail : details) { - if(detail.getTotalAmount()==null||"0".equals(detail.getTotalAmount())||0==Double.parseDouble(detail.getTotalAmount())){ + if (detail.getTotalAmount() == null || "0".equals(detail.getTotalAmount()) || 0 == Double.parseDouble(detail.getTotalAmount())) { continue; } - String rootAppPk = header.getCode()+"_"+detail.getSkuCode(); + String rootAppPk = header.getCode() + "_" + detail.getSkuCode(); boolean isExis = true; IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); integrationTaskLivingDetailsEntity.setRootAppPk(rootAppPk); @@ -270,9 +271,9 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { filterDetails.add(detail); } } - if(filterDetails.size()==0){ + if (filterDetails.size() == 0) { continue; - }else { + } else { returnGoodsOrder.setDetails(filterDetails); filterReturnGoodsOrders.add(returnGoodsOrder); } @@ -301,7 +302,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { String deptCode = "002"; if (ofsSaleOrder != null) { // Assert.state(false,"根据仅退款：{}，查询销售订单：{}，失败！未查询到对应销售订单",filterReturnGoodsOrder.getHeader().getCode(),refOrderCode); - if(ofsSaleOrder.getData().get(0).getHeader().getDepartmentType()!=null&&!"".equals((ofsSaleOrder.getData().get(0).getHeader().getDepartmentType()))){ + if (ofsSaleOrder.getData().get(0).getHeader().getDepartmentType() != null && !"".equals((ofsSaleOrder.getData().get(0).getHeader().getDepartmentType()))) { deptCode = ofsSaleOrder.getData().get(0).getHeader().getDepartmentType(); } } @@ -311,8 +312,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { } //分组：公司+店铺+部门+单据日期,仅退款没有仓库，固不去 - Map> collect = - allHeader.stream().collect(Collectors.groupingBy(index -> index.getCompanyCode() + "_" + index.getStoreCode() + "_" + index.getSaleDeptCode() + "_" + index.getCreated().substring(0,10))); + Map> collect = allHeader.stream().collect(Collectors.groupingBy(index -> index.getCompanyCode() + "_" + index.getStoreCode() + "_" + index.getSaleDeptCode() + "_" + index.getCreated().substring(0, 10))); collect.forEach((k, v) -> { String[] split = k.split("_");//[0]公司 [1]店铺 [2]部门 [3]单据日期 @@ -324,7 +324,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { // String ofsCode = v.get(0).getCode(); // String ofsId = v.get(0).getId(); //日志记录使用 - List logDetails=new ArrayList<>(); + List logDetails = new ArrayList<>(); try { ArapDjzbVO arapDjzbVO = new ArapDjzbVO(); @@ -366,11 +366,11 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { parentvo.setZyx3("SALES"); //子表,需要通过多个主表的id找到多个子表,且退货金额==0的不要 - List children=new ArrayList<>(); - List ofsDetails=new ArrayList<>(); + List children = new ArrayList<>(); + List ofsDetails = new ArrayList<>(); for (RerturnGoodsOrderSearchHeader rerturnGoodsOrderSearchHeader : v) { - allDetail.stream().forEach(index->{ - if(rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode())&&index.getTotalAmount()!=null&&!"0".equals(index.getTotalAmount())){ + allDetail.stream().forEach(index -> { + if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) { ofsDetails.add(index); } }); @@ -383,16 +383,16 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { //cinventoryid 存货 childrenn.setCinventoryid(ofsDetail.getSkuCode()); //jfbbje jfybje 借方本币金额/借方原币金额 - childrenn.setJfbbje("-"+ofsDetail.getTotalAmount()); - childrenn.setJfybje("-"+ofsDetail.getTotalAmount()); + childrenn.setJfbbje("-" + ofsDetail.getTotalAmount()); + childrenn.setJfybje("-" + ofsDetail.getTotalAmount()); //jfbbsj jfybsj 借方本币税金/借方原币税金 默认（0.13） - BigDecimal sj=new BigDecimal(ofsDetail.getTotalAmount()).multiply(new BigDecimal(0.13)).setScale(2, RoundingMode.FLOOR); - childrenn.setJfbbsj("-"+String.valueOf(sj)); - childrenn.setJfybsj("-"+String.valueOf(sj)); + BigDecimal sj = new BigDecimal(ofsDetail.getTotalAmount()).multiply(new BigDecimal(0.13)).setScale(2, RoundingMode.FLOOR); + childrenn.setJfbbsj("-" + String.valueOf(sj)); + childrenn.setJfybsj("-" + String.valueOf(sj)); //wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 - BigDecimal ws=new BigDecimal(ofsDetail.getTotalAmount()).subtract(sj); - childrenn.setWbfbbje("-"+ws); - childrenn.setJfybwsje("-"+ws); + BigDecimal ws = new BigDecimal(ofsDetail.getTotalAmount()).subtract(sj); + childrenn.setWbfbbje("-" + ws); + childrenn.setJfybwsje("-" + ws); //zyx4 平台优惠 childrenn.setZyx4(String.valueOf(ofsDetail.getShareTargetPlatformDiscounts())); //zyx5 支付优惠 @@ -407,7 +407,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { arapDjzbVO.setParentvo(parentvo); arapDjzbVO.setChildren(children); System.out.println(arapDjzbVO); - mapStr="{\"djzbvo\":["+ JSONUtil.toJsonStr(arapDjzbVO) +"]}"; + mapStr = "{\"djzbvo\":[" + JSONUtil.toJsonStr(arapDjzbVO) + "]}"; System.out.println(mapStr); //推送 @@ -443,7 +443,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewTransmitInfo(response); integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(format); - integrationTaskLivingDetailsEntity.setRootAppPk(ofsDetail.getReturnOrderCode()+"_"+ofsDetail.getSkuCode()); + integrationTaskLivingDetailsEntity.setRootAppPk(ofsDetail.getReturnOrderCode() + "_" + ofsDetail.getSkuCode()); integrationTaskLivingDetailsEntity.setRootAppBill(ofsDetail.getReturnOrderCode());//仅退款单号 integrationTaskLivingDetailsEntity.setNewSystemNumber(djbh); integrationTaskLivingDetailsEntity.setNewSystemPrimary(vouchid); @@ -456,10 +456,10 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { //失败 ReusltStrDto reusltStrDto = JSON.parseObject(response, ReusltStrDto.class); - String ErrMessage=""; + String ErrMessage = ""; if (reusltStrDto != null) { ErrMessage = "推送U8C，丽知：OFS调整入库(组装入库)--->U8C组装订单失败，失败原因：" + reusltStrDto.getErrormsg(); - }else { + } else { ErrMessage = "推送U8C，丽知：OFS调整入库(组装入库)--->U8C组装订单失败，失败原因：" + e.getMessage(); } //失败 批量新增 ofsDetails @@ -470,7 +470,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage); integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(format); - integrationTaskLivingDetailsEntity.setRootAppPk(logDetail.getReturnOrderCode()+"_"+logDetail.getSkuCode()); + integrationTaskLivingDetailsEntity.setRootAppPk(logDetail.getReturnOrderCode() + "_" + logDetail.getSkuCode()); integrationTaskLivingDetailsEntity.setRootAppBill(logDetail.getReturnOrderCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -642,6 +642,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity { } return all; } + private ArapDjzb resultDataHandle(String resultData) { try { if (resultData != null && !"".equals(resultData)) { diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java index aeb2ec9e..20336621 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java @@ -29,6 +29,7 @@ import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDetailsDto; import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.HeaderDto; import com.hzya.frame.ttxofs.dto.ofssalesordersearch.SaleOrderMessageDto; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -160,7 +161,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } @Autowired 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 e1808124..3a6ddaed 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 @@ -33,6 +33,7 @@ import com.hzya.frame.ttxofs.dto.ofssalesordersearch.SaleOrderMessageDto; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; import com.hzya.frame.u8c.ax.entity.Ass; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import com.hzya.frame.web.exception.BaseSystemException; import org.slf4j.Logger; @@ -154,7 +155,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } @Autowired diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java index 45c40e9c..20a557a6 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java @@ -35,6 +35,7 @@ import com.hzya.frame.ttxofs.dto.returngoodordersearch.RerturnGoodsOrderSearchDe import com.hzya.frame.ttxofs.dto.returngoodordersearch.RerturnGoodsOrderSearchHeader; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -150,7 +151,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } @Autowired @@ -321,7 +322,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { long startMillis = System.currentTimeMillis(); String threadNameStrStart = StrUtil.format("OFS售后入库(TOB)同步U8C销售订单(库存同步) 售后入库单号：{}", code); logger.info(threadNameStrStart); - + Assert.notNull(code, "code不能为空"); //生成一个时间范围 // StartAndEndVo startAndEndVo = offsetTimeTime.offsetTime(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java index e32e9ecf..afd9ea12 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java @@ -33,6 +33,7 @@ import com.hzya.frame.ttxofs.dto.returngoodordersearch.RerturnGoodsOrderSearchHe import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; import com.hzya.frame.u8c.ax.entity.Ass; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -145,7 +146,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { logger.error("thread.join();抛出异常", e); } } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } @Autowired