From aeb3b04b7cefadf6aa699beb00b592e783a217fc Mon Sep 17 00:00:00 2001 From: liufeilong Date: Sat, 8 Apr 2023 10:50:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/thirdservice/user/controller/UserController.java | 2 +- .../modules/manager/service/impl/InvoiceServiceImpl.java | 5 ++++- .../openapi/service/impl/InterfaceServiceImplV6.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java index 1df0bbd6..f947ce62 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java @@ -58,7 +58,7 @@ public class UserController { public R getUserDetails() { UserInfoQuery userInfoQuery = new UserInfoQuery(); userInfoQuery.setBusinessDataType(OrderInfoEnum.ORDER_USER_INFO_BUSINESS_DATA_TYPE_2.getKey()); - userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_2.getKey()); + userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_1.getKey()); R r = userInfoService.getUserInfo(userInfoQuery); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java index dd487130..b5421f0e 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java @@ -186,7 +186,10 @@ public class InvoiceServiceImpl implements InvoiceService { List ruleSplitEntityList = ruleSplitService.queryRuleSplit(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), pageInvoiceReq.getUserId()); log.info("税号：{}，用户ID:{},查询的拆分限额信息结果：{}", commonOrderInfo.getOrderInfo().getXhfNsrsbh(), pageInvoiceReq.getUserId(), JsonUtils.getInstance().toJsonString(ruleSplitEntityList)); - String djce = ruleSplitEntityList.get(0).getDjce(); + String djce = ConfigureConstant.STRING_0; + if(ruleSplitEntityList.size() != 0){ + djce = StrUtil.isBlank(ruleSplitEntityList.get(0).getDjce())?ConfigureConstant.STRING_0:ruleSplitEntityList.get(0).getDjce(); + } BigDecimal abs = new BigDecimal(collect.get(0).getXmdj()).subtract(new BigDecimal(splitItem.getXmdj())).abs(); if (abs.compareTo(new BigDecimal(djce)) > 0) { Map map = new HashMap(); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java index aae49728..014b22ed 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java @@ -173,7 +173,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { InterfaceRequestData data = new InterfaceRequestData(); data.setId(DistributedKeyMaker.generateShotKey()); data.setYwlx(interfaceName); - data.setBatchId(poCommonRequestParam.getIS_INPUT().getBSKEY()); + data.setBatchId(poCommonRequestParam.getIS_INPUT().getSAPKEY()); data.setRequestData(param); data.setCreateTime(new Date()); interfaceRequestDataMapper.insert(data);