From 45e1f1d3c2ae61b0af7677badf1954b5010c4382 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Sat, 29 Apr 2023 14:46:38 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E5=A6=82=E6=9E=9C=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E4=BF=A1=E6=81=AF=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=99=E4=BD=BF=E7=94=A8=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/service/UserInfoService.java | 3 +++ .../service/impl/UserInfoServiceImpl.java | 24 +++++++++++++++++++ .../GenerateReadyOpenOrderServiceImpl.java | 3 ++- .../openapi/api/InvoiceRestApiV6.java | 3 +++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/UserInfoService.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/UserInfoService.java index c777158e..ade1b315 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/UserInfoService.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/UserInfoService.java @@ -104,4 +104,7 @@ public interface UserInfoService { */ DeptEntity querySysDeptEntityFromUrl(String taxpayerCode, String taxpayerName, String entId); + + DeptEntity querySysDeptEntity(DeptEntity deptEntity); + } 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 9b04ad34..89446825 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 @@ -23,6 +23,7 @@ import com.dxhy.order.constant.OrderManagementConstant; import com.dxhy.order.model.R; import com.dxhy.order.utils.HttpUtils; import com.dxhy.order.utils.JsonUtils; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -437,6 +438,29 @@ public class UserInfoServiceImpl implements UserInfoService { return null; } + @Override + public DeptEntity querySysDeptEntity(DeptEntity deptEntity) { + List groupIdList = Lists.newArrayList(); + groupIdList.add(deptEntity.getDeptId()); + List entityList = groupManagementService.queryByGroupIdList(groupIdList); + if (entityList != null && entityList.size() > 0) { + //选出默认项 + Optional groupManagementEntityOptional = entityList.stream() + .filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem())) + .findFirst(); + GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.orElseGet(() -> entityList.get(0)); + deptEntity.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()); + } + return deptEntity; + } + public UserEntity ssoUserTransUserEntity(SsoUser ssoUser) { UserEntity userEntity = new UserEntity(); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index 433bc1ed..3f83b034 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -462,13 +462,14 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder if (StringUtils.isBlank(customLimit)) { limit = taxDiskLimit; } else { + //不含稅 if (StringUtils.equals("0", hsbz)) { if (new BigDecimal(customLimit).compareTo(new BigDecimal(taxDiskLimit)) > 0) { throw new OrderSplitException(ConfigureConstant.STRING_9999, "自定义限额必须小于等于票种的单张开票限额"); } limit = customLimit; } else { - //计算不含税金额，将明细行所有金额和税额相加 + //计算含税金额，将明细行所有金额和税额相加 OrderInfo orderInfo = common.getOrderInfo(); String hjbhsje = orderInfo.getHjbhsje(); if (new BigDecimal(hjbhsje).compareTo(new BigDecimal(taxDiskLimit)) > 0) { 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 eeaa580d..2309e44f 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 @@ -232,6 +232,9 @@ public class InvoiceRestApiV6 { 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);