From f10440006640715289a0a341bda3ffa8597ef530 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 17 Jul 2023 17:18:14 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E5=95=86=E6=97=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=81=E5=86=9C=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/ExcelErrorMessageEnum.java | 2 +- .../dao/InterfaceRequestDataMapper.java | 3 +++ .../service/impl/InterfaceServiceImplV5.java | 8 +++++++- .../consumer/utils/BeanTransitionV5Utils.java | 16 +++++++++++++++- .../src/main/resources/bootstrap-std.yaml | 10 +++++----- .../src/main/resources/bootstrap.yaml | 6 +++--- .../resources/download/NcpImportExcel.xlsx | Bin 11528 -> 11529 bytes .../mapper/InterfaceRequestDataMapper.xml | 3 +++ 8 files changed, 37 insertions(+), 11 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java index d1c71780..33b7af34 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java @@ -262,7 +262,7 @@ public enum ExcelErrorMessageEnum { ORDERINFO_SSFLBM_SL_NULL("9611", "该商品税率没有维护，不能为空"), - ORDERINFO_9701("9701", "企业自编码长度超过16位"), + ORDERINFO_9701("9701", "企业自编码长度超过18位"), ORDERINFO_9702("9702", "编码表版本号长度超过10位"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/InterfaceRequestDataMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/InterfaceRequestDataMapper.java index 23fab766..c6b1001a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/InterfaceRequestDataMapper.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/InterfaceRequestDataMapper.java @@ -1,6 +1,7 @@ package com.dxhy.order.consumer.dao; import com.dxhy.order.model.InterfaceRequestData; +import org.apache.ibatis.annotations.Param; public interface InterfaceRequestDataMapper { int deleteByPrimaryKey(String id); @@ -11,6 +12,8 @@ public interface InterfaceRequestDataMapper { InterfaceRequestData selectByPrimaryKey(String id); + InterfaceRequestData selectByBatchId(@Param("batchId") String batchId, @Param("ywlx")String ywlx); + int updateByPrimaryKeySelective(InterfaceRequestData record); int updateByPrimaryKeyWithBLOBs(InterfaceRequestData record); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java index a3b79b96..aefbe2fe 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV5.java @@ -7,6 +7,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.csp.sentinel.annotation.SentinelResource; import com.dxhy.order.constant.*; +import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper; import com.dxhy.order.exception.InterfaceException; import com.dxhy.order.exception.OrderReceiveException; import com.dxhy.order.model.*; @@ -103,6 +104,9 @@ public class InterfaceServiceImplV5 implements InterfaceServiceV5 { @Resource private OrderItemInfoService orderItemInfoService; + + @Resource + private InterfaceRequestDataMapper interfaceRequestDataMapper; @Resource private QuickCodeInfoService quickCodeInfoService; @@ -443,6 +447,8 @@ public class InterfaceServiceImplV5 implements InterfaceServiceV5 { OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpqqlsh(orderProcessInfo.getFpqqlsh(), shList); + + InterfaceRequestData interfaceRequestData = interfaceRequestDataMapper.selectByBatchId(orderProcessInfo.getBzdh(), "GenerateQdInvoice"); String ddzt = orderProcessInfo.getDdzt(); String sbyy = orderProcessInfo.getSbyy(); if (orderInfo == null) { @@ -460,7 +466,7 @@ public class InterfaceServiceImplV5 implements InterfaceServiceV5 { /** * 数据组装 */ - DdfpxxV5 ddfpxx = BeanTransitionV5Utils.transitionOrderInvoiceInfoV5(orderInfo, orderProcessInfo, orderInvoiceInfo); + DdfpxxV5 ddfpxx = BeanTransitionV5Utils.transitionOrderInvoiceInfoV5(orderInfo, orderProcessInfo, orderInvoiceInfo,interfaceRequestData); /** * 订单状态返回: diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java index 3eeb06dc..08199e65 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionV5Utils.java @@ -4,9 +4,12 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.dxhy.order.constant.ConfigureConstant; import com.dxhy.order.constant.OrderInfoEnum; +import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam; +import com.dxhy.order.consumer.openapi.protocol.po.generateinvoice.sap.FpkjReqSap; import com.dxhy.order.model.*; import com.dxhy.order.utils.CommonUtils; import com.dxhy.order.consumer.openapi.protocol.v5.order.*; +import com.dxhy.order.utils.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -33,7 +36,7 @@ public class BeanTransitionV5Utils { * @param orderInvoiceInfo * @return */ - public static DdfpxxV5 transitionOrderInvoiceInfoV5(OrderInfo orderInfo, OrderProcessInfo orderProcessInfo, OrderInvoiceInfo orderInvoiceInfo) { + public static DdfpxxV5 transitionOrderInvoiceInfoV5(OrderInfo orderInfo, OrderProcessInfo orderProcessInfo, OrderInvoiceInfo orderInvoiceInfo,InterfaceRequestData generateQdInvoice) { DdfpxxV5 ddfpxxV5 = transitionOrderInvoiceInfoV5(orderInfo, orderInvoiceInfo); ddfpxxV5.setYWLX(orderProcessInfo.getYwlx()); ddfpxxV5.setKPFS(orderProcessInfo.getKpfs()); @@ -41,6 +44,17 @@ public class BeanTransitionV5Utils { ddfpxxV5.setDDLX(orderProcessInfo.getDdlx()); ddfpxxV5.setBillNum(orderProcessInfo.getBzdh()); ddfpxxV5.setCompanyCode(orderProcessInfo.getGsdm()); + if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){ + try { + String requestData = generateQdInvoice.getRequestData(); + PoCommonRequestParam poCommonRequestParam = JsonUtils.getInstance().parseObject(requestData, PoCommonRequestParam.class); + String zdata = poCommonRequestParam.getIS_INPUT().getZDATA(); + FpkjReqSap req = JsonUtils.getInstance().parseObject(zdata, FpkjReqSap.class); + ddfpxxV5.setDDH(StringUtils.isBlank(req.getZJSDH())?"":req.getZJSDH()); + } catch (Exception e) { + log.error("商旅匹配结算单号{}",e.getMessage()); + } + } return ddfpxxV5; } diff --git a/order-management-consumer/src/main/resources/bootstrap-std.yaml b/order-management-consumer/src/main/resources/bootstrap-std.yaml index 8939de2d..6240e37c 100644 --- a/order-management-consumer/src/main/resources/bootstrap-std.yaml +++ b/order-management-consumer/src/main/resources/bootstrap-std.yaml @@ -4,18 +4,18 @@ spring: nacos: config: # Nacos config 地址 - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.147:33000 #server-addr: 172.31.36.147:33000 # server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称(sims_order_namespace) - namespace: aaf40845-1c5a-4f09-9a14-a368e704892c + namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524 # Nacos config 分组 group: sims-order-config # Nacos config 登录用户名 username: nacos # Nacos config 登录密码 # password: Invoice.nacos.!1 - password: FaP!a0_NacOs + password: Invoice.nacos.!1 # Nacos config 配置文件前缀 prefix: sims-order-api # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension} @@ -56,9 +56,9 @@ spring: # Nacos discovery 配置 discovery: # Nacos discovery 服务地址 - server-addr: nacos-1.itax.local:33000 + server-addr: 172.31.36.147:33000 username: nacos - password: FaP!a0_NacOs + password: Invoice.nacos.!1 #sentinel配置相关 sentinel: #sentinel是否开启控制 diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml index e3025400..f11f18c3 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -6,11 +6,11 @@ spring: name: order-api profiles: # Spring 配置文件读取 - active: @deployType@ +# active: @deployType@ # active: own -# active: std + active: std # active: dev - #active: test +# active: test jackson: # jackson 日期格式化 date-format: yyyy-MM-dd HH:mm:ss diff --git a/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx index bd5f508a0acbb1ed072e3573f5e4271b88194b7d..9f7d274275f9406f7eeaf3783d1165485d7c6a49 100644 GIT binary patch delta 1814 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 + delete from interface_request_data where id = #{id,jdbcType=VARCHAR}