From 031cb1fdfe4b5094feb00b80672cad13b9c39232 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Thu, 27 Apr 2023 09:48:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feature=201.=E5=88=AA=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GroupCommodityCodeController.java | 29 +++++++++---------- .../service/impl/SDEnregyServiceImpl.java | 21 ++++++++++++-- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java index a486a7f4..0522be48 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/commodity/controller/GroupCommodityCodeController.java @@ -31,7 +31,6 @@ import javax.annotation.Resource; import java.io.IOException; import java.util.List; import java.util.Map; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import java.util.stream.Collectors; @@ -164,20 +163,20 @@ public class GroupCommodityCodeController { reqBO.setUUID(baseService.getGenerateShotKey()); reqBOList.add(reqBO); } - - int index = 0; - List> partition = Lists.partition(reqBOList, 200); - for (List mdmGmfxxtbReqBOS : partition) { - List> completableFutureList = Lists.newArrayList(); - for (MdmGmfxxtbReqBO reqBO : mdmGmfxxtbReqBOS) { - CompletableFuture voidCompletableFuture = CompletableFuture.supplyAsync(()->{ - String str = buyerMessageService(reqBO); - return str; - }, voucherTaskExecutor); - completableFutureList.add(voidCompletableFuture); - } - CompletableFuture.allOf(completableFutureList.toArray(new CompletableFuture[0])).join(); - } + String service = sdEnregyService.syncBuyerMessageService(reqBOList); +// int index = 0; +// List> partition = Lists.partition(reqBOList, 200); +// for (List mdmGmfxxtbReqBOS : partition) { +// List> completableFutureList = Lists.newArrayList(); +// for (MdmGmfxxtbReqBO reqBO : mdmGmfxxtbReqBOS) { +// CompletableFuture voidCompletableFuture = CompletableFuture.supplyAsync(()->{ +// String str = buyerMessageService(reqBO); +// return str; +// }, voucherTaskExecutor); +// completableFutureList.add(voidCompletableFuture); +// } +// CompletableFuture.allOf(completableFutureList.toArray(new CompletableFuture[0])).join(); +// } return R.ok().put("data",""); } catch (IOException e) { throw new RuntimeException(e); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index 00dc696d..3987bf0c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -559,7 +559,12 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { @Override public String syncMdmGroupTaxService(List taxxtbReqBOS){ - AjaxResult syncResult = this.syncMdmGroupTax(taxxtbReqBOS,null); + AjaxResult syncResult = null; + try { + syncResult = this.syncMdmGroupTax(taxxtbReqBOS,null); + } catch (Exception e) { + throw new RuntimeException(e); + } if (syncResult.isSuccess()) { return ""; } else { @@ -570,7 +575,12 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { @Override public String syncBuyerMessageService(List mdmGmfxxtbReqBOS){ - AjaxResult syncResult = this.syncBuyerMessage(mdmGmfxxtbReqBOS,null); + AjaxResult syncResult = null; + try { + syncResult = this.syncBuyerMessage(mdmGmfxxtbReqBOS,null); + } catch (Exception e) { + throw new RuntimeException(e); + } if (syncResult.isSuccess()) { return ""; } else { @@ -715,7 +725,12 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { @Override public String syncMdmUserService(List mdmSyncUserReqBO){ - AjaxResult syncResult = this.syncMdmUser(mdmSyncUserReqBO,null); + AjaxResult syncResult = null; + try { + syncResult = this.syncMdmUser(mdmSyncUserReqBO,null); + } catch (Exception e) { + throw new RuntimeException(e); + } if (syncResult.isSuccess()) { return ""; } else { From 667cfa7a54c228191002d58d5ce6385d74a5af64 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Fri, 28 Apr 2023 15:11:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feature=201.MDM=E5=90=8C=E6=AD=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/service/impl/SDEnregyServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java index 3987bf0c..512c46fe 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/SDEnregyServiceImpl.java @@ -321,7 +321,13 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { commodityCodeEntity.setDataSource("4"); //matchCommodityCode(commodityCodeEntity); List ids = commodityCodeEntities.stream().map(t -> t.getId()).collect(Collectors.toList()); - commodityMapper.batchUpdateCommodity(commodityCodeEntity,ids); + int updateCommodity = commodityMapper.batchUpdateCommodity(commodityCodeEntity, ids); + if (updateCommodity > 0) { + commodityCodeEntity.setSuccess(true); + } else { + commodityCodeEntity.setSuccess(false); + } + list.add(commodityCodeEntity); }else{ // 2.如果未匹配到，再去根据物料编码匹配 commodityCodeEntity.setXmmc(reqBO.getDESC1()); // 商品名称 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 3/3] =?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);