From 19bf496ec597881a379025418d6f16c69c4fb1a2 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 24 Apr 2023 15:15:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feature=EF=BC=9Anacos=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-consumer/src/main/resources/bootstrap-std.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/order-management-consumer/src/main/resources/bootstrap-std.yaml b/order-management-consumer/src/main/resources/bootstrap-std.yaml index 662e9c2b..8939de2d 100644 --- a/order-management-consumer/src/main/resources/bootstrap-std.yaml +++ b/order-management-consumer/src/main/resources/bootstrap-std.yaml @@ -57,6 +57,8 @@ spring: discovery: # Nacos discovery 服务地址 server-addr: nacos-1.itax.local:33000 + username: nacos + password: FaP!a0_NacOs #sentinel配置相关 sentinel: #sentinel是否开启控制 From eb087ffd3b10bbc649d1acdbbcbc5df827705692 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Mon, 24 Apr 2023 15:31:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E6=99=BA=E8=83=BD=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommonInterfaceServiceImpl.java | 76 ++++++++++--------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java index 5e7b0ffc..94e650e6 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java @@ -575,45 +575,50 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { pply = "智能匹配"; // ③　若通过集团物料库仍未匹配到税编信息则，使用“物料名称”进行智能赋码开票（用SAAS接口赋码） // 智能赋码接口 - Map paramMap = new HashMap<>(); - paramMap.put("parameter", item.getXmmc()); - List taxClassList = taxClassCodeMapper.selectTaxClassCode(paramMap); - if (CollectionUtils.isNotEmpty(taxClassList)) { - TaxClassCodeEntity taxClassCodeEntity = taxClassList.get(0); - //商品编码 - if (StringUtils.isBlank(item.getSpbm()) && StringUtils.isNotBlank(taxClassCodeEntity.getSpbm())) { - item.setSpbm(taxClassCodeEntity.getSpbm()); - } - - //优惠政策标识 - if (StringUtils.isBlank(item.getYhzcbs())) { - item.setYhzcbs(ConfigureConstant.STRING_0); - } - //零税率标识 - if (StringUtils.isBlank(item.getLslbs())) { - item.setLslbs(""); - } - //增值税特殊管理 - if (StringUtils.isBlank(item.getZzstsgl())) { - item.setZzstsgl(""); - } - - //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 - String spmc = item.getXmmc(); - StringBuilder stringBuilder = new StringBuilder(); - if (StringUtils.isBlank(spmc)) { - spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(taxClassCodeEntity.getSpmc()).toString(); - } else if (StringUtil.checkStr(spmc, taxClassCodeEntity.getSpjc())) { - spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(spmc).toString(); - } - item.setXmmc(spmc); - }else { - log.error("{}{}",LOGGER_MSG,OrderInfoContentEnum.INVOICE_SPBM_MATCH_NULL.getMessage()); + if(StrUtil.isNotBlank(item.getXmmc())){ + Map paramMap = new HashMap<>(); + paramMap.put("parameter", item.getXmmc()); + List taxClassList = taxClassCodeMapper.selectTaxClassCode(paramMap); + if (CollectionUtils.isNotEmpty(taxClassList)) { + TaxClassCodeEntity taxClassCodeEntity = taxClassList.get(0); + //商品编码 + if (StringUtils.isBlank(item.getSpbm()) && StringUtils.isNotBlank(taxClassCodeEntity.getSpbm())) { + item.setSpbm(taxClassCodeEntity.getSpbm()); + } + + //优惠政策标识 + if (StringUtils.isBlank(item.getYhzcbs())) { + item.setYhzcbs(ConfigureConstant.STRING_0); + } + //零税率标识 + if (StringUtils.isBlank(item.getLslbs())) { + item.setLslbs(""); + } + //增值税特殊管理 + if (StringUtils.isBlank(item.getZzstsgl())) { + item.setZzstsgl(""); + } + log.debug("{}项目名称:{},智能赋码成功,匹配到税编:{}",LOGGER_MSG,item.getXmmc(),item.getSpbm()); + //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 + String spmc = item.getXmmc(); + StringBuilder stringBuilder = new StringBuilder(); + if (StringUtils.isBlank(spmc)) { + spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(taxClassCodeEntity.getSpmc()).toString(); + } else if (StringUtil.checkStr(spmc, taxClassCodeEntity.getSpjc())) { + spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(spmc).toString(); + } + item.setXmmc(spmc); + }else { + log.debug("{}项目名称:{},智能赋码未匹配到税编",LOGGER_MSG,item.getXmmc()); /*errorStr.append(indexStr) .append(ConfigureConstant.STRING_UNDERLINE) .append(OrderInfoContentEnum.INVOICE_SPBM_MATCH_NULL.getMessage()) .append("\r\n");*/ + } + }else{ + log.debug("{}项目名称为空,智能赋码失败",LOGGER_MSG); } + } }else { item.setZnfm(ConfigureConstant.STRING_0); // 公司库匹配到即非智能赋码；其他情况均为智能赋码 @@ -621,12 +626,13 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService { // 如果没有找到，记录异常 if (commodityCodeEntity == null) { - log.error("{}根据商品名称查询到的商品为空,商品名称：{}", LOGGER_MSG, item.getXmmc()); + log.debug("{}根据物料编码在公司库和集团库未匹配到税编", LOGGER_MSG); /*errorStr.append(indexStr) .append(ConfigureConstant.STRING_UNDERLINE) .append(OrderInfoContentEnum.INVOICE_SPBM_QUERY_NULL.getMessage()) .append("\r\n");*/ } else { + log.debug("{}根据物料编码在公司库或集团库匹配到了税编,开始补全明细", LOGGER_MSG); // 如果找到记录，进行赋值匹配 // 判断是否推送了物料的名称、单位、规格型号信息 //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 From d3e4dfca6c64b73475fce20c81c0d3ffb0f687d0 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Mon, 24 Apr 2023 16:57:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=A3=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=88=90=E5=93=81=E6=B2=B9=E6=B7=B7=E5=BC=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validate/service/impl/ValidateOrderInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java index b6b4c520..071912a1 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java @@ -300,13 +300,13 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService { } } - - if (!isCpySpbm.equals(taxClassCodeEntity.getCpy())) { + //放到生成预制发票时校验 + /*if (!isCpySpbm.equals(taxClassCodeEntity.getCpy())) { //成品油商品编码和非成品油商品编码混开 log.error("{}发票只能为成品油或者非成品油", LOGGER_MSG); checkResultMap = CheckParamUtil.generateErrorMap(orderInfo.getFpqqlsh(), errorMsgString, OrderInfoContentEnum.ORDER_SPBM_CPY_ERROR); return checkResultMap; - } + }*/ } From 60e06d2ec977260b1ede3f75282ffe33af63cf3a Mon Sep 17 00:00:00 2001 From: liufeilong Date: Mon, 24 Apr 2023 18:27:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=B2=B9=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/controller/OrderSplitController.java | 5 ++--- .../modules/order/service/impl/OrderSplitServiceImpl.java | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java index 7cb3f306..65bec3ed 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java @@ -89,7 +89,7 @@ public class OrderSplitController { return R.ok().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage()); } catch (Exception e) { log.error("{}订单拆分接口异常，异常信息:{}", LOGGER_MSG, e); - return R.error(); + return R.error(e.getMessage()); } } @@ -248,7 +248,6 @@ public class OrderSplitController { @SysLog(operation = "保存拆分订单rest接口", operationDesc = "对订单进行拆分后数据保存", key = "订单拆分") public R saveOrderInfo( @ApiParam(name = "orderInfo", value = "拆分订单的全信息") @RequestBody List commonList) { - log.info("{}页面订单信息录入的接口，commonOrder:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList)); try { log.info("{}页面订单信息录入的接口，前端传入的参数commonList:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList)); orderSplitService.splitOrder(commonList); @@ -259,7 +258,7 @@ public class OrderSplitController { return R.error().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage()); } catch (Exception e) { return R.error().put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()) - .put(OrderManagementConstant.MESSAGE, OrderInfoContentEnum.RECEIVE_FAILD.getMessage()); + .put(OrderManagementConstant.MESSAGE, e.getMessage()); } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java index 83e36f74..29e803c5 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java @@ -329,10 +329,7 @@ public class OrderSplitServiceImpl implements OrderSplitService { continue; } - //购方是否为空、税编是否为空校验、成品油校验 - if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){ - throw new Exception("购方信息为空,请补全!"); - } + //税编是否为空校验、成品油校验 String cpy = ""; for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){ if(StrUtil.isBlank(orderItemInfo.getSpbm())){ From f5c41e7bd95e6001cfd40a2f3c94956f049ba508 Mon Sep 17 00:00:00 2001 From: liufeilong Date: Mon, 24 Apr 2023 20:04:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=95=86=E5=93=81ID=E4=B8=BA=E7=A9=BA=E6=97=B6=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E6=94=BF=E7=AD=96=E6=A0=87=E8=AF=86=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=EF=BC=9B=E5=95=86=E5=93=81ID=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ValidateInterfaceOrderServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java index 2d09b7f2..7db61e65 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java @@ -3599,7 +3599,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder } if(StringUtils.isBlank(orderItemInfo.getYhzcbs())){ if(StringUtils.isBlank(orderItemInfo.getSpId())){ - resultMapList.add(CheckParamUtil.generateErrorMap(null, errorMsg, OrderInfoContentEnum.CHECK_ISS7PRI_107186)); + //resultMapList.add(CheckParamUtil.generateErrorMap(null, errorMsg, OrderInfoContentEnum.CHECK_ISS7PRI_107186)); } }else { //优惠政策标识只能为0或1,0:不使用,1:使用 @@ -3683,7 +3683,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder resultMapList.add(checkResultMap); } if(StringUtils.isBlank(orderItemInfo.getXmmc()) && StringUtils.isBlank(orderItemInfo.getSpId())){ - resultMapList.add(CheckParamUtil.generateErrorMap(null, errorMsg, OrderInfoContentEnum.CHECK_ISS7PRI_107187)); + //resultMapList.add(CheckParamUtil.generateErrorMap(null, errorMsg, OrderInfoContentEnum.CHECK_ISS7PRI_107187)); } /*