From 74082994c649dad6acb9c29027aa3fbaf644c2ed Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 11 May 2023 11:44:13 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E9=94=80=E6=96=B9=E7=BB=84=E7=BB=87=E5=8F=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E5=BC=80=E7=A5=A8=E7=BB=84=E7=BB=87=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=EF=BC=8C=E4=B8=8D=E5=8F=96=E5=A4=A7B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserInfoServiceImpl.java | 20 ++++++++++--------- .../openapi/api/InvoiceRestApiV6.java | 16 +++++++-------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java index a9cd3ae2..a8953e2d 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java @@ -442,6 +442,8 @@ public class UserInfoServiceImpl implements UserInfoService { public DeptEntity querySysDeptEntity(DeptEntity deptEntity) { List groupIdList = Lists.newArrayList(); groupIdList.add(deptEntity.getDeptId()); + DeptEntity deptEntityNew = new DeptEntity(); + deptEntityNew.setDeptId(deptEntity.getDeptId()); List entityList = groupManagementService.queryByGroupIdList(groupIdList); if (entityList != null && entityList.size() > 0) { //选出默认项 @@ -449,16 +451,16 @@ public class UserInfoServiceImpl implements UserInfoService { .filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())) .findFirst(); GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.orElseGet(() -> entityList.get(0)); - deptEntity.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh()); + deptEntityNew.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh()); //todo 虚拟组织：组织名称和销方名称公用此字段会有问题，后期优化 - deptEntity.setName(groupManagementEntity.getGroupName()); - deptEntity.setTaxpayerName(groupManagementEntity.getXhfMc()); - deptEntity.setTaxpayerAddress(groupManagementEntity.getXhfDz()); - deptEntity.setTaxpayerPhone(groupManagementEntity.getXhfDh()); - deptEntity.setTaxpayerBank(groupManagementEntity.getXhfYh()); - deptEntity.setTaxpayerAccount(groupManagementEntity.getXhfZh()); - deptEntity.setInvoiceName(groupManagementEntity.getXhfMc()); - deptEntity.setInvoiceNsrsbh(groupManagementEntity.getXhfNsrsbh()); + deptEntityNew.setName(groupManagementEntity.getGroupName()); + deptEntityNew.setTaxpayerName(groupManagementEntity.getXhfMc()); + deptEntityNew.setTaxpayerAddress(groupManagementEntity.getXhfDz()); + deptEntityNew.setTaxpayerPhone(groupManagementEntity.getXhfDh()); + deptEntityNew.setTaxpayerBank(groupManagementEntity.getXhfYh()); + deptEntityNew.setTaxpayerAccount(groupManagementEntity.getXhfZh()); + deptEntityNew.setInvoiceName(groupManagementEntity.getXhfMc()); + deptEntityNew.setInvoiceNsrsbh(groupManagementEntity.getXhfNsrsbh()); } return deptEntity; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java index 2309e44f..753620a1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java @@ -222,7 +222,13 @@ public class InvoiceRestApiV6 { PoCommonRequestParam poCommonRequestParam = JsonUtils.getInstance().parseObject(reqStr, PoCommonRequestParam.class); Map zData = JsonUtils.getInstance().parseObject(poCommonRequestParam.getIS_INPUT().getZDATA(), Map.class); DeptEntity deptEntity = userInfoService.querySysDeptEntityByEnterpriseNumbers(zData.get("BUKRS").toString()); - if(ObjectUtil.isNull(deptEntity)){ + if(ObjectUtil.isNotNull(deptEntity) && StringUtils.isNotBlank(deptEntity.getDeptId())){ + deptEntity = userInfoService.querySysDeptEntity(deptEntity); + DdpcxxReqBO ddpcxxReq = BeanTransitionUtils.transitionPoKpReq(poCommonRequestParam,deptEntity); + DdpcxxRspV5 ddpcxxRspV5 = interfaceServiceV6.generateQdInvoiceV6(ddpcxxReq, secretId, null); + PoCommonResponseParam poCommonResponseParam = BeanTransitionUtils.transitionPoKpResp(ddpcxxRspV5); + returnJsonString = JsonUtils.getInstance().toJsonString(poCommonResponseParam); + }else{ PoCommonResponseParam poCommonResponseParam = new PoCommonResponseParam(); EsOutput esOutput = new EsOutput(); esOutput.setBSKEY(poCommonRequestParam.getIS_INPUT().getBSKEY()); @@ -231,14 +237,6 @@ public class InvoiceRestApiV6 { esOutput.setZMESSAGE("根据公司代码未查询到对应销方"); poCommonResponseParam.setES_OUTPUT(esOutput); return JsonUtils.getInstance().toJsonString(poCommonResponseParam); - }else { - if(StringUtils.isBlank(deptEntity.getInvoiceNsrsbh()) && StringUtils.isNotBlank(deptEntity.getDeptId())){ - deptEntity = userInfoService.querySysDeptEntity(deptEntity); - } - DdpcxxReqBO ddpcxxReq = BeanTransitionUtils.transitionPoKpReq(poCommonRequestParam,deptEntity); - DdpcxxRspV5 ddpcxxRspV5 = interfaceServiceV6.generateQdInvoiceV6(ddpcxxReq, secretId, null); - PoCommonResponseParam poCommonResponseParam = BeanTransitionUtils.transitionPoKpResp(ddpcxxRspV5); - returnJsonString = JsonUtils.getInstance().toJsonString(poCommonResponseParam); } } else if (ConfigurerInfo.GETORDERINFOANDINVOICEINFO.equals(interfaceName)){ //订单和发票数据查询接口