From 90e89eb1ff17e4cf3f6222ced4a0b3ca875a0d85 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 4 Aug 2023 13:56:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature=EF=BC=9A=E5=85=A8=E7=94=B5=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=BC=80=E5=85=B7=E6=9C=AA=E6=8E=A8=E9=80=81=E5=BD=B1?= =?UTF-8?q?=E5=83=8F=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/service/impl/PushInvoiceServiceImpl.java | 7 ++++++- .../modules/order/service/impl/OrderMergeServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java index ee3836b3..48d1b826 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java @@ -1766,7 +1766,12 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { resultToyxVo.setBuyerName(orderInvoiceInfo.getGhfMc()); resultToyxVo.setSellerName(orderInvoiceInfo.getXhfMc()); String terminalCode = orderInvoiceInfo.getSksbdm(); - if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm())){ + if(OrderInfoEnum.ORDER_INVOICE_TYPE_51.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getValue().equals(orderInvoiceInfo.getFpzlDm()) + || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getValue().equals(orderInvoiceInfo.getFpzlDm()) + + ){ OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); List fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,""); if (ObjectUtil.isNotEmpty(fileDownLoadList)) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java index 0a7329b1..44da331a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderMergeServiceImpl.java @@ -981,7 +981,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { } orderItemInfo.setCreateTime(new Date()); orderItemInfo.setSe(se.toString()); - if((termType && se.subtract(taxAmount).abs().doubleValue() > 0.01) || (!termType &&se.subtract(taxAmount).abs().doubleValue() > 0.06)){ + if((termType && se.subtract(taxAmount).abs().doubleValue() > 0.01) || (!termType &&se.subtract(taxAmount).abs().doubleValue() > 0.05)){ log.info("订单id：{}合并明细误差超过额度",orderInfo.getId()); BigDecimal taxAndAmount = xmje.add(se); BigDecimal taxAmountNew = taxAndAmount.divide(new BigDecimal("1").add(taxRate),0).multiply(taxRate).setScale(2,RoundingMode.HALF_UP); From 2d0cbc48a20569cec4eb21f770cca8884e20900c Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 15 Aug 2023 17:55:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature=EF=BC=9A=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E6=9F=A5=E8=AF=A2=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8D=E6=9F=A5=E6=89=BE=E9=9B=86=E5=9B=A2=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../buyer/service/impl/BuyerServiceImpl.java | 27 ++++++++++--------- .../resources/mybatis/mapper/BuyerMapper.xml | 2 +- .../order/consumer/model/OderDetailInfo.java | 2 ++ .../order/controller/BuyerController.java | 3 ++- .../service/impl/OrderInfoServiceImpl.java | 1 + .../ValidateInterfaceOrderServiceImpl.java | 9 ++++--- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java index 3f517344..7537534c 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java @@ -329,19 +329,20 @@ public class BuyerServiceImpl implements BuyerService { List buyerEntities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity, shList); log.info("{}根据销方税号和自编ID查询购方信息结果{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntity)); - if (buyerEntities != null && buyerEntities.size() > 0) { - return buyerEntities.get(0); - } else { - List shList1 = new ArrayList<>(); - shList1.add("-1"); - BuyerEntity buyerEntity1 = new BuyerEntity(); - buyerEntity1.setBuyerCode(buyerCode); - List entities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity1, shList1); - if(entities != null && entities.size() > 0){ - return entities.get(0); - } - return null; - } + return buyerEntities.stream().findFirst().orElse(buyerEntity); +// if (buyerEntities != null && buyerEntities.size() > 0) { +// } +// else { +// List shList1 = new ArrayList<>(); +// shList1.add("-1"); +// BuyerEntity buyerEntity1 = new BuyerEntity(); +// buyerEntity1.setBuyerCode(buyerCode); +// List entities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity1, shList1); +// if(entities != null && entities.size() > 0){ +// return entities.get(0); +// } +// } +// return null; } @Override diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml index d410e6e8..1a128edd 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml @@ -1010,7 +1010,7 @@ - and buyer_code = #{buyerCode,jdbcType=VARCHAR} + and buyer_code like CONCAT(CONCAT('%',#{buyerCode,jdbcType=VARCHAR}),'%') diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java index 9516226a..b44a0bda 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java @@ -59,6 +59,8 @@ public class OderDetailInfo { private String ghfStatus; + private String ghfId; + private String xhfMc; private String xhfNsrsbh; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java index bf187862..36beac55 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java @@ -341,6 +341,7 @@ public class BuyerController { @ApiOperation(value = "购方信息模糊查询", notes = "购方信息管理-购方信息模糊查询") @SysLog(operation = "购方信息模糊查询", operationDesc = "购方信息模糊查询操作", key = "购方信息管理") public R queryBuyerInfoList(@RequestParam String purchaseName, + @RequestParam String buyerCode, @RequestParam String xhfNsrsbh, @ApiParam(name = "entList", value = "数据组织Id数组", required = false) @RequestParam(value = "entList", required = false) String entList) { if (StringUtils.isBlank(xhfNsrsbh)) { @@ -350,7 +351,7 @@ public class BuyerController { List shList = JSON.parseArray(xhfNsrsbh, String.class); List entList1 = NsrsbhUtils.transShListByXhfNsrsbh(entList); - List buyerEntityList = buyerService.autoQueryBuyerInfoList(purchaseName, "", shList, entList1); + List buyerEntityList = buyerService.autoQueryBuyerInfoList(purchaseName, buyerCode, shList, entList1); return R.ok().put(OrderManagementConstant.DATA, buyerEntityList); } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index 46adad4d..8d1a9d26 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -388,6 +388,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { oderDetailInfo.setGhfDh(orderInfo.getGhfDh()); oderDetailInfo.setGhfYh(orderInfo.getGhfYh()); oderDetailInfo.setGhfZh(orderInfo.getGhfZh()); + oderDetailInfo.setGhfId(orderInfo.getGhfId()); BuyerEntity buyerEntity = null; if (StrUtil.isNotBlank(orderInfo.getGhfId())) { buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId(),orderProcessInfo.getEntId()); 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 d9d4aefc..f3b5303e 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 @@ -231,9 +231,11 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder /** * 整体校验购方信息 */ - checkResultMap = checkGhfParam(orderInfo, commonOrderInfo.getKpfs(), commonOrderInfo.getIsExceptionEdit(), terminalCode, interfaceVersion); - if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) { - resultMapList.add(checkResultMap); + if(!ConfigureConstant.STRING_99.equals(orderInfo.getInterfaceType())){ + checkResultMap = checkGhfParam(orderInfo, commonOrderInfo.getKpfs(), commonOrderInfo.getIsExceptionEdit(), terminalCode, interfaceVersion); + if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) { + resultMapList.add(checkResultMap); + } } /** @@ -2614,6 +2616,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder commonOrderInfo.setPcnsrsbh(orderBatchRequest.getXhfNsrsbh()); commonOrderInfo.setSld(orderBatchRequest.getKpzd()); commonOrderInfo.getOrderInfo().setSld(orderBatchRequest.getKpzd()); + commonOrderInfo.getOrderInfo().setInterfaceType(ConfigureConstant.STRING_99); /** * 税控设备类型添加到订单主信息中 */