From 006d3246750153201311b4e72b6edddc11e183e1 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 10 Jul 2023 10:55:57 +0800 Subject: [PATCH 01/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E6=98=93=E8=A1=8C=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/constant/OrderInfoEnum.java | 1 + .../service/impl/PushInvoiceServiceImpl.java | 3 ++ .../po/generateinvoice/sap/FpkjReqSap.java | 8 ++++++ .../consumer/utils/BeanTransitionUtils.java | 27 ++++++++++++++++-- .../resources/download/NcpImportExcel.xlsx | Bin 11933 -> 11528 bytes .../main/resources/download/OrderExcel.xlsx | Bin 13234 -> 13224 bytes .../resources/download/QdfpImportExcel.xlsx | Bin 13403 -> 13111 bytes 7 files changed, 36 insertions(+), 3 deletions(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index 3d6652e2..3815803d 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -407,6 +407,7 @@ public enum OrderInfoEnum { SYS_SOURCE_DSXT("DSXT","DSXT"), SYS_SOURCE_DSXT01("DSXT01","DSXT01"), SYS_SOURCE_DSXT02("DSXT02","DSXT02"), + SYS_SOURCE_SNYXX("SNYXX","SNYXX"), /** * 订单类型（0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据） 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..3a9e717d 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 @@ -444,6 +444,9 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { Map map = Maps.newHashMap(); map.put("ec-key",baseServiceConfig.getEcKey()); result = HttpUtils.sendPoWithHead(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword(),map); + } else if (OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly()) && StringUtils.isNotBlank(pushInfo.getByzd1()) + && pushInfo.getByzd1().equals(orderProcessInfo.getXtly())) { + result = HttpUtils.sendPo(pushInfo.getPushUrl(), fptsParam,baseServiceConfig.getPoUserName(),baseServiceConfig.getPoPassword()); } } else { result = HttpUtils.doPost(pushInfo.getPushUrl(), requestMap); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java index dd925359..2c85dc92 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/po/generateinvoice/sap/FpkjReqSap.java @@ -23,6 +23,10 @@ public class FpkjReqSap { * 数据来源 */ private String ZSJLY; + /** + * 山能易行系统来源 + */ + private String ZSNYX; /** * 操作状态 */ @@ -39,6 +43,10 @@ public class FpkjReqSap { * 购方编码 */ private String ZGFBH; + /** + * 开票类型 + */ + private String ZKPLX; /** * 不含税金额(SAP) */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 29932e95..5ea71ffa 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -64,6 +64,7 @@ import org.springframework.beans.BeanUtils; import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; +import java.util.stream.Collectors; /** * @author ：杨士勇 @@ -3537,6 +3538,9 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(req.getZDSXT()) && StringUtils.isNotBlank(req.getZDSYWFL())){ ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey()+req.getZDSYWFL()); } + if(StringUtils.isNotBlank(req.getZSNYX())){ + ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey()); + } ddtxxBO.setGSDM(req.getBUKRS()); ddtxxBO.setENTID(deptEntity.getDeptId()); ddtxxBO.setBHZT(ConfigureConstant.STRING_0); @@ -3630,9 +3634,26 @@ public class BeanTransitionUtils { ddtxxBO.setHJSE("0"); } } - ddzxxBO.setDDTXX(ddtxxBO); - ddzxxBO.setDDMXXX(ddmxList); - ddzxxList.add(ddzxxBO); + + //如果是山能易行按照物料编码分组拆分订单 + if(StringUtils.isNotBlank(ddtxxBO.getXTLY())){ + Map> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); + for (int i = 0; i < collect.size(); i++) { + DdzxxBO ddzxxBONew = new DdzxxBO(); + DdtxxBO ddtxxBONew = new DdtxxBO(); + List ddmxLists = new ArrayList<>(); + BeanUtils.copyProperties(ddtxxBO,ddtxxBONew); + ddmxLists.addAll(collect.get(i)); + + ddzxxBONew.setDDTXX(ddtxxBO); + ddzxxBONew.setDDMXXX(ddmxList); + ddzxxList.add(ddzxxBONew); + } + }else{ + ddzxxBO.setDDTXX(ddtxxBO); + ddzxxBO.setDDMXXX(ddmxList); + ddzxxList.add(ddzxxBO); + } ddpcxxReqBO.setDDPCXX(ddpcxxBO); ddpcxxReqBO.setDDZXX(ddzxxList); log.info("转换后的DdpcxxReqBO:{}", JSONObject.toJSONString(ddpcxxReqBO)); diff --git a/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx index 32707f0358083f6f4a2c7e48f90da0cadda9707a..bd5f508a0acbb1ed072e3573f5e4271b88194b7d 100644 GIT binary patch delta 4890 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 delta 5250 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 LC%N*x|LXlOM(`Yx From f10440006640715289a0a341bda3ffa8597ef530 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 17 Jul 2023 17:18:14 +0800 Subject: [PATCH 02/45] =?UTF-8?q?feature=EF=BC=9A=E5=95=86=E6=97=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E3=80=81=E5=86=9C=E4=BA=A7?= =?UTF-8?q?=E5=93=81=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} From b5bba0138cb59e0bd6e258e09b09591513385b8b Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 18 Jul 2023 18:24:22 +0800 Subject: [PATCH 03/45] =?UTF-8?q?feature=EF=BC=9A=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=AF=AF=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap-std.yaml | 10 +++++----- .../src/main/resources/bootstrap.yaml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/order-management-consumer/src/main/resources/bootstrap-std.yaml b/order-management-consumer/src/main/resources/bootstrap-std.yaml index 6240e37c..8939de2d 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: 172.31.36.147:33000 + server-addr: nacos-1.itax.local:33000 #server-addr: 172.31.36.147:33000 # server-addr: 172.31.36.143:33000 # Nacos config 命名空间,对应配置中的名称(sims_order_namespace) - namespace: a049b41c-b0a8-4a66-91b1-f3f3cab0e524 + namespace: aaf40845-1c5a-4f09-9a14-a368e704892c # Nacos config 分组 group: sims-order-config # Nacos config 登录用户名 username: nacos # Nacos config 登录密码 # password: Invoice.nacos.!1 - password: Invoice.nacos.!1 + password: FaP!a0_NacOs # 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: 172.31.36.147:33000 + server-addr: nacos-1.itax.local:33000 username: nacos - password: Invoice.nacos.!1 + password: FaP!a0_NacOs #sentinel配置相关 sentinel: #sentinel是否开启控制 diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml index f11f18c3..2a9064c5 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -6,9 +6,9 @@ spring: name: order-api profiles: # Spring 配置文件读取 -# active: @deployType@ + active: @deployType@ # active: own - active: std +# active: std # active: dev # active: test jackson: From a6eabe36e25091fc3df931650a7d994d3062b3c5 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 19 Jul 2023 17:34:20 +0800 Subject: [PATCH 04/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E6=98=93=E8=A1=8C=E5=BC=80=E7=A5=A8=E6=8E=A5=E5=8F=A3=E6=94=B9?= =?UTF-8?q?=E4=B8=BAFI883?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/order/constant/OrderInfoEnum.java | 1 + .../order/consumer/openapi/api/InvoiceOpenGateRestApi.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index 3815803d..58153fa1 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -1274,6 +1274,7 @@ public enum OrderInfoEnum { */ INTERFACE_BUSINESS_ID_FPKJTS("FI843","发票开具回推"), INTERFACE_BUSINESS_ID_FPKJ("FI840","发票开具"), + INTERFACE_BUSINESS_SNYX_FPKJ("FI883","发票开具"), INTERFACE_BUSINESS_ID_FPZFTS("FI844","发票作废回推"), INTERFACE_BUSINESS_ID_GSCLIENT("FI846","获取公司client"), INTERFACE_BUSINESS_ID_DDZTGX("FI841","订单状态更新"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java index 6d151fa2..6e602c10 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceOpenGateRestApi.java @@ -78,7 +78,8 @@ public class InvoiceOpenGateRestApi { try { PoCommonRequestParam requestParam = JsonUtils.getInstance().parseObject(param, PoCommonRequestParam.class); String interfaceName = ""; - if(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){ + if(OrderInfoEnum.INTERFACE_BUSINESS_ID_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID()) + ||OrderInfoEnum.INTERFACE_BUSINESS_SNYX_FPKJ.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){ interfaceName = ConfigurerInfo.GENERATE_QD_INVOICE; }else if(OrderInfoEnum.INTERFACE_BUSINESS_ID_DDZTGX.getKey().equals(requestParam.getIS_INPUT().getIFYWID())){ interfaceName = ConfigurerInfo.ORDER_STATUS_UPDATE; From 1998af7b402d887e53a73ad14b1d8f78279e48c9 Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 19 Jul 2023 19:24:18 +0800 Subject: [PATCH 05/45] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=88=A0=E9=99=A4=E7=89=A9=E6=96=99=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OrderExcelReadServiceImpl.java | 473 +++++++++--------- .../main/resources/download/OrderExcel.xlsx | Bin 13224 -> 12877 bytes 2 files changed, 235 insertions(+), 238 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java index 971702c4..363bcce2 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java @@ -337,85 +337,85 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { } // 商品名称 70位 必填 ==>改成90 （19-03-28） - if (StringUtils.isBlank(orderExcel.getXmmc())) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMMC.getCellName(), ExcelErrorMessageEnum.ORDERINFO_XMMC_NULL, true)); - } - if(CommonUtils.judgeIsQdfp("", orderExcel.getFpzlDm())){ - if (!StringUtils.isBlank(orderExcel.getXmmc()) && GbkUtils.getGbkLength(orderExcel.getXmmc()) > ConfigureConstant.INT_600) { - isValid = true; - resultList.add( - buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMMC.getCellName(), ExcelErrorMessageEnum.QD_ORDERINFO_SPMC_OVERLENGTH, false)); - } - } else { - if (!StringUtils.isBlank(orderExcel.getXmmc()) && GbkUtils.getGbkLength(orderExcel.getXmmc()) > ConfigureConstant.INT_90) { - isValid = true; - resultList.add( - buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMMC.getCellName(), ExcelErrorMessageEnum.ORDERINFO_SPMC_OVERLENGTH, false)); - } - } +// if (StringUtils.isBlank(orderExcel.getXmmc())) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMMC.getCellName(), ExcelErrorMessageEnum.ORDERINFO_XMMC_NULL, true)); +// } +// if(CommonUtils.judgeIsQdfp("", orderExcel.getFpzlDm())){ +// if (!StringUtils.isBlank(orderExcel.getXmmc()) && GbkUtils.getGbkLength(orderExcel.getXmmc()) > ConfigureConstant.INT_600) { +// isValid = true; +// resultList.add( +// buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMMC.getCellName(), ExcelErrorMessageEnum.QD_ORDERINFO_SPMC_OVERLENGTH, false)); +// } +// } else { +// if (!StringUtils.isBlank(orderExcel.getXmmc()) && GbkUtils.getGbkLength(orderExcel.getXmmc()) > ConfigureConstant.INT_90) { +// isValid = true; +// resultList.add( +// buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMMC.getCellName(), ExcelErrorMessageEnum.ORDERINFO_SPMC_OVERLENGTH, false)); +// } +// } // 规格型号 40位 - if(CommonUtils.judgeIsQdfp("", orderExcel.getFpzlDm())){ - if (!StringUtils.isBlank(orderExcel.getGgxh()) && GbkUtils.getGbkLength(orderExcel.getGgxh()) > ConfigureConstant.INT_150) { - isValid = true; - resultList.add( - buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_GGXH.getCellName(), ExcelErrorMessageEnum.QD_ORDERINFO_GGXH_OVERLENGTH, false)); - } - } else { - if (!StringUtils.isBlank(orderExcel.getGgxh()) && GbkUtils.getGbkLength(orderExcel.getGgxh()) > ConfigureConstant.INT_40) { - isValid = true; - resultList.add( - buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_GGXH.getCellName(), ExcelErrorMessageEnum.ORDERINFO_GGXH_OVERLENGTH, false)); - } - } +// if(CommonUtils.judgeIsQdfp("", orderExcel.getFpzlDm())){ +// if (!StringUtils.isBlank(orderExcel.getGgxh()) && GbkUtils.getGbkLength(orderExcel.getGgxh()) > ConfigureConstant.INT_150) { +// isValid = true; +// resultList.add( +// buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_GGXH.getCellName(), ExcelErrorMessageEnum.QD_ORDERINFO_GGXH_OVERLENGTH, false)); +// } +// } else { +// if (!StringUtils.isBlank(orderExcel.getGgxh()) && GbkUtils.getGbkLength(orderExcel.getGgxh()) > ConfigureConstant.INT_40) { +// isValid = true; +// resultList.add( +// buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_GGXH.getCellName(), ExcelErrorMessageEnum.ORDERINFO_GGXH_OVERLENGTH, false)); +// } +// } //根据金额判断是否为折扣行，金额小于0为折扣行 String fphxz = StringUtils.isNotBlank(orderExcel.getXmje()) && Double.parseDouble(orderExcel.getXmje()) < 0 ? OrderInfoEnum.FPHXZ_CODE_1.getKey() : OrderInfoEnum.FPHXZ_CODE_0.getKey(); //如果机动车类型为 `经销企业`,则规格型号不能为空且不允许重复 - if (OrderInfoEnum.TSPZ_2.getValue().equals(orderExcel.getTspz()) && OrderInfoEnum.JDCQYLX_02.getValue().equals(orderExcel.getJdcqylx()) && - (OrderInfoEnum.FPHXZ_CODE_0.getKey().equals(fphxz) || OrderInfoEnum.FPHXZ_CODE_2.getKey().equals(fphxz))) { - if (StringUtils.isBlank(orderExcel.getGgxh()) || (ggxhSet.size() != itemCount)) { - isValid = true; - resultList.add( - buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_GGXH.getCellName(), ExcelErrorMessageEnum.ORDERINFO_GGXH_ERROR, false)); - } - } +// if (OrderInfoEnum.TSPZ_2.getValue().equals(orderExcel.getTspz()) && OrderInfoEnum.JDCQYLX_02.getValue().equals(orderExcel.getJdcqylx()) && +// (OrderInfoEnum.FPHXZ_CODE_0.getKey().equals(fphxz) || OrderInfoEnum.FPHXZ_CODE_2.getKey().equals(fphxz))) { +// if (StringUtils.isBlank(orderExcel.getGgxh()) || (ggxhSet.size() != itemCount)) { +// isValid = true; +// resultList.add( +// buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_GGXH.getCellName(), ExcelErrorMessageEnum.ORDERINFO_GGXH_ERROR, false)); +// } +// } //全电发票 单位、单价、数量关系校验 //全电发票，单位、单价、数量同时为空或同时不为空 - if(CommonUtils.judgeIsQdfp("", orderExcel.getFpzlDm())){ - boolean isEmpty = StringUtils.isBlank(orderExcel.getXmdw()) - && StringUtils.isBlank(orderExcel.getXmsl()) - && StringUtils.isBlank(orderExcel.getXmdj()); - - boolean isNotEmpty = StringUtils.isNotBlank(orderExcel.getXmdw()) - && StringUtils.isNotBlank(orderExcel.getXmsl()) - && StringUtils.isNotBlank(orderExcel.getXmdj()); - - if(!(isEmpty || isNotEmpty)){ - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), - ExcelErrorMessageEnum.QD_ORDERINFO_XMDW_XMSL_XMDJ_OVERLENGTH, false)); - } - } +// if(CommonUtils.judgeIsQdfp("", orderExcel.getFpzlDm())){ +// boolean isEmpty = StringUtils.isBlank(orderExcel.getXmdw()) +// && StringUtils.isBlank(orderExcel.getXmsl()) +// && StringUtils.isBlank(orderExcel.getXmdj()); +// +// boolean isNotEmpty = StringUtils.isNotBlank(orderExcel.getXmdw()) +// && StringUtils.isNotBlank(orderExcel.getXmsl()) +// && StringUtils.isNotBlank(orderExcel.getXmdj()); +// +// if(!(isEmpty || isNotEmpty)){ +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), +// ExcelErrorMessageEnum.QD_ORDERINFO_XMDW_XMSL_XMDJ_OVERLENGTH, false)); +// } +// } // 单位 20位 - if(CommonUtils.judgeIsQdfp("", orderExcel.getFpzlDm())){ - if (!StringUtils.isBlank(orderExcel.getXmdw()) && GbkUtils.getGbkLength(orderExcel.getXmdw()) > ConfigureConstant.INT_300) { - isValid = true; - resultList - .add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.QD_ORDERINFO_DW_OVERLENGTH, false)); - } - } else { - if (!StringUtils.isBlank(orderExcel.getXmdw()) && GbkUtils.getGbkLength(orderExcel.getXmdw()) > ConfigureConstant.INT_20) { - isValid = true; - resultList - .add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.ORDERINFO_DW_OVERLENGTH, false)); - } - } +// if(CommonUtils.judgeIsQdfp("", orderExcel.getFpzlDm())){ +// if (!StringUtils.isBlank(orderExcel.getXmdw()) && GbkUtils.getGbkLength(orderExcel.getXmdw()) > ConfigureConstant.INT_300) { +// isValid = true; +// resultList +// .add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.QD_ORDERINFO_DW_OVERLENGTH, false)); +// } +// } else { +// if (!StringUtils.isBlank(orderExcel.getXmdw()) && GbkUtils.getGbkLength(orderExcel.getXmdw()) > ConfigureConstant.INT_20) { +// isValid = true; +// resultList +// .add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.ORDERINFO_DW_OVERLENGTH, false)); +// } +// } //如果特殊票种为 `机动车发票` 则单位必须为 `辆` if (StringUtils.equals(OrderInfoEnum.TSPZ_2.getValue(), orderExcel.getTspz()) && !StringUtils.equals(ConfigureConstant.STRING_LINAG, orderExcel.getXmdw()) && @@ -424,29 +424,29 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.ORDERINFO_XMDW_JDCZP, false)); } - String spbm = orderExcel.getSsflbm(); - if (StringUtils.isNotEmpty(spbm)) { - spbm = StringUtil.fillZero(spbm, ConfigureConstant.INT_19); - } - TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(spbm); - if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { - if (ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())) { - orderExcel.setTspz(OrderInfoEnum.TSPZ_1.getValue()); - //成品油单位只能为升或吨 - if (Double.parseDouble(orderExcel.getXmje()) > 0 && !ConfigureConstant.STRING_SHENG.equals(orderExcel.getXmdw()) && !ConfigureConstant.STRING_DUN.equals(orderExcel.getXmdw())) { - isValid = true; - resultList.add( - buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9714, false)); - } - } - } else { - if (StringUtils.isBlank(orderExcel.getSl())) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_SSFLBM_SL_NULL, false)); - - } - } +// String spbm = orderExcel.getSsflbm(); +// if (StringUtils.isNotEmpty(spbm)) { +// spbm = StringUtil.fillZero(spbm, ConfigureConstant.INT_19); +// } +// TaxClassCodeEntity taxClassCodeEntity = taxClassCodeService.queryTaxClassCodeFromCache(spbm); +// if (ObjectUtil.isNotEmpty(taxClassCodeEntity)) { +// if (ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())) { +// orderExcel.setTspz(OrderInfoEnum.TSPZ_1.getValue()); +// //成品油单位只能为升或吨 +// if (Double.parseDouble(orderExcel.getXmje()) > 0 && !ConfigureConstant.STRING_SHENG.equals(orderExcel.getXmdw()) && !ConfigureConstant.STRING_DUN.equals(orderExcel.getXmdw())) { +// isValid = true; +// resultList.add( +// buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9714, false)); +// } +// } +// } else { +// if (StringUtils.isBlank(orderExcel.getSl())) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_SSFLBM_SL_NULL, false)); +// +// } +// } //扣除额不为空时,长度不能超过20 if (StringUtils.isNotBlank(orderExcel.getKce()) && GbkUtils.getGbkLength(orderExcel.getKce()) > ConfigureConstant.INT_20) { @@ -499,12 +499,13 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { resultList.add( buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMSL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_XMSL_OVERLENGTH, false)); } - } else if (StringUtils.isNotEmpty(orderExcel.getXmje()) && Double.parseDouble(orderExcel.getXmje()) > 0 && ObjectUtil.isNotEmpty(taxClassCodeEntity) && ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())) { - isValid = true; - resultList.add( - buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMSL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9716, false)); - } +// else if (StringUtils.isNotEmpty(orderExcel.getXmje()) && Double.parseDouble(orderExcel.getXmje()) > 0 && ObjectUtil.isNotEmpty(taxClassCodeEntity) && ConfigureConstant.STRING_Y.equals(taxClassCodeEntity.getCpy())) { +// isValid = true; +// resultList.add( +// buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMSL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9716, false)); +// +// } //根据机动车企业类型判断,当企业类型为 `生产企业`，规格型号为空时，数量可以是大于0的整数,规格型号不为空时，数量必须是1 //当企业类型为`经销企业`时，数量必须为1 @@ -654,10 +655,10 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { isValid = true; resultList.add( buildReturnMap(orderExcel.getRowIndex(), ConfigureConstant.STRING_EXCEL_ZKH, ExcelErrorMessageEnum.ORDERINFO_ZKH_ERROR, true)); - } else if (StringUtils.isNotBlank(orderExcel.getXmmc()) && !orderExcel.getXmmc().equals(lastOrderExcel.getXmmc())) { - isValid = true; - resultList.add( - buildReturnMap(orderExcel.getRowIndex(), ConfigureConstant.STRING_EXCEL_ZKH, ExcelErrorMessageEnum.ORDERINFO_ZKH_ERROR, true)); +// } else if (StringUtils.isNotBlank(orderExcel.getXmmc()) && !orderExcel.getXmmc().equals(lastOrderExcel.getXmmc())) { +// isValid = true; +// resultList.add( +// buildReturnMap(orderExcel.getRowIndex(), ConfigureConstant.STRING_EXCEL_ZKH, ExcelErrorMessageEnum.ORDERINFO_ZKH_ERROR, true)); } else if (lastOrderExcel.getXmje() != null && Double.parseDouble(lastOrderExcel.getXmje()) <= ConfigureConstant.DOUBLE_PENNY_ZERO) { isValid = true; resultList.add( @@ -673,41 +674,38 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { resultList.add(buildReturnMap(orderExcel.getRowIndex(), ConfigureConstant.STRING_EXCEL_ZKH, ExcelErrorMessageEnum.ORDERINFO_ZKH_SL_ERROR, true)); } - if (StringUtils.isNotBlank(orderExcel.getXmdw())) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.ORDERINFO_ZKH_XMDW_ERROR, true)); - } - if (StringUtils.isNotBlank(orderExcel.getGgxh())) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_GGXH.getCellName(), ExcelErrorMessageEnum.ORDERINFO_ZKH_GGXH_ERROR, true)); - } - - } - } - - if (StringUtils.isNotBlank(orderExcel.getXmmc()) && StringUtils.isEmpty(orderExcel.getSsflbm())) { - /** - * 校验商品重复 - */ - CommodityCodeCheckQuery commodityCodeCheckQuery = new CommodityCodeCheckQuery(); - commodityCodeCheckQuery.setXmmc(orderExcel.getXmmc()); - commodityCodeCheckQuery.setZxbm(orderExcel.getZxbm()); - commodityCodeCheckQuery.setGgxh(orderExcel.getGgxh()); - commodityCodeCheckQuery.setXmdw(orderExcel.getXmdw()); - commodityCodeCheckQuery.setXmdj(orderExcel.getXmdj()); - commodityCodeCheckQuery.setSl(orderExcel.getSl()); - commodityCodeCheckQuery.setDeptId(entId); - R r = commodityService.checkRepeat(commodityCodeCheckQuery, shList, false); - if (OrderInfoContentEnum.COMMODITY_MESSAGE_ERROR_174015.getKey().equals(r.get(OrderManagementConstant.CODE))) { - log.error("根据商品名称查到多个商品!"); - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SPBM.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_XMMC_ERROR, false)); - } - - - - } +// if (StringUtils.isNotBlank(orderExcel.getXmdw())) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_XMDW.getCellName(), ExcelErrorMessageEnum.ORDERINFO_ZKH_XMDW_ERROR, true)); +// } +// if (StringUtils.isNotBlank(orderExcel.getGgxh())) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_GGXH.getCellName(), ExcelErrorMessageEnum.ORDERINFO_ZKH_GGXH_ERROR, true)); +// } + + } + } + +// if (StringUtils.isNotBlank(orderExcel.getXmmc()) && StringUtils.isEmpty(orderExcel.getSsflbm())) { +// /** +// * 校验商品重复 +// */ +// CommodityCodeCheckQuery commodityCodeCheckQuery = new CommodityCodeCheckQuery(); +// commodityCodeCheckQuery.setXmmc(orderExcel.getXmmc()); +// commodityCodeCheckQuery.setZxbm(orderExcel.getZxbm()); +// commodityCodeCheckQuery.setGgxh(orderExcel.getGgxh()); +// commodityCodeCheckQuery.setXmdw(orderExcel.getXmdw()); +// commodityCodeCheckQuery.setXmdj(orderExcel.getXmdj()); +// commodityCodeCheckQuery.setSl(orderExcel.getSl()); +// commodityCodeCheckQuery.setDeptId(entId); +// R r = commodityService.checkRepeat(commodityCodeCheckQuery, shList, false); +// if (OrderInfoContentEnum.COMMODITY_MESSAGE_ERROR_174015.getKey().equals(r.get(OrderManagementConstant.CODE))) { +// log.error("根据商品名称查到多个商品!"); +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SPBM.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_XMMC_ERROR, false)); +// } +// } //税额 非必填 必须为数字，最多20位 0.06误差 if (!StringUtils.isBlank(orderExcel.getSe())) { @@ -787,70 +785,70 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { //是否享受税收优惠政策 //优惠政策标识只能为0或者1 必填 - String yhzcbs = orderExcel.getYhzcbs(); - if ((ConfigureConstant.STRING_YHZCBS_F.equals(yhzcbs))) { - orderExcel.setYhzcbs(OrderInfoEnum.YHZCBS_0.getKey()); - yhzcbs = OrderInfoEnum.YHZCBS_0.getKey(); - } else if (ConfigureConstant.STRING_YHZCBS_S.equals(yhzcbs)) { - orderExcel.setYhzcbs(OrderInfoEnum.YHZCBS_1.getKey()); - yhzcbs = OrderInfoEnum.YHZCBS_1.getKey(); - } else { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_YHZCBS.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_9707, false)); - } +// String yhzcbs = orderExcel.getYhzcbs(); +// if ((ConfigureConstant.STRING_YHZCBS_F.equals(yhzcbs))) { +// orderExcel.setYhzcbs(OrderInfoEnum.YHZCBS_0.getKey()); +// yhzcbs = OrderInfoEnum.YHZCBS_0.getKey(); +// } else if (ConfigureConstant.STRING_YHZCBS_S.equals(yhzcbs)) { +// orderExcel.setYhzcbs(OrderInfoEnum.YHZCBS_1.getKey()); +// yhzcbs = OrderInfoEnum.YHZCBS_1.getKey(); +// } else { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_YHZCBS.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_9707, false)); +// } //享受税收优惠政策内容 //享受税收优惠政策内容只能是 `免税`,`不征税`,`出口零税` - String zzstsgl = orderExcel.getZzstsgl(); - if (StringUtils.isNotBlank(zzstsgl)) { - if (ConfigureConstant.STRING_CKLS.equals(zzstsgl)) { - orderExcel.setLslbs(OrderInfoEnum.LSLBS_0.getKey()); - } else if (ConfigureConstant.STRING_MS.equals(zzstsgl)) { - orderExcel.setLslbs(OrderInfoEnum.LSLBS_1.getKey()); - } else if (ConfigureConstant.STRING_BZS.equals(zzstsgl)) { - orderExcel.setLslbs(OrderInfoEnum.LSLBS_2.getKey()); - } else { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZZSTSGL.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_9901, false)); - } - } +// String zzstsgl = orderExcel.getZzstsgl(); +// if (StringUtils.isNotBlank(zzstsgl)) { +// if (ConfigureConstant.STRING_CKLS.equals(zzstsgl)) { +// orderExcel.setLslbs(OrderInfoEnum.LSLBS_0.getKey()); +// } else if (ConfigureConstant.STRING_MS.equals(zzstsgl)) { +// orderExcel.setLslbs(OrderInfoEnum.LSLBS_1.getKey()); +// } else if (ConfigureConstant.STRING_BZS.equals(zzstsgl)) { +// orderExcel.setLslbs(OrderInfoEnum.LSLBS_2.getKey()); +// } else { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZZSTSGL.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_9901, false)); +// } +// } //优惠政策标识为1时; - if (OrderInfoEnum.YHZCBS_1.getKey().equals(yhzcbs)) { - if (StringUtils.isBlank(zzstsgl)) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZZSTSGL.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_9708, false)); - } - //订单明细信息中YHZCBS(优惠政策标识)为1, 且税率为0, 则ZZSTSGL内容只能写"出口零税/免税/不征税 - if (!StringUtils.isBlank(orderExcel.getSl()) && - ConfigureConstant.STRING_000.equals(orderExcel.getSl()) && (StringUtils.isBlank(zzstsgl))) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZZSTSGL.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_9706, false)); - } - } +// if (OrderInfoEnum.YHZCBS_1.getKey().equals(yhzcbs)) { +// if (StringUtils.isBlank(zzstsgl)) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZZSTSGL.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_9708, false)); +// } +// //订单明细信息中YHZCBS(优惠政策标识)为1, 且税率为0, 则ZZSTSGL内容只能写"出口零税/免税/不征税 +// if (!StringUtils.isBlank(orderExcel.getSl()) && +// ConfigureConstant.STRING_000.equals(orderExcel.getSl()) && (StringUtils.isBlank(zzstsgl))) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZZSTSGL.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_9706, false)); +// } +// } //订单明细信息中优惠政策标识为0时,增值税特殊管理须为空 - if (OrderInfoEnum.YHZCBS_0.getKey().equals(yhzcbs)) { - if (StringUtils.isNotBlank(zzstsgl)) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZZSTSGL.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_9708, false)); - } else { - //如果税率为0,但并不属于优惠政策(即普通的零税率),则YHZCBS填0,ZZSTSGL为空,LSLBS填3,; - if(ConfigureConstant.STRING_000.equals(orderExcel.getSl())){ - orderExcel.setLslbs(OrderInfoEnum.LSLBS_3.getKey()); - } - } - } +// if (OrderInfoEnum.YHZCBS_0.getKey().equals(yhzcbs)) { +// if (StringUtils.isNotBlank(zzstsgl)) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZZSTSGL.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_9708, false)); +// } else { +// //如果税率为0,但并不属于优惠政策(即普通的零税率),则YHZCBS填0,ZZSTSGL为空,LSLBS填3,; +// if(ConfigureConstant.STRING_000.equals(orderExcel.getSl())){ +// orderExcel.setLslbs(OrderInfoEnum.LSLBS_3.getKey()); +// } +// } +// } /** * 税率非空时,逻辑判断 */ - if (!StringUtils.isBlank(orderExcel.getSl())) { +// if (!StringUtils.isBlank(orderExcel.getSl())) { /** * 增值税特殊管理不为空,不为不征税,不为免税,不为出口零税逻辑处理 * 如果是按5%简易征收需要保证税率为0.05 @@ -858,58 +856,58 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { * 如果是简易征收需要保证税率为0.03或0.04或0.05 * 如果是按5%简易征收减按1.5%计征需要保证税率为0.015 */ - if ((!StringUtils.isBlank(zzstsgl)) && - (!ConfigureConstant.STRING_BZS.equals(zzstsgl)) && - (!ConfigureConstant.STRING_MS.equals(zzstsgl)) && - (!ConfigureConstant.STRING_CKLS.equals(zzstsgl))) { - - if (zzstsgl.contains(ConfigureConstant.STRING_ERROR_PERCENT)) { - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9720, false)); - } - switch (zzstsgl) { - case ConfigureConstant.STRING_JYZS5: - if (new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_5) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9711, false)); - } - break; - case ConfigureConstant.STRING_JYZS3: - if (new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_3) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9711, false)); - } - break; - case ConfigureConstant.STRING_JYZS: - if (new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_3 && new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_4 && new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_5) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9711, false)); - } - break; - case ConfigureConstant.STRING_JYZS5_1: - if (DecimalCalculateUtil.stringCompare(orderExcel.getSl(), ConfigureConstant.STRING_0015) != 0) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9711, false)); - } - break; - default: - break; - } - } +// if ((!StringUtils.isBlank(zzstsgl)) && +// (!ConfigureConstant.STRING_BZS.equals(zzstsgl)) && +// (!ConfigureConstant.STRING_MS.equals(zzstsgl)) && +// (!ConfigureConstant.STRING_CKLS.equals(zzstsgl))) { +// +// if (zzstsgl.contains(ConfigureConstant.STRING_ERROR_PERCENT)) { +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9720, false)); +// } +// switch (zzstsgl) { +// case ConfigureConstant.STRING_JYZS5: +// if (new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_5) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9711, false)); +// } +// break; +// case ConfigureConstant.STRING_JYZS3: +// if (new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_3) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9711, false)); +// } +// break; +// case ConfigureConstant.STRING_JYZS: +// if (new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_3 && new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_4 && new BigDecimal(orderExcel.getSl()).doubleValue() != ConfigureConstant.DOUBLE_PENNY_5) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9711, false)); +// } +// break; +// case ConfigureConstant.STRING_JYZS5_1: +// if (DecimalCalculateUtil.stringCompare(orderExcel.getSl(), ConfigureConstant.STRING_0015) != 0) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9711, false)); +// } +// break; +// default: +// break; +// } +// } //零税率标识不为空,税率必须为0 - if ((!StringUtils.isBlank(orderExcel.getLslbs())) && (ConfigureConstant.DOUBLE_PENNY_ZERO != new BigDecimal(orderExcel.getSl()).doubleValue())) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_9709, false)); - } - - //零税率标识为空,税率不能为0 - if ((StringUtils.isBlank(orderExcel.getLslbs())) && (ConfigureConstant.DOUBLE_PENNY_ZERO == new BigDecimal(orderExcel.getSl()).doubleValue())) { - isValid = true; - resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), - ExcelErrorMessageEnum.ORDERINFO_9709, false)); - } - } +// if ((!StringUtils.isBlank(orderExcel.getLslbs())) && (ConfigureConstant.DOUBLE_PENNY_ZERO != new BigDecimal(orderExcel.getSl()).doubleValue())) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_9709, false)); +// } +// +// //零税率标识为空,税率不能为0 +// if ((StringUtils.isBlank(orderExcel.getLslbs())) && (ConfigureConstant.DOUBLE_PENNY_ZERO == new BigDecimal(orderExcel.getSl()).doubleValue())) { +// isValid = true; +// resultList.add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_SL.getCellName(), +// ExcelErrorMessageEnum.ORDERINFO_9709, false)); +// } +// } // 自行编码 if (!StringUtils.isBlank(orderExcel.getZxbm()) && GbkUtils.getGbkLength(orderExcel.getZxbm()) > ConfigureConstant.INT_18) { @@ -1649,8 +1647,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { errorList.add(examinData); } } else { - Map examinData = examinData(newOrderExcel, lastOrderExcel, xhfNsrsbh, - ggxhSet, (i + 1), userId, terminalCode,entId); + Map examinData = examinData(newOrderExcel, lastOrderExcel, xhfNsrsbh,ggxhSet, (i + 1), userId, terminalCode,entId); List resultList = (List) examinData.get("resultList"); //验证扣除额是否合法 if (ObjectUtil.isNotNull(newOrderExcel) && StringUtils.isNotBlank(newOrderExcel.getKce())) { diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index 47ad4f0f09eeeac620e01623b9c5acc5a5d9d7bd..7481c30fd043cb7738d040dd8e88c5d89c18acc5 100644 GIT binary patch delta 4832 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 delta 5125 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 Date: Wed, 19 Jul 2023 20:11:11 +0800 Subject: [PATCH 06/45] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=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 | 6 ++++-- .../impl/OrderExcelReadServiceImpl.java | 6 +++++- .../resources/download/NcpImportExcel.xlsx | Bin 11529 -> 11458 bytes .../main/resources/download/OrderExcel.xlsx | Bin 12877 -> 12588 bytes .../resources/download/QdfpImportExcel.xlsx | Bin 13111 -> 12460 bytes 5 files changed, 9 insertions(+), 3 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 33b7af34..759019df 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,8 +262,10 @@ public enum ExcelErrorMessageEnum { ORDERINFO_SSFLBM_SL_NULL("9611", "该商品税率没有维护，不能为空"), - ORDERINFO_9701("9701", "企业自编码长度超过18位"), - + ORDERINFO_9701("9701", "物料编码长度超过18位"), + + ORDERINFO_9700("9700", "物料编码不允许为空"), + ORDERINFO_9702("9702", "编码表版本号长度超过10位"), ORDERINFO_9703("9703", "税额长度超过30位"), diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java index 363bcce2..a8f89664 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderExcelReadServiceImpl.java @@ -908,7 +908,11 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService { // ExcelErrorMessageEnum.ORDERINFO_9709, false)); // } // } - + if (StringUtils.isBlank(orderExcel.getZxbm())) { + isValid = true; + resultList + .add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZXBM.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9700, false)); + } // 自行编码 if (!StringUtils.isBlank(orderExcel.getZxbm()) && GbkUtils.getGbkLength(orderExcel.getZxbm()) > ConfigureConstant.INT_18) { isValid = true; diff --git a/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/NcpImportExcel.xlsx index 9f7d274275f9406f7eeaf3783d1165485d7c6a49..711c1a2e68f3788f610af6832359161f66ab4f0a 100644 GIT binary patch delta 3703 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 diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index 7481c30fd043cb7738d040dd8e88c5d89c18acc5..9875652acff36ad2ab7521f7db52da3a59d1a3f6 100644 GIT binary patch delta 4324 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 SJOWNDlO-}D1{W>>0002QF%{DQ delta 4613 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 R7!^vRmcB!hDf;)xe*s=`TqXbj delta 5033 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 Date: Thu, 20 Jul 2023 17:17:17 +0800 Subject: [PATCH 07/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E6=98=93=E8=A1=8C=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/InterfaceRequestDataMapper.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/InterfaceRequestDataMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/InterfaceRequestDataMapper.xml index ad2483e2..cd104cef 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/InterfaceRequestDataMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/InterfaceRequestDataMapper.xml @@ -26,7 +26,11 @@ where id = #{id,jdbcType=VARCHAR} delete from interface_request_data From d874ce9747129db73ce644992456647173d88e06 Mon Sep 17 00:00:00 2001 From: gaorl Date: Sun, 23 Jul 2023 16:22:35 +0800 Subject: [PATCH 08/45] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- order-management-base-service/pom.xml | 2 +- order-management-consumer/pom.xml | 2 +- .../main/resources/download/OrderExcel.xlsx | Bin 12588 -> 12680 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/order-management-base-service/pom.xml b/order-management-base-service/pom.xml index 47e3816d..ee0b1755 100644 --- a/order-management-base-service/pom.xml +++ b/order-management-base-service/pom.xml @@ -344,7 +344,7 @@ com.dxhy.base sims-base-file-operate - 6.1.4.2-BASE + 6.1.4.3-BASE compile diff --git a/order-management-consumer/pom.xml b/order-management-consumer/pom.xml index dcd8e927..1cb8a44b 100644 --- a/order-management-consumer/pom.xml +++ b/order-management-consumer/pom.xml @@ -325,7 +325,7 @@ com.dxhy.base sims-base-file-operate - 6.1.4.2-BASE + 6.1.4.3-BASE compile diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index 9875652acff36ad2ab7521f7db52da3a59d1a3f6..94aa0f2955a0d5ea6c972481e28bd144787e2c1f 100644 GIT binary patch delta 5639 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 delta 5558 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 From 198bbdad30775b214f3c135096e558926579dfb7 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 24 Jul 2023 11:10:56 +0800 Subject: [PATCH 09/45] =?UTF-8?q?feature=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/utils/BeanTransitionUtils.java | 55 +++++++++++++++---- 1 file changed, 43 insertions(+), 12 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 5ea71ffa..a884704f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3486,7 +3486,7 @@ public class BeanTransitionUtils { DdtxxBO ddtxxBO = new DdtxxBO(); List ddmxList = new ArrayList<>(); - if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(isinput.getSYSID())) { + if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(isinput.getSYSID()) || OrderInfoEnum.SYS_SOURCE_S4.getKey().equals(isinput.getSYSID())) { String zdataString = isinput.getZDATA(); FpkjReqSap req = JsonUtils.getInstance().parseObject(zdataString, FpkjReqSap.class); //批次信息 @@ -3506,10 +3506,10 @@ public class BeanTransitionUtils { // ddtxxBO.setXHFYH(""); // ddtxxBO.setXHFZH(""); // } else { - ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); - ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); - ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); - ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); + ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress()); + ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone()); + ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank()); + ddtxxBO.setXHFZH(deptEntity.getTaxpayerAccount()); // } ddtxxBO.setGMFBM(req.getZGFBH()); ddtxxBO.setKPR(req.getZKPRXM()); @@ -3519,6 +3519,9 @@ public class BeanTransitionUtils { ddtxxBO.setHJJE(req.getZBHSJE()); ddtxxBO.setHJSE(req.getZZSE()); ddtxxBO.setDDH(req.getZJSDH()); + if(StringUtils.isNotBlank(req.getZSNYX()) && ConfigureConstant.STRING_X.equals(req.getZSNYX())){ + ddtxxBO.setDDH(""); + } ddtxxBO.setBZDH(req.getZBZDH()); ddtxxBO.setXTLY(isinput.getSYSID()); //如果为X,表示数据来自电商系统，开票完成后需要推送给电商系统开票数据及板式文件。 @@ -3538,7 +3541,7 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(req.getZDSXT()) && StringUtils.isNotBlank(req.getZDSYWFL())){ ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_DSXT.getKey()+req.getZDSYWFL()); } - if(StringUtils.isNotBlank(req.getZSNYX())){ + if(StringUtils.isNotBlank(req.getZSNYX()) && ConfigureConstant.STRING_X.equals(req.getZSNYX())){ ddtxxBO.setXTLY(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey()); } ddtxxBO.setGSDM(req.getBUKRS()); @@ -3611,6 +3614,13 @@ public class BeanTransitionUtils { } ddmxxxBO.setPH(detail.getCHARG()); ddmxxxBO.setKB(ObjectUtil.isNull(detail.getKTYPE())?"":detail.getKTYPE()+(ObjectUtil.isNull(detail.getKNAME())?"":detail.getKNAME())); + BigDecimal decimal = new BigDecimal("0"); + if(StringUtils.isNotBlank(ddmxxxBO.getDJ()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getDJ())) == 0) { + ddmxxxBO.setDJ(""); + } + if (StringUtils.isNotBlank(ddmxxxBO.getSPSL()) && decimal.compareTo(new BigDecimal(ddmxxxBO.getSPSL())) == 0) { + ddmxxxBO.setSPSL(""); + } //判断单价*数量与金额的差额大于0.01，大于的话则反算 //判断小数点后位数,默认为8位,如果为全电,为15位 if(!ConfigureConstant.STRING_1.equals(ddmxxxBO.getFPHXZ())){ @@ -3636,19 +3646,40 @@ public class BeanTransitionUtils { } //如果是山能易行按照物料编码分组拆分订单 - if(StringUtils.isNotBlank(ddtxxBO.getXTLY())){ + if(StringUtils.isNotBlank(ddtxxBO.getXTLY()) && OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddtxxBO.getXTLY())){ Map> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); - for (int i = 0; i < collect.size(); i++) { + log.info("拆分数据：{}", JSONObject.toJSONString(collect)); + for (Map.Entry> listEntry : collect.entrySet()) { + List ddmxxxBOS = listEntry.getValue(); DdzxxBO ddzxxBONew = new DdzxxBO(); DdtxxBO ddtxxBONew = new DdtxxBO(); List ddmxLists = new ArrayList<>(); - BeanUtils.copyProperties(ddtxxBO,ddtxxBONew); - ddmxLists.addAll(collect.get(i)); + BeanUtils.copyProperties(ddtxxBO, ddtxxBONew); + BigDecimal zje = new BigDecimal("0.00"); + BigDecimal bhsje = new BigDecimal("0.00"); + BigDecimal se = new BigDecimal("0.00"); + for (DdmxxxBO ddmxxxBO : ddmxxxBOS) { + if (StringUtils.isNotBlank(ddmxxxBO.getHSBZ()) && OrderInfoEnum.HSBZ_0.getKey().equals(ddmxxxBO.getHSBZ())) { + //不含稅 + BigDecimal bigDecimal = new BigDecimal(ddmxxxBO.getJE()).add(new BigDecimal(ddmxxxBO.getSE())); + zje = zje.add(bigDecimal); + bhsje = bhsje.add(new BigDecimal(ddmxxxBO.getJE())); + se = se.add(new BigDecimal(ddmxxxBO.getSE())); + } else { + //含稅 + zje = zje.add(new BigDecimal(ddmxxxBO.getJE())); + } + } + ddtxxBONew.setHJJE(bhsje.toPlainString()); + ddtxxBONew.setHJSE(se.toPlainString()); + ddtxxBONew.setJSHJ(zje.toPlainString()); + ddmxLists.addAll(ddmxxxBOS); - ddzxxBONew.setDDTXX(ddtxxBO); - ddzxxBONew.setDDMXXX(ddmxList); + ddzxxBONew.setDDTXX(ddtxxBONew); + ddzxxBONew.setDDMXXX(ddmxLists); ddzxxList.add(ddzxxBONew); } + }else{ ddzxxBO.setDDTXX(ddtxxBO); ddzxxBO.setDDMXXX(ddmxList); From 79999ae5f5db33b5df16f6df06f4e3128cc45cfb Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 24 Jul 2023 11:12:54 +0800 Subject: [PATCH 10/45] =?UTF-8?q?feature=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/order/constant/OrderInfoEnum.java | 1 + 1 file changed, 1 insertion(+) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index 58153fa1..8e27b782 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -408,6 +408,7 @@ public enum OrderInfoEnum { SYS_SOURCE_DSXT01("DSXT01","DSXT01"), SYS_SOURCE_DSXT02("DSXT02","DSXT02"), SYS_SOURCE_SNYXX("SNYXX","SNYXX"), + SYS_SOURCE_S4("S4","S4"), /** * 订单类型（0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据） From fd41a367d0bc927b6f9d5912e7d3d342361cce2b Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 24 Jul 2023 18:44:36 +0800 Subject: [PATCH 11/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E6=98=93=E8=A1=8C=E8=AE=A2=E5=8D=95=E5=9B=9E=E6=8E=A8=E3=80=81?= =?UTF-8?q?excel=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/dao/OrderProcessInfoMapper.java | 2 + .../service/impl/PushInvoiceServiceImpl.java | 133 ++++++++++-------- .../order/service/OrderProcessService.java | 2 + .../service/impl/OrderProcessServiceImpl.java | 5 + .../consumer/utils/BeanTransitionUtils.java | 3 + .../main/resources/download/OrderExcel.xlsx | Bin 12680 -> 12723 bytes .../resources/download/QdfpImportExcel.xlsx | Bin 12460 -> 12507 bytes .../mybatis/mapper/OrderProcessInfoMapper.xml | 26 ++++ 8 files changed, 109 insertions(+), 62 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java index f9c18ee3..3b2b5165 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java @@ -51,6 +51,8 @@ public interface OrderProcessInfoMapper { */ OrderProcessInfo queryOrderProcessInfoByFpqqlsh(@Param("fpqqlsh") String fpqqlsh, @Param("shList") List shList); + List queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh, @Param("shList")List shList); + /** * 根据批次号查询订单处理表数据 * 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 3a9e717d..3d0d421e 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 @@ -400,16 +400,16 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { //按照接口类型获取对应的报文数据 //推送影像系统 String content = getPushContent(fpTsMqData, pushInfo, shList); + if (StrUtil.isBlank(content)) { + log.warn("税号:{},组装请求报文为空,不进行推送数据", fpTsMqData.getNsrsbh()); + break; + } try { //推送影像系统 sendImageSys(content); } catch (Exception e) { e.printStackTrace(); } - if (StrUtil.isBlank(content)) { - log.warn("税号:{},组装请求报文为空,不进行推送数据", fpTsMqData.getNsrsbh()); - continue; - } OrderProcessInfo orderProcessInfo = null; Map requestMap = commonDisposeService.getRequestParameter(pushInfo.getNsrsbh(), pushInfo.getZipCode(), pushInfo.getEncryptCode(), content, pushInfo.getPushUrl(), pushInfo.getInterfaceType(), pushInfo.getVersionIdent()); if (OrderInfoEnum.INTERFACE_TYPE_INVOICE_PUSH_STATUS_1.getKey().equals(fpTsMqData.getPushType())) { @@ -1469,30 +1469,19 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } String version = pushInfo.getVersionIdent(); String pushWjl = pushInfo.getPushWjl(); - + List orderProcessInfoList = new ArrayList<>(); OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(fpTsMqData.getFpqqlsh(), shList); log.info("{}推送接口orderProcessInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo)); - - OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); - log.info("{}推送接口orderInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInfo)); - - List orderItemInfos = orderItemInfoService.selectOrderItemInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); - List ddmxxxList = BeanTransitionUtils.transitionOrderInvoiceItemV3(orderItemInfos); - List orderInvoiceItems = BeanTransitionUtils.transitionOrderInvoiceItem(orderItemInfos); - - OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo(); - orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh()); - OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); - log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo)); - - List orderProcessInfoRelevantList = orderProcessService.findTopParentList(orderProcessInfo, shList); - List orderExtensionInfos = BeanTransitionUtils.transitionOrderExtensionInfos(orderProcessInfoRelevantList); - log.info("{}推送接口orderExtensionInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderExtensionInfos)); - - /** - * 查询税控设备信息 - */ - String terminalCode = orderInvoiceInfo.getSksbdm(); + if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){ + List orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList); + int count = (int)orderProcessInfos.stream().filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt())).count(); + if(orderProcessInfos.size() != count){ + return null; + } + orderProcessInfoList.addAll(orderProcessInfos); + }else{ + orderProcessInfoList.add(orderProcessInfo); + } //判断推送版本 if (ConfigurerInfo.INTERFACE_VERSION_V5.equals(version) @@ -1500,9 +1489,10 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { List ddfpzxxV5s = new ArrayList<>(); try { - DdfpzxxV5 interfaceOrderV5 = interfaceServiceV5.getInterfaceOrderV5(orderProcessInfo, shList, ConfigureConstant.STRING_0); - - ddfpzxxV5s.add(interfaceOrderV5); + for (OrderProcessInfo processInfo : orderProcessInfoList) { + DdfpzxxV5 interfaceOrderV5 = interfaceServiceV5.getInterfaceOrderV5(processInfo, shList, ConfigureConstant.STRING_0); + ddfpzxxV5s.add(interfaceOrderV5); + } } catch (InterfaceException e) { throw new OrderReceiveException(e.getCode(), e.getMessage()); @@ -1512,6 +1502,25 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { content = JsonUtils.getInstance().toJsonString(ddfpzxxV5s); } else if (ConfigurerInfo.INTERFACE_VERSION_V4.equals(version) || ConfigurerInfo.INTERFACE_VERSION_V3.equals(version)) { + OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); + log.info("{}推送接口orderInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInfo)); + + List orderItemInfos = orderItemInfoService.selectOrderItemInfoByOrderId(orderProcessInfo.getOrderInfoId(), shList); + List ddmxxxList = BeanTransitionUtils.transitionOrderInvoiceItemV3(orderItemInfos); + List orderInvoiceItems = BeanTransitionUtils.transitionOrderInvoiceItem(orderItemInfos); + + OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo(); + orderInvoiceInfo1.setFpqqlsh(orderProcessInfo.getFpqqlsh()); + OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfo(orderInvoiceInfo1, shList); + log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo)); + + List orderProcessInfoRelevantList = orderProcessService.findTopParentList(orderProcessInfo, shList); + List orderExtensionInfos = BeanTransitionUtils.transitionOrderExtensionInfos(orderProcessInfoRelevantList); + log.info("{}推送接口orderExtensionInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderExtensionInfos)); + /** + * 查询税控设备信息 + */ + String terminalCode = orderInvoiceInfo.getSksbdm(); //新版本请求参数组装response DdfpcxRspBO ddfpcxRsp = new DdfpcxRspBO(); //新版本组装数据方式 @@ -1708,42 +1717,42 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } } else { //旧版本请求参数组装response - PushReqBO response = new PushReqBO(); - //旧版本组装方式 - List commonOrderInvocies = new ArrayList<>(); - CommonOrderInvocieBO commonOrderInvocie = new CommonOrderInvocieBO(); - log.info("==>推送旧的版本接口"); - OrderInvoiceHeadBO orderInvoiceHead = BeanTransitionUtils.transitionOrderInvoiceHead(orderInfo, orderInvoiceInfo); - boolean fpdmhmDp = (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(orderInvoiceInfo.getFpzlDm()) - || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getKey().equals(orderInvoiceInfo.getFpzlDm()) - || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getKey().equals(orderInvoiceInfo.getFpzlDm()) - || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderInvoiceInfo.getFpzlDm())) - && StringUtils.isNotEmpty(orderInvoiceInfo.getFphm()); - if (fpdmhmDp) { - /** - * 获取PDF判断 - */ - List fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,""); - if (ObjectUtil.isNotEmpty(fileDownLoadList)) { - orderInvoiceHead.setPDF_FILE(fileDownLoadList.get(0).getFileContent()); - } else { - orderInvoiceHead.setPDF_FILE(""); - } - } else { - orderInvoiceHead.setPDF_FILE(""); - } +// PushReqBO response = new PushReqBO(); +// //旧版本组装方式 +// List commonOrderInvocies = new ArrayList<>(); +// CommonOrderInvocieBO commonOrderInvocie = new CommonOrderInvocieBO(); +// log.info("==>推送旧的版本接口"); +// OrderInvoiceHeadBO orderInvoiceHead = BeanTransitionUtils.transitionOrderInvoiceHead(orderInfo, orderInvoiceInfo); +// boolean fpdmhmDp = (OrderInfoEnum.ORDER_INVOICE_TYPE_51.getKey().equals(orderInvoiceInfo.getFpzlDm()) +// || OrderInfoEnum.ORDER_INVOICE_TYPE_01.getKey().equals(orderInvoiceInfo.getFpzlDm()) +// || OrderInfoEnum.ORDER_INVOICE_TYPE_02.getKey().equals(orderInvoiceInfo.getFpzlDm()) +// || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderInvoiceInfo.getFpzlDm())) +// && StringUtils.isNotEmpty(orderInvoiceInfo.getFphm()); +// if (fpdmhmDp) { +// /** +// * 获取PDF判断 +// */ +// List fileDownLoadList = orderInvoiceInfoService.getInvoiceFile(orderInfo.getDdlx(), orderInvoiceInfo.getFpzlDm(), orderInvoiceInfo.getPdfUrl(), orderInvoiceInfo.getKplsh(), orderInvoiceInfo.getFpdm(), orderInvoiceInfo.getFphm(), orderInvoiceInfo.getXhfNsrsbh(), terminalCode,""); +// if (ObjectUtil.isNotEmpty(fileDownLoadList)) { +// orderInvoiceHead.setPDF_FILE(fileDownLoadList.get(0).getFileContent()); +// } else { +// orderInvoiceHead.setPDF_FILE(""); +// } +// } else { +// orderInvoiceHead.setPDF_FILE(""); +// } //组装 - commonOrderInvocie.setORDER_INVOICE_HEAD(orderInvoiceHead); - commonOrderInvocie.setORDER_INVOICE_ITEMS(orderInvoiceItems); - commonOrderInvocies.add(commonOrderInvocie); - - //发票开具状态码 0000 成功 9999 失败 - response.setSTATUS_CODE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getKey()); - response.setSTATUS_MESSAGE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getMessage()); - response.setCOMMON_ORDER_INVOCIE(commonOrderInvocies); - content = JsonUtils.getInstance().toJsonString(response); +// commonOrderInvocie.setORDER_INVOICE_HEAD(orderInvoiceHead); +// commonOrderInvocie.setORDER_INVOICE_ITEMS(orderInvoiceItems); +// commonOrderInvocies.add(commonOrderInvocie); +// +// //发票开具状态码 0000 成功 9999 失败 +// response.setSTATUS_CODE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getKey()); +// response.setSTATUS_MESSAGE(OrderInfoContentEnum.PUSH_ENTERPRISE_SUCCESS.getMessage()); +// response.setCOMMON_ORDER_INVOCIE(commonOrderInvocies); +// content = JsonUtils.getInstance().toJsonString(response); } return content; } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java index 3beb8826..9a3eb18a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java @@ -32,6 +32,8 @@ public interface OrderProcessService { */ OrderProcessInfo queryOrderProcessInfoByFpqqlsh(String fpqqlsh, List shList); + List queryOrderProcessInfoByBzdh(String bzdh, List shList); + /** * 根据订单请求批次号获取发票处理表数据 * diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java index c7b974ea..6073cd53 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java @@ -64,6 +64,11 @@ public class OrderProcessServiceImpl implements OrderProcessService { //订单与原始订单都需要使用,不能添加有效状态判断 return orderProcessInfoMapper.queryOrderProcessInfoByFpqqlsh(fpqqlsh, shList); } + + @Override + public List queryOrderProcessInfoByBzdh(String bzdh, List shList){ + return orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh, shList); + } @Override public List selectOrderProcessInfoByDdqqpch(String ddqqpch, List shList) { diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index a884704f..5ffc128f 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -3649,6 +3649,7 @@ public class BeanTransitionUtils { if(StringUtils.isNotBlank(ddtxxBO.getXTLY()) && OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddtxxBO.getXTLY())){ Map> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); log.info("拆分数据：{}", JSONObject.toJSONString(collect)); + int randomMun = 1; for (Map.Entry> listEntry : collect.entrySet()) { List ddmxxxBOS = listEntry.getValue(); DdzxxBO ddzxxBONew = new DdzxxBO(); @@ -3670,6 +3671,7 @@ public class BeanTransitionUtils { zje = zje.add(new BigDecimal(ddmxxxBO.getJE())); } } + ddtxxBONew.setDDQQLSH(isinput.getSAPKEY() + "0" + randomMun); ddtxxBONew.setHJJE(bhsje.toPlainString()); ddtxxBONew.setHJSE(se.toPlainString()); ddtxxBONew.setJSHJ(zje.toPlainString()); @@ -3678,6 +3680,7 @@ public class BeanTransitionUtils { ddzxxBONew.setDDTXX(ddtxxBONew); ddzxxBONew.setDDMXXX(ddmxLists); ddzxxList.add(ddzxxBONew); + randomMun++; } }else{ diff --git a/order-management-consumer/src/main/resources/download/OrderExcel.xlsx b/order-management-consumer/src/main/resources/download/OrderExcel.xlsx index 94aa0f2955a0d5ea6c972481e28bd144787e2c1f..36bd070dcfaf3e5f14fcdf4683746d54eafe945c 100644 GIT binary patch delta 4436 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 a00000000000002hlV33-2A(be00003b28!p delta 4343 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 diff --git a/order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx b/order-management-consumer/src/main/resources/download/QdfpImportExcel.xlsx index 3908390d1ff9c25321fc0585d3f30c36c7db85b2..52f3e233909449073a3dffe47953e19bf98fafb3 100644 GIT binary patch delta 1900 zcmV-y2b1`$VcTJ_XA21re3OQT1polwlW+?ie_u}%SrmUK;X5>w_+qlQrL3!l)(5gC z`>-1yc0WKZqcmx!Y-cpOPlHW&|x@UN3OcW&>ek+J>Zc>t_uG#IPZ;}ss#Y>?nUciytp>WVE z;cNJgU7QN@-U)G%=cQo4KH_j(wg}1WgTuG*jgTNQe*rDWX|tmXZ+nCOzyl_A=>p%RH!Skqc}~}; zE;AJ6*`%Of2!(Z_-PlI*j5tPIV|GawSg<=B)UDgxIbz-3Bpw3`kg1TwbG5RCCs7(@QeMZ% zQRRpx%aB{aR7xI2;BZ~b%j%2i?y}8wC@-9>#^&RY9(DP+TCK9lS~N+rHTDT!EGykK za?ad@_OGmHixJvNscDR;B}f#Q(a<|2^A_5Vl;$?179g4;GjZpIo(~OYfA$bB)1l?; zd-EOzLt7OXt|41AnzKEG(OVQBn-R1ydzw3z(gFs3?$Bz9n<{%zbC$)ncG zBzr*HS-RFukH=wlJO=3`e=XLSi~GkgdLh;2x&zWNnTX=SV`v#H%f)A+iIhM*qC4PUnbg^!v*{e~kb93qB1T>3OwZ z)TgqrMcvxt$A8mfaJ3iUz#fR4^iDJOr4s!M-C|^W&51j~dd983Tpp13B2Q1gD0>M^>DW_Phl z7^-cEY%(xF3Egec)~eE8B5MaESuxL7qc4%9sfA65l*|ZWG#y6qX2Rh-m7uCvPzi}33Omc5wh@VA*@m_UV28vNI0Y-N zQ;B2XByC9rV(IyR-uxLk8m@}mdj@T?QpPCg5afa6rO4zwMz`tMA0W?ICI!n&2{BrO zLBr(uDB_CpQp2?_6=<7*@f=AS%2kXO)+&mz;eQJ#nCUo&bmFYk1+(s{=U6fR$mW1U zLi)G>%LKCwS3qCwiD-)ye2-L5IYo*c9z{bhRYw|>E!CBUe(WJbt?`ii3F!y1GA-0HlOdCx7V+amk772 z)nx^9X6(crdzOJXUnisK<$Z*I*Bz|R-Vi}}E)8w6@07dl#V8%4BqTx4Cw-sv(qKS? zGfK!qHTIytO4k&M?eKqzVb>?8et43S0qyo^&~FiUfTYfS_#={U00030{{sL}O9KRx zATS!UC@Ovg2@iaehK2i*#5t0!VlNm260tFY7MK3u5CLEK1FGK-6lf^G4 m1x$OBC1I2BFBJiylLjz80XdUJFg*eNlY=lL2F5J_0001G!>iQ* delta 1872 zcmV-W2e0_sVXR@WXA227=v*&Z1pokUlW+?ie_L-FR}g-;-*u@ToMx-0}1~n**RzT$$ufUd$3tU z)3mnYb*duEV&|MaXU@!-Z@w8uZ~Y#ausz~KqCY6OIp;M8XX6E5aLg|}aC5)@a_74d zf6gXKUSZ5T5fpeg_m~&CTb{vzQBjm^_^u$jxp7IFylJzc62SWj` zgpZ*Ic5yPqd&k6ao|gg>_92Jkx;^0a3!Kdtd?-k6Zg`lpJrw-EJ>+jQfop{GjEa8G zXbAuA;=g-#eE!4s$UA{rIyig^-3ba3e-qGBj5gZ3@V+V$o8+R_ZSHbfc<_Zyh$W6% z(@;&Sg=eIgS6Wj_eF<7Jgb)6KUcTT&Fk}loxaa2X;KzZVuNWS#E3`O6XCl@ae~d0Y zgY^}VTc`+GENk)-BxmVnkwh~z{T528&f~&98uilIPs=wUzXQ(~nSWts6|!sA8S|)> z?I;r7SDG2-+Y%+{0DMaK$k9bbcK9&Kr^P@a< ziA;geL2|2b@P>JjX6w*M!}}?cf8NI+WscObCA+47Pp@ie8Pa7Ef2o$Y@FYsTL`v%z zIjS7iWErw6m`cghFuYsWaC#3$pwfc$#l$lrRzh(f0ik-x) zU1ybMW_cm3lEn^v-Gr4FUx1H`&F5DwHVlm&l5!k@gccJ28^%G3$sj>jOCf1rgbb8+t&MlU2gT(|GNTosn(&%Bp@t5%kK$1nkr=z%u3 zujV`aue&Cbs)UmsK-OkyVV1;YOuX7+3c|aPtoP2l;dBnUhQGi5f5Yvce#UQoM|xT5 z74>Lt=G7-Ef^Ltj&qlG5Ki%8j(cK+`U&{2QnhQs)V zCC%yeur!xEv^hu13y_#U@ujI^KaJ{EVd~^KHcceI?{3I;AG;Mlj=8xToK1Q>iF{TF z-VO?#&Wq82=-QXWe>e3j+CAAB*P*Lzi0&AsJL3wF+R@9bwFtBq&a=*O*~ns`ul6~s zb_NB-t9TyO7#TAG?OB!Ch>*SFc{D*wYwHZo&g$@PZGNT|jJVPwv&U+fdtl#iL@~IC zZIR5PIYs?9;KDeZTB(tjGe@nZ!2!KORVxQjeXdu7scE&mf6kCZZ=4vN5_Z?&&uNym zbu6B$DD7o3jRm2sMrv4IFub*-1&UdvUb>3x9@=5#@>>3|PZ{fa4_L0zsj3=#1JA=y zKGb_78x8U-iCklFK(9J&W=4w+q1iGP=}J98(iJrD>CtI)lqSc>i!F#Qevos>1U|^i zg9CbjW&6UZS}!)I^%K0$M$cDj%q#VoOK1@@t-W}QB-E$xFvPLeWlcK0)njxQ&F*5A zFjQI)-eh2a61vx<%~hqfMAi;TqHLb8Mz)cpsrgL^7tIJ^MumT!UF`UKk>?YW9~>34 z9}$oi1x_lo_FuEKCnf=Z(MrQG6o&5w-=XBbO|r4Mm9_&N!wUz36{mM0IopbDT9RnD z2k=ht6?_V>e4T-hVcKrBL-8`_|Ic^+b4W1RWU2EEN+-Dt5%maiK=NE9auuT6c;=3f zqYaaSrMZLzC$8dHzrAFlzG=|3B4 zrQ^&Jvn}jS`?y`U;EmY2H#%vJWm$S*FQBooaPi!IWt;x5r*4AkMeZba8nf;NNu%tFt#m5ROgbH`x!$UH@Vl&rsAO zbl{SqO9n9=`E=|P@=%RE>aWr@g=|0kUt+KCk~5c%V@myjB@R2p10bq%AODEx8=) K2A3@W00019Vv0ck diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 1944d52f..c054f8d5 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -144,6 +144,32 @@ + + + + From d1a1711a7f663f512ae4643c557ec11491113b0e Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 8 Aug 2023 15:35:38 +0800 Subject: [PATCH 28/45] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=86=9C=E4=BA=A7=E5=93=81=E8=A1=A5=E5=85=A8?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=B8=BA=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/consumer/constant/ExcelErrorMessageEnum.java | 4 ++-- .../modules/order/controller/ReceiveOrderController.java | 3 +++ 2 files changed, 5 insertions(+), 2 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 759019df..4d82f972 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 @@ -172,11 +172,11 @@ public enum ExcelErrorMessageEnum { /** * 项目数量小数点后超过8位 */ - ORDERINFO_XMSL_OVERLENGTHEIGHT("9636", "数量超出最大位数25位,小数点后8位,全电票小数点后15位"), + ORDERINFO_XMSL_OVERLENGTHEIGHT("9636", "数量超出最大位数25位,小数点后8位,全电票小数点后13位"), /** * 项目单价小数点后超过8位 */ - ORDERINFO_XMDJ_OVERLENGTHEIGHT("9637", "单价超出最大长度25位,小数点后8位,全电票小数点后15位"), + ORDERINFO_XMDJ_OVERLENGTHEIGHT("9637", "单价超出最大长度25位,小数点后8位,全电票小数点后13位"), /** * 备注超过200位 */ diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java index 5729f8ee..39703904 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java @@ -315,6 +315,9 @@ public class ReceiveOrderController { excel.setGhfDh(excel.getXhfDh()); excel.setGhfQylx(OrderInfoEnum.GHF_QYLX_04.getValue()); } + if(StringUtils.equals(OrderInfoEnum.TSPZ_2.getValue(), excel.getTspz())){ + excel.setXmdw(ConfigureConstant.STRING_LINAG); + } /** * 处理税率开具理由，将内容转为code * 参考：{@link OrderInfoEnum#ORDER_SLKJLY_0}、{@link OrderInfoEnum#ORDER_SLKJLY_2}、{@link OrderInfoEnum#ORDER_SLKJLY_3} From b5b3fefe055a7b73e7c9474cd9b0e4caaece3f3d Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 10 Aug 2023 11:52:15 +0800 Subject: [PATCH 29/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E6=98=93=E8=A1=8C=E5=BC=80=E7=A5=A8=E3=80=81=E5=86=B2=E7=BA=A2?= =?UTF-8?q?=E3=80=81=E4=BD=9C=E5=BA=9F=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=90=8C=E4=B8=80=E6=8A=A5=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/dao/OrderProcessInfoMapper.java | 4 + .../service/impl/OrderInfoServiceImpl.java | 92 +++++++++++++++++-- .../mybatis/mapper/OrderProcessInfoMapper.xml | 57 ++++++++++++ .../invoice/dao/OrderInvoiceInfoMapper.java | 2 + .../mybatis/mapper/OrderInvoiceInfoMapper.xml | 12 +++ 5 files changed, 160 insertions(+), 7 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java index 8926b375..cb349596 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java @@ -164,4 +164,8 @@ public interface OrderProcessInfoMapper { @Param("shList") List shList, @Param("entList") List entList); List getOrderMessageByMap(@Param("map") Map map); + + List selectOrderProcessByFpqqlshs(@Param("fpqqlshs") List fpqqlshs, @Param("shList") List shList); + + List selectOrderProcessByYFpdmHm(@Param("yFpdmHms") List yFpdmHms, @Param("shList") List shList); } 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 470d9ad6..fe51f94a 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 @@ -177,7 +177,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Resource private GsClientMapper gsClientMapper; - @Autowired + @Resource private BuyerMapper buyerMapper; @Resource @@ -2117,12 +2117,15 @@ public class OrderInfoServiceImpl implements OrderInfoService { */ @Override public R checkInvoiceSync(String operation,String nsrsbh,String params){ + // TODO 过滤一层系统来源 + List orderProcessInfos = null; + Map> collect = null; switch (operation){ case "0": - //根据报账单号查询未开发票数，且有效 param：发票请求流水号集合 - List orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdhs(Arrays.asList(params), Arrays.asList(nsrsbh)); + //根据报账单号查询未开发票数，且有效 param：发票请求流水号集合，是否需要添加来源校验 + orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdhs(Arrays.asList(params), Arrays.asList(nsrsbh)); //按照报账单分组统计 - Map> collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); + collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); Map> collect1 = Arrays.stream(params.split(",")).collect(Collectors.groupingBy(t -> t)); StringBuffer sb = new StringBuffer(); for (String s : collect1.keySet()) { @@ -2130,17 +2133,92 @@ public class OrderInfoServiceImpl implements OrderInfoService { sb.append("报账单号:").append(s).append("存在多笔未开订单,"); } } + if(StringUtils.isNotBlank(sb.toString())){ + return R.error(sb.toString()); + } break; case "1": - //根据报账单号查询未作废发票数，且有效 param：发票请求流水号集合 + //根据根据发票流水号查询报账单号，报账单号查询未作废发票数，且有效 param：发票请求流水号集合 + //1、根据流水号查询报账单号对应的流水号，如果查为1条，则过滤跳过，如果存在多条且有未开具提示 + // 2、如果存在多条且有未作废的提示，如果存在已冲红提示 + //AND ( oii.zf_bz = '0' OR oii.ch_bz = '0' ) + List paramList = Arrays.asList(params); + orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByFpqqlshs(paramList, Arrays.asList(nsrsbh)); + collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); + StringBuffer sb1 = new StringBuffer(); + List fpqqlsh = new ArrayList<>(); + for (String s : collect.keySet()) { + List orderProcessInfos1 = collect.get(s); + if(orderProcessInfos1.size() > 1){ + //如果全部开具成功再添加否则返回报错信息 + List collect2 = orderProcessInfos1.stream() + .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())) + .map(t -> t.getFpqqlsh()).collect(Collectors.toList()); + if(!collect2.isEmpty()){ + fpqqlsh.addAll(collect2); + }else{ + sb1.append("本次作废存在商旅发票，，存在未开具成功结算单:" + collect2.stream().collect(Collectors.joining(",")));//结算单号 + } + + } + } + //直接return ，存在未开具情况不查作废情况了 + if(StringUtils.isNotBlank(sb1.toString())){ + return R.error(sb1.toString()); + } + if(!fpqqlsh.isEmpty()){ + List invoiceInfos = orderInvoiceInfoMapper.selectInvoiceInfoByFpqqlshs(fpqqlsh); + List collect2 = invoiceInfos.stream().filter(t -> !paramList.contains(t.getFpqqlsh())).map(t -> t.getFphm()).collect(Collectors.toList()); + if(!collect2.isEmpty()){ + return R.error("本次作废存在商旅发票，以下发票号码未作废:"+collect2.stream().collect(Collectors.joining(","))+"，请注意"); + } + } break; case "2": //根据信息表编号查询到原发票号码的报账单 查询此报账单号是否存在多笔发票 param：信息表编号集合 + //通过原发票号码 查询报账单号，查到对应流水号，在通过流水号查找 另外一张发票的状态 + /** + * 原发票号码 查询order_invoice_info 表，在联查 order_process_info 查报账单号，再通过报账单号反查 发票请求流水号 + * 查到流水号，在查红字冲红 + */ + List list = Arrays.asList(params); + List yFpdmHm = list.stream().map(t->{ + String[] split = t.split("-"); + return "('" + split[0] + "','" + split[1] + "')"; + }).collect(Collectors.toList()); + orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByYFpdmHm(yFpdmHm, Arrays.asList(nsrsbh)); + collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); + StringBuffer sb2 = new StringBuffer(); + List yfpqqlsh = new ArrayList<>(); + for (String s : collect.keySet()) { + List orderProcessInfos1 = collect.get(s); + if(orderProcessInfos1.size() > 1){ + //如果全部开具成功再添加否则返回报错信息 + List collect2 = orderProcessInfos1.stream() + .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())) + .map(t -> t.getFpqqlsh()).collect(Collectors.toList()); + if(!collect2.isEmpty()){ + yfpqqlsh.addAll(collect2); + }else{ + sb2.append("本次冲红存在商旅发票，，存在未开具成功结算单:" + collect2.stream().collect(Collectors.joining(",")));//结算单号 + } + + } + } + //直接return ，存在未开具情况不查作废情况了 + if(StringUtils.isNotBlank(sb2.toString())){ + return R.error(sb2.toString()); + } + if(!yfpqqlsh.isEmpty()){ + List invoiceInfos = orderInvoiceInfoMapper.selectInvoiceInfoByFpqqlshs(yfpqqlsh); + List collect2 = invoiceInfos.stream().filter(t -> !list.contains(t.getFpdm() + "-" + t.getFphm())).map(t -> t.getFphm()).collect(Collectors.toList()); + if(!collect2.isEmpty()){ + return R.error("本次冲红存在商旅发票，以下发票号码未冲红:"+collect2.stream().collect(Collectors.joining(","))+"，请注意"); + } + } break; } - - return R.ok(); } diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 3c047bfe..1772ce58 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -1380,6 +1380,63 @@ + + + SELECT + oii.fpqqlsh,oii.fpdm,oii.fphm,oii.ddh + FROM + order_invoice_info oii + WHERE + oii.fpqqlsh IN + + #{fpqqlsh} + + AND ( oii.zf_bz = '0' OR oii.ch_bz = '0' ) + From 4bdee040c813e91c74192825f083a1cc8ebf78fc Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 10 Aug 2023 14:12:06 +0800 Subject: [PATCH 30/45] =?UTF-8?q?feature=EF=BC=9A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E8=A1=A518=E4=BD=8D0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/controller/ReceiveOrderController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java index 39703904..393404bc 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/ReceiveOrderController.java @@ -333,6 +333,9 @@ public class ReceiveOrderController { excel.setSlkjly(""); } } + if(StringUtils.isNotBlank(excel.getZxbm())){ + excel.setZxbm(String.format("%18s", excel.getZxbm()).replace(' ', '0')); + } } if (newOrderExcels.size() <= 0) { return R.error().put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()) From 27fdcc0f425f2659bb0bf0b088eaa871f991cf70 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 10 Aug 2023 14:55:58 +0800 Subject: [PATCH 31/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E5=95=86=E6=97=85=E5=BC=80=E7=A5=A8=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/OrderProcessInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 1772ce58..363afe8e 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -179,7 +179,7 @@ order_process_info op WHERE - bzdh = #{bzdh,jdbcType=VARCHAR} + bzdh = #{bzdhs,jdbcType=VARCHAR} bzdh in From 3727443bf165348c84f601b1488d7eb8ea554efe Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 10 Aug 2023 15:12:13 +0800 Subject: [PATCH 32/45] =?UTF-8?q?feature=EF=BC=9A=E6=98=93=E8=A1=8C?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 9 +++++++++ .../resources/mybatis/mapper/OrderProcessInfoMapper.xml | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 fe51f94a..1aa5d238 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 @@ -2125,6 +2125,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { //根据报账单号查询未开发票数，且有效 param：发票请求流水号集合，是否需要添加来源校验 orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdhs(Arrays.asList(params), Arrays.asList(nsrsbh)); //按照报账单分组统计 + if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ + return R.error("根据报账单号未查询到数据"); + } collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); Map> collect1 = Arrays.stream(params.split(",")).collect(Collectors.groupingBy(t -> t)); StringBuffer sb = new StringBuffer(); @@ -2144,6 +2147,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { //AND ( oii.zf_bz = '0' OR oii.ch_bz = '0' ) List paramList = Arrays.asList(params); orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByFpqqlshs(paramList, Arrays.asList(nsrsbh)); + if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ + return R.error("根据报账单号未查询到数据"); + } collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); StringBuffer sb1 = new StringBuffer(); List fpqqlsh = new ArrayList<>(); @@ -2187,6 +2193,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { return "('" + split[0] + "','" + split[1] + "')"; }).collect(Collectors.toList()); orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByYFpdmHm(yFpdmHm, Arrays.asList(nsrsbh)); + if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ + return R.error("根据报账单号未查询到数据"); + } collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); StringBuffer sb2 = new StringBuffer(); List yfpqqlsh = new ArrayList<>(); diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 363afe8e..c7d987aa 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -179,7 +179,10 @@ order_process_info op WHERE - bzdh = #{bzdhs,jdbcType=VARCHAR} + bzdh = + + #{bzdh,jdbcType=VARCHAR} + bzdh in From ca169a700a64aa8f5b8025cb4aca14ea1cd4ec30 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 10 Aug 2023 15:22:35 +0800 Subject: [PATCH 33/45] =?UTF-8?q?feature=EF=BC=9A=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=AD=98=E5=9C=A8=E5=8D=95=E6=9D=A1=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=8F=82=E4=B8=8E=E5=90=88=E5=B9=B6=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E6=AF=94=E5=AF=B9=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 1aa5d238..95856c02 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 @@ -2123,7 +2123,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { switch (operation){ case "0": //根据报账单号查询未开发票数，且有效 param：发票请求流水号集合，是否需要添加来源校验 - orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdhs(Arrays.asList(params), Arrays.asList(nsrsbh)); + orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdhs(Arrays.asList(params.split(",")), Arrays.asList(nsrsbh)); //按照报账单分组统计 if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ return R.error("根据报账单号未查询到数据"); @@ -2145,7 +2145,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { //1、根据流水号查询报账单号对应的流水号，如果查为1条，则过滤跳过，如果存在多条且有未开具提示 // 2、如果存在多条且有未作废的提示，如果存在已冲红提示 //AND ( oii.zf_bz = '0' OR oii.ch_bz = '0' ) - List paramList = Arrays.asList(params); + List paramList = Arrays.asList(params.split(",")); orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByFpqqlshs(paramList, Arrays.asList(nsrsbh)); if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ return R.error("根据报账单号未查询到数据"); @@ -2187,7 +2187,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { * 原发票号码 查询order_invoice_info 表，在联查 order_process_info 查报账单号，再通过报账单号反查 发票请求流水号 * 查到流水号，在查红字冲红 */ - List list = Arrays.asList(params); + List list = Arrays.asList(params.split(",")); List yFpdmHm = list.stream().map(t->{ String[] split = t.split("-"); return "('" + split[0] + "','" + split[1] + "')"; From 43e20ba5a3b6b4d3c4202fdf6f381dc8590e6d5b Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 11 Aug 2023 10:30:42 +0800 Subject: [PATCH 34/45] =?UTF-8?q?feature=EF=BC=9A=E5=95=86=E6=97=85?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/OrderProcessInfoMapper.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index c7d987aa..b93cccc4 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -146,29 +146,29 @@ From 045d78b120ed868836d8105bd2b028009aa2d181 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 11 Aug 2023 11:42:23 +0800 Subject: [PATCH 35/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E5=95=86=E6=97=85=E6=8E=A8=E9=80=81=E5=BD=B1=E5=83=8F=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E5=AF=B9=E8=B1=A1=E8=BD=AC=E6=95=B0=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PushInvoiceServiceImpl.java | 64 ++++++++++--------- 1 file changed, 34 insertions(+), 30 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 580eb894..d72dcafb 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 @@ -613,39 +613,43 @@ public class PushInvoiceServiceImpl implements PushInvoiceService { } private void sendImageSys(String content){ - DdfpzxxV5 ddfpzxxV5 = JsonUtils.getInstance().parseObject(content.substring(1,content.length()-1), DdfpzxxV5.class); - DdfpxxV5 ddfpxx = ddfpzxxV5.getDDFPXX(); - OutputInvoiceRequest outputInvoiceRequest = buildInvoiceRequest(ddfpxx); - if(outputInvoiceRequest.getInvoiceList() != null && outputInvoiceRequest.getInvoiceList().size() > 0){ - String fplxdm = ddfpxx.getFPLXDM(); - boolean b = OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(fplxdm) - || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(fplxdm) - || OrderInfoEnum.ORDER_INVOICE_TYPE_026.getKey().equals(fplxdm) - || OrderInfoEnum.ORDER_INVOICE_TYPE_028.getKey().equals(fplxdm); - if(!b){ - log.info("invoiceNo：{} not eleInvoice do not push",outputInvoiceRequest.getInvoiceList().get(0).getInvoiceNumber()); - return; + List ddfpzxxV5s = JsonUtils.getInstance().listBeanCopy(content, DdfpzxxV5.class); + //DdfpzxxV5 ddfpzxxV5 = JsonUtils.getInstance().parseObject(content.substring(1,content.length()-1), DdfpzxxV5.class); + for (DdfpzxxV5 ddfpzxxV5 : ddfpzxxV5s) { + + DdfpxxV5 ddfpxx = ddfpzxxV5.getDDFPXX(); + OutputInvoiceRequest outputInvoiceRequest = buildInvoiceRequest(ddfpxx); + if(outputInvoiceRequest.getInvoiceList() != null && outputInvoiceRequest.getInvoiceList().size() > 0){ + String fplxdm = ddfpxx.getFPLXDM(); + boolean b = OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(fplxdm) + || OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(fplxdm) + || OrderInfoEnum.ORDER_INVOICE_TYPE_026.getKey().equals(fplxdm) + || OrderInfoEnum.ORDER_INVOICE_TYPE_028.getKey().equals(fplxdm); + if(!b){ + log.info("invoiceNo：{} not eleInvoice do not push",outputInvoiceRequest.getInvoiceList().get(0).getInvoiceNumber()); + return; + } } - } - try { - String md5Encode = MD5.getMd5Encode(outputInvoiceRequest.getBillNum() + invoiceConfig.getSapSalt() ); - Map headerMap = Maps.newHashMap(); - headerMap.put("Authorization",md5Encode); - String param = JSONObject.toJSONString(outputInvoiceRequest); - if(StringUtils.isNotBlank(param) && param.length() > 400){ - param = param.substring(0,400); + try { + String md5Encode = MD5.getMd5Encode(outputInvoiceRequest.getBillNum() + invoiceConfig.getSapSalt() ); + Map headerMap = Maps.newHashMap(); + headerMap.put("Authorization",md5Encode); + String param = JSONObject.toJSONString(outputInvoiceRequest); + if(StringUtils.isNotBlank(param) && param.length() > 400){ + param = param.substring(0,400); + } + log.info("call image check request url：{}，header：{}，parameter：{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),param); + String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body(); + log.info("call image check return parameter：{}",body); + JSONObject jsonObject = JSONObject.parseObject(body); + String status = jsonObject.getString("status");//200 成功、 500 失败 + String message = jsonObject.getString("message"); + String data = jsonObject.getString("data"); + //暂时不保存状态 + } catch (Exception e) { + e.printStackTrace(); } - log.info("call image check request url：{}，header：{}，parameter：{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),param); - String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body(); - log.info("call image check return parameter：{}",body); - JSONObject jsonObject = JSONObject.parseObject(body); - String status = jsonObject.getString("status");//200 成功、 500 失败 - String message = jsonObject.getString("message"); - String data = jsonObject.getString("data"); - //暂时不保存状态 - } catch (Exception e) { - e.printStackTrace(); } } From 7955d2d8e09e64578c966f38ba389a4bcbdc7c20 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 11 Aug 2023 15:12:00 +0800 Subject: [PATCH 36/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E5=95=86=E6=97=85=E4=BD=9C=E5=BA=9F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) 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 95856c02..a38d811b 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 @@ -2157,15 +2157,13 @@ public class OrderInfoServiceImpl implements OrderInfoService { List orderProcessInfos1 = collect.get(s); if(orderProcessInfos1.size() > 1){ //如果全部开具成功再添加否则返回报错信息 - List collect2 = orderProcessInfos1.stream() - .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())) - .map(t -> t.getFpqqlsh()).collect(Collectors.toList()); - if(!collect2.isEmpty()){ - fpqqlsh.addAll(collect2); - }else{ - sb1.append("本次作废存在商旅发票，，存在未开具成功结算单:" + collect2.stream().collect(Collectors.joining(",")));//结算单号 + int count = (int)orderProcessInfos1.stream() + .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())).count(); + if(orderProcessInfos1.size() != count){ + sb1.append("本次作废存在商旅发票,存在未开具成功报账单:" + s); + continue; } - + fpqqlsh.addAll(orderProcessInfos1.stream().map(t -> t.getFpqqlsh()).collect(Collectors.toList())); } } //直接return ，存在未开具情况不查作废情况了 @@ -2176,7 +2174,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { List invoiceInfos = orderInvoiceInfoMapper.selectInvoiceInfoByFpqqlshs(fpqqlsh); List collect2 = invoiceInfos.stream().filter(t -> !paramList.contains(t.getFpqqlsh())).map(t -> t.getFphm()).collect(Collectors.toList()); if(!collect2.isEmpty()){ - return R.error("本次作废存在商旅发票，以下发票号码未作废:"+collect2.stream().collect(Collectors.joining(","))+"，请注意"); + return R.error("本次作废存在商旅发票，以下发票号码未作废:" + collect2.stream().collect(Collectors.joining(",")) + "，请注意"); } } break; From a82c3b2c1e952cfb79ffd655d9e8d614ef291930 Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 15 Aug 2023 15:11:39 +0800 Subject: [PATCH 37/45] =?UTF-8?q?feature=EF=BC=9A=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E5=86=B2=E7=BA=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderInfoServiceImpl.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) 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 a38d811b..13309d15 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 @@ -2160,7 +2160,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { int count = (int)orderProcessInfos1.stream() .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())).count(); if(orderProcessInfos1.size() != count){ - sb1.append("本次作废存在商旅发票,存在未开具成功报账单:" + s); + sb1.append(String.format("本次作废存在商旅发票,报账单:%s存在未开具成功的结算单;",s)); continue; } fpqqlsh.addAll(orderProcessInfos1.stream().map(t -> t.getFpqqlsh()).collect(Collectors.toList())); @@ -2174,7 +2174,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { List invoiceInfos = orderInvoiceInfoMapper.selectInvoiceInfoByFpqqlshs(fpqqlsh); List collect2 = invoiceInfos.stream().filter(t -> !paramList.contains(t.getFpqqlsh())).map(t -> t.getFphm()).collect(Collectors.toList()); if(!collect2.isEmpty()){ - return R.error("本次作废存在商旅发票，以下发票号码未作废:" + collect2.stream().collect(Collectors.joining(",")) + "，请注意"); + return R.error(String.format("本次作废存在商旅发票，以下发票号码未作废:%s，请注意" ,collect2.stream().collect(Collectors.joining(",")) )); } } break; @@ -2201,15 +2201,13 @@ public class OrderInfoServiceImpl implements OrderInfoService { List orderProcessInfos1 = collect.get(s); if(orderProcessInfos1.size() > 1){ //如果全部开具成功再添加否则返回报错信息 - List collect2 = orderProcessInfos1.stream() - .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())) - .map(t -> t.getFpqqlsh()).collect(Collectors.toList()); - if(!collect2.isEmpty()){ - yfpqqlsh.addAll(collect2); - }else{ - sb2.append("本次冲红存在商旅发票，，存在未开具成功结算单:" + collect2.stream().collect(Collectors.joining(",")));//结算单号 + int count = (int)orderProcessInfos1.stream() + .filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt())).count(); + if(orderProcessInfos1.size() != count){ + sb2.append(String.format("本次冲红存在商旅发票，报账单:%s存在未开具成功的结算单;",s)); + continue; } - + yfpqqlsh.addAll(orderProcessInfos1.stream().map(t -> t.getFpqqlsh()).collect(Collectors.toList())); } } //直接return ，存在未开具情况不查作废情况了 @@ -2220,7 +2218,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { List invoiceInfos = orderInvoiceInfoMapper.selectInvoiceInfoByFpqqlshs(yfpqqlsh); List collect2 = invoiceInfos.stream().filter(t -> !list.contains(t.getFpdm() + "-" + t.getFphm())).map(t -> t.getFphm()).collect(Collectors.toList()); if(!collect2.isEmpty()){ - return R.error("本次冲红存在商旅发票，以下发票号码未冲红:"+collect2.stream().collect(Collectors.joining(","))+"，请注意"); + return R.error(String.format("本次冲红存在商旅发票，以下发票号码需冲红:%s,请注意;",collect2.stream().collect(Collectors.joining(",")))); } } break; From d71543376fe8b4318109e8a29d079a6797e610c2 Mon Sep 17 00:00:00 2001 From: gaorl Date: Thu, 17 Aug 2023 18:03:03 +0800 Subject: [PATCH 38/45] =?UTF-8?q?feature=EF=BC=9A=E7=BA=A2=E5=AD=97?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=B1=B1=E8=83=BD=E6=98=93=E8=A1=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E9=80=9A=E8=BF=87=E6=8A=A5=E8=B4=A6=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E5=90=8C=E6=97=B6=E5=BC=80=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 13309d15..008bf376 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 @@ -1524,6 +1524,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(StrUtil.isNotBlank(commonOrderInfo.getOrderInfo().getBzdh())){ Map map = new HashMap(); map.put("bzdh",commonOrderInfo.getOrderInfo().getBzdh()); + if(StringUtils.isNotBlank(commonOrderInfo.getOrderInfo().getDdh())){ + map.put("ddh",commonOrderInfo.getOrderInfo().getDdh()); + } List orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(map, null, null); if(orderProcessInfos.size()!=1){ return R.error("根据报账单号未查到到结算单或查询到多条结算单,请检查!"); From d9a7d274919f4a3c7707a5aebe51afca66dfdd86 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 18 Aug 2023 09:16:54 +0800 Subject: [PATCH 39/45] =?UTF-8?q?feature=EF=BC=9A=E7=BA=A2=E5=AD=97?= =?UTF-8?q?=E5=BC=80=E5=85=B7=E5=B1=B1=E8=83=BD=E6=98=93=E8=A1=8C=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/OrderProcessInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index b93cccc4..9255f47c 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -1433,7 +1433,7 @@ order_process_info op1 INNER JOIN order_invoice_info oii on op1.order_info_id = oii.order_info_id WHERE (oii.fpdm,oii.fphm) IN - + #{yFpdmHm} AND op1.xtly = 'SNYXX' From 5050aee647366857377436a4ccc41fc5e26ac3b2 Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 18 Aug 2023 14:51:58 +0800 Subject: [PATCH 40/45] =?UTF-8?q?feature=EF=BC=9A=E5=B1=B1=E8=83=BD?= =?UTF-8?q?=E6=98=93=E8=A1=8C=E5=86=B2=E7=BA=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderInfoServiceImpl.java | 13 +++++++++---- .../mybatis/mapper/OrderProcessInfoMapper.xml | 10 ++++------ 2 files changed, 13 insertions(+), 10 deletions(-) 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 008bf376..934e1e13 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 @@ -2140,7 +2140,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { } } if(StringUtils.isNotBlank(sb.toString())){ - return R.error(sb.toString()); + return R.error(sb.toString().substring(0,sb.toString().length()-1)); } break; case "1": @@ -2153,6 +2153,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ return R.error("根据报账单号未查询到数据"); } + if(orderProcessInfos.stream().filter(t->OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(t.getXtly())).count() == 0){ + return R.ok(); + } collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); StringBuffer sb1 = new StringBuffer(); List fpqqlsh = new ArrayList<>(); @@ -2190,12 +2193,14 @@ public class OrderInfoServiceImpl implements OrderInfoService { */ List list = Arrays.asList(params.split(",")); List yFpdmHm = list.stream().map(t->{ - String[] split = t.split("-"); - return "('" + split[0] + "','" + split[1] + "')"; + return t.replace("-",""); }).collect(Collectors.toList()); orderProcessInfos = orderProcessInfoMapper.selectOrderProcessByYFpdmHm(yFpdmHm, Arrays.asList(nsrsbh)); if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ - return R.error("根据报账单号未查询到数据"); + return R.error("根据原发票代码号码未查询到数据"); + } + if(orderProcessInfos.stream().filter(t->OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(t.getXtly())).count() == 0){ + return R.ok(); } collect = orderProcessInfos.stream().collect(Collectors.groupingBy(t -> t.getBzdh())); StringBuffer sb2 = new StringBuffer(); diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 9255f47c..5728dd5c 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -1385,7 +1385,7 @@ From 0af27e113c33caf112e2b6597a46798f394ce79d Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 25 Aug 2023 16:16:07 +0800 Subject: [PATCH 41/45] =?UTF-8?q?feature=EF=BC=9A=E5=86=B2=E7=BA=A2?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=B3=BB=E7=BB=9F=E6=9D=A5=E6=BA=90=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dxhy/order/constant/OrderInfoEnum.java | 1 + .../service/impl/GenerateReadyOpenOrderServiceImpl.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index 8e27b782..140f52ed 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -409,6 +409,7 @@ public enum OrderInfoEnum { SYS_SOURCE_DSXT02("DSXT02","DSXT02"), SYS_SOURCE_SNYXX("SNYXX","SNYXX"), SYS_SOURCE_S4("S4","S4"), + SYS_SOURCE_EXCEL("FPPTEXCEL","FPPTEXCEL"), /** * 订单类型（0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单;6:历史数据订单;7:发票修复数据） 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 e498084a..0d068ebc 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 @@ -201,6 +201,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_3.getKey()); orderProcessInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); orderProcessInfo.setYzfp(ConfigureConstant.STRING_1); + orderProcessInfo.setXtly(OrderInfoEnum.SYS_SOURCE_EXCEL.getKey()); commonOrderInfo.setProcessInfo(orderProcessInfo); commonOrderInfo.getOrderInfo().setCreateTime(new Date()); commonOrderInfo.getOrderInfo().setUpdateTime(new Date()); @@ -648,7 +649,11 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setDdly(commonOrderInfo.getProcessInfo().getDdly()); orderProcessInfo.setDdzt(commonOrderInfo.getProcessInfo().getDdzt()); orderProcessInfo.setBzdh(StrUtil.isBlank(commonOrderInfo.getProcessInfo().getBzdh())?commonOrderInfo.getOrderInfo().getBzdh():commonOrderInfo.getProcessInfo().getBzdh()); - orderProcessInfo.setXtly("FPPTEXCEL"); + if(StringUtils.isNotBlank(commonOrderInfo.getProcessInfo().getXtly())){ + orderProcessInfo.setXtly(commonOrderInfo.getProcessInfo().getXtly()); + }else{ + orderProcessInfo.setXtly("FPPTEXCEL"); + } orderProcessInfo.setBhzt(ConfigureConstant.STRING_0); orderProcessInfo.setYzfp(commonOrderInfo.getProcessInfo().getYzfp()); orderProcessInfo.setKb(orderItemInfos.get(0).getKb()); From e287fa1694e2738bc4fb77cec0183499984a621d Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 25 Aug 2023 16:31:12 +0800 Subject: [PATCH 42/45] =?UTF-8?q?feature=EF=BC=9A=E5=86=B2=E7=BA=A2?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=B3=BB=E7=BB=9F=E6=9D=A5=E6=BA=90=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GenerateReadyOpenOrderServiceImpl.java | 5 +++-- .../modules/order/service/impl/OrderInfoServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) 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 0d068ebc..50d41ca1 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 @@ -134,6 +134,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder @Override public R reshRed(CommonOrderInfo commonOrderInfo, String uId) throws OrderSeparationException { log.info("{} 红字发票单张冲红!", LOGGER_MSG); + OrderProcessInfo processInfo = commonOrderInfo.getProcessInfo(); if (commonOrderInfo == null) { return R.setCodeAndMsg(OrderInfoContentEnum.READY_ORDER_CHECK_DATA_ERROR, null); } @@ -201,7 +202,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_3.getKey()); orderProcessInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); orderProcessInfo.setYzfp(ConfigureConstant.STRING_1); - orderProcessInfo.setXtly(OrderInfoEnum.SYS_SOURCE_EXCEL.getKey()); + orderProcessInfo.setXtly(processInfo.getXtly()); commonOrderInfo.setProcessInfo(orderProcessInfo); commonOrderInfo.getOrderInfo().setCreateTime(new Date()); commonOrderInfo.getOrderInfo().setUpdateTime(new Date()); @@ -652,7 +653,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder if(StringUtils.isNotBlank(commonOrderInfo.getProcessInfo().getXtly())){ orderProcessInfo.setXtly(commonOrderInfo.getProcessInfo().getXtly()); }else{ - orderProcessInfo.setXtly("FPPTEXCEL"); + orderProcessInfo.setXtly(OrderInfoEnum.SYS_SOURCE_EXCEL.getKey()); } orderProcessInfo.setBhzt(ConfigureConstant.STRING_0); orderProcessInfo.setYzfp(commonOrderInfo.getProcessInfo().getYzfp()); 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 934e1e13..effae7e2 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 @@ -1561,6 +1561,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { // 冲红生成待开单据 commonOrderInfo.setTerminalCode(terminalCode); commonOrderInfo.getOrderInfo().setSksbCode(terminalCode); + commonOrderInfo.setProcessInfo(op); R excuSingle = generateReadyOpenOrderService.reshRed(commonOrderInfo, uid); if (!excuSingle.get(OrderManagementConstant.CODE).equals(OrderInfoContentEnum.SUCCESS.getKey())) { return R.error().put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()) From 5613ec42e01224e58c44b304e4256e5638a8937f Mon Sep 17 00:00:00 2001 From: gaorl Date: Fri, 25 Aug 2023 17:06:42 +0800 Subject: [PATCH 43/45] =?UTF-8?q?feature=EF=BC=9A=E5=86=B2=E7=BA=A2?= =?UTF-8?q?=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 effae7e2..7e1f1afb 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 @@ -1523,9 +1523,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { OrderProcessInfo op = null; if(StrUtil.isNotBlank(commonOrderInfo.getOrderInfo().getBzdh())){ Map map = new HashMap(); - map.put("bzdh",commonOrderInfo.getOrderInfo().getBzdh()); + map.put("bzdh",commonOrderInfo.getOrderInfo().getBzdh().trim()); if(StringUtils.isNotBlank(commonOrderInfo.getOrderInfo().getDdh())){ - map.put("ddh",commonOrderInfo.getOrderInfo().getDdh()); + map.put("ddh",commonOrderInfo.getOrderInfo().getDdh().trim()); } List orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(map, null, null); if(orderProcessInfos.size()!=1){ From f8ca14a902f0286c0e3ddc439933754ba86673c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Fri, 1 Sep 2023 16:15:08 +0800 Subject: [PATCH 44/45] feature --- .../consumer/openapi/service/impl/SDEnregyServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 08818ea3..f35573aa 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 @@ -390,9 +390,9 @@ public class SDEnregyServiceImpl extends SDEnregyServiceAbstract { commodityCodeEntity.setSortId((long) i); // 维护税编和商品编码 - if (commodityCodeEntity != null && StringUtils.isNotBlank(commodityCodeEntity.getSsflMc())) { - commodityCodeEntity.setSsflMc(commodityCodeEntity.getSsflMc()); - } +// if (commodityCodeEntity != null && StringUtils.isNotBlank(commodityCodeEntity.getSsflMc())) { +// commodityCodeEntity.setSsflMc(commodityCodeEntity.getSsflMc()); +// } if (commodityCodeEntity != null && StringUtils.isNotBlank(commodityCodeEntity.getSpbm())) { commodityCodeEntity.setSpbm(commodityCodeEntity.getSpbm()); // commodityCodeEntity.setWlflbm(commodityCodeEntity.getSpbm()); From d66cb1eff21ced6bea112a42c004e9813c43e406 Mon Sep 17 00:00:00 2001 From: wangrangrang Date: Tue, 5 Sep 2023 18:56:52 +0800 Subject: [PATCH 45/45] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E7=A9=BA=E5=AF=BC=E8=87=B4=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/GenerateReadyOpenOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 50d41ca1..cfe4eaf9 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 @@ -202,7 +202,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder orderProcessInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_3.getKey()); orderProcessInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey()); orderProcessInfo.setYzfp(ConfigureConstant.STRING_1); - orderProcessInfo.setXtly(processInfo.getXtly()); + orderProcessInfo.setXtly(processInfo==null?"":processInfo.getXtly()); commonOrderInfo.setProcessInfo(orderProcessInfo); commonOrderInfo.getOrderInfo().setCreateTime(new Date()); commonOrderInfo.getOrderInfo().setUpdateTime(new Date());