diff --git a/order-check/ReadMe.md b/order-check/ReadMe.md
deleted file mode 100644
index 89857238..00000000
--- a/order-check/ReadMe.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# 验证开票数据
-
-> 1.调用OrderCheckUtil.checkInterfaceParam(),入参为开票请求数据.返回一个map
-> 2.如果map中的errorCode为0000,说明校验通过,
-> 3.如果map中errorCode非0000,说明验证失败,获取errorMsg展示错误信息.
diff --git a/order-check/pom.xml b/order-check/pom.xml
deleted file mode 100644
index b8266bfd..00000000
--- a/order-check/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- order-management
- com.dxhy.order
- 6.1.2-STD
-
- 4.0.0
- order-check
- order-check
-
-
- UTF-8
-
-
-
-
-
-
- com.dxhy.order
- order-management-common
- ${modules.version}
- compile
-
-
- cn.hutool
- hutool-all
- ${hutool.version}
- compile
-
-
- junit
- junit
- test
-
-
- org.projectlombok
- lombok
- ${lombok.version}
- provided
-
-
-
-
-
diff --git a/order-check/src/main/java/com/dxhy/order/constant/DdkzxxBO.java b/order-check/src/main/java/com/dxhy/order/constant/DdkzxxBO.java
deleted file mode 100644
index 9cfcbbf1..00000000
--- a/order-check/src/main/java/com/dxhy/order/constant/DdkzxxBO.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.dxhy.order.constant;
-
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * 订单拆分合并关系协议beanV3
- *
- * @author ZSC-DXHY
- */
-@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-@Setter
-@Getter
-@ToString
-public class DdkzxxBO implements Serializable {
-
- /**
- * 订单请求流水号
- */
- private String DDQQLSH;
-
- /**
- * 订单号
- */
- private String DDH;
-
- /**
- * 订单类型(0:原始订单,1:拆分后订单,2:合并后订单,3:系统冲红订单,4:自动开票订单,5:作废重开订单)
- */
- private String DDLX;
-
- /**
- * 备用字段
- */
- private String BYZD1;
- private String BYZD2;
- private String BYZD3;
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/constant/DdmxxxBO.java b/order-check/src/main/java/com/dxhy/order/constant/DdmxxxBO.java
deleted file mode 100644
index 46c50461..00000000
--- a/order-check/src/main/java/com/dxhy/order/constant/DdmxxxBO.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.dxhy.order.constant;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * 订单发票全数据明细协议bean
- *
- * @author ZSC-DXHY
- */
-@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-@Setter
-@Getter
-@ToString
-public class DdmxxxBO implements Serializable {
-
- /**
- * 项目序号
- */
- private String XH;
-
- /**
- * 发票行性质
- */
- private String FPHXZ;
-
- /**
- * 商品编码
- */
- private String SPBM;
-
- /**
- * 自行编码
- */
- private String ZXBM;
-
- /**
- * 优惠政策标识
- */
- private String YHZCBS;
-
- /**
- * 零税率标识
- * 空:非零税率,0:出口零税,1:免税,2:不征税 3:普通零税率
- * 若填写了3(普通零税率), 则:YHZCBS填0,ZZSTSGL填空
- */
- private String LSLBS;
-
- /**
- * 增值税特殊管理
- */
- private String ZZSTSGL;
-
- /**
- * 项目名称
- */
- private String XMMC;
-
- /**
- * 规格型号
- */
- private String GGXH;
-
- /**
- * 单位
- */
- private String DW;
-
- /**
- * 项目数量
- */
- private String SPSL;
-
- /**
- * 项目单价
- */
- private String DJ;
-
- /**
- * 项目金额
- */
- private String JE;
-
- /**
- * 含税标志
- */
- private String HSBZ;
-
- /**
- * 税率
- */
- private String SL;
-
- /**
- * 税额
- */
- private String SE;
-
- /**
- * 扣除额
- */
- private String KCE;
-
- /**
- * 备用字段
- */
- private String BYZD1;
- private String BYZD2;
- private String BYZD3;
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/constant/DdpcxxBO.java b/order-check/src/main/java/com/dxhy/order/constant/DdpcxxBO.java
deleted file mode 100644
index 7fa835ed..00000000
--- a/order-check/src/main/java/com/dxhy/order/constant/DdpcxxBO.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.dxhy.order.constant;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * 订单开票请求 批次 协议bean,
- * V4版本,统一对外输出
- *
- * @author ZSC-DXHY-PC
- * @date 创建时间: 2018/12/18 16:43
- */
-@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-@Setter
-@Getter
-@ToString
-public class DdpcxxBO implements Serializable {
-
- /**
- * 订单请求批次号
- */
- private String DDQQPCH;
-
- /**
- * 纳税人识别号
- */
- private String NSRSBH;
-
- /**
- * 开票终端
- */
- private String KPZD;
-
- /**
- * 统一发票类型代码
- * 增值税专用发票: 004
- * 机动车销售统一发票:005
- * 二手车销售统一发票:006
- * 增值税普通发票: 007
- * 增值税普通发票(电子): 026
- * 增值税专用发票(电子):028
- */
- private String FPLXDM;
-
-
- /**
- * 企业开票方式(0:自动开票;1:手动开票;2:静态码开票;3:动态码开票),默认为0
- */
- private String KPFS;
-
- /**
- * 是否是成品油(0:非成品油;1:成品油),默认为0
- */
- private String CPYBS;
-
- /**
- * 扩展字段
- */
- private String KZZD;
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/constant/DdpcxxReqBO.java b/order-check/src/main/java/com/dxhy/order/constant/DdpcxxReqBO.java
deleted file mode 100644
index d3887667..00000000
--- a/order-check/src/main/java/com/dxhy/order/constant/DdpcxxReqBO.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dxhy.order.constant;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.List;
-
-
-/**
- * 发票对外请求协议beanV4版本,统一对外输出
- *
- * @author ZSC-DXHY
- */
-@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-@Setter
-@Getter
-@ToString
-public class DdpcxxReqBO implements Serializable {
-
- /**
- * 订单批次信息
- */
- private DdpcxxBO DDPCXX;
-
- /**
- * 多订单信息
- */
- private List DDZXX;
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/constant/DdtxxBO.java b/order-check/src/main/java/com/dxhy/order/constant/DdtxxBO.java
deleted file mode 100644
index cf36dca8..00000000
--- a/order-check/src/main/java/com/dxhy/order/constant/DdtxxBO.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package com.dxhy.order.constant;
-
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * 订单全数据协议bean
- *
- * @author ZSC-DXHY
- */
-@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-@Setter
-@Getter
-@ToString
-public class DdtxxBO implements Serializable {
- /**
- * 订单请求唯一流水号
- */
- private String DDQQLSH;
-
- /**
- * 纳税人识别号 销货方纳税人识别号
- */
- private String NSRSBH;
-
- /**
- * 纳税人名称 销货方纳税人名称
- */
- private String NSRMC;
-
- /**
- * 开票类型
- */
- private String KPLX;
-
- /**
- * 编码表版本号
- */
- private String BMBBBH;
-
- /**
- * 销售方纳税人识别号
- */
- private String XHFSBH;
-
- /**
- * 销售方名称
- */
- private String XHFMC;
-
- /**
- * 销售方地址
- */
- private String XHFDZ;
-
- /**
- * 销售方电话
- */
- private String XHFDH;
-
- /**
- * 销售方银行账号名称
- */
- private String XHFYH;
-
- /**
- * 销售方银行账号
- */
- private String XHFZH;
-
- /**
- * 购买方编码
- */
- private String GMFBM;
-
- /**
- * 购买方纳税人识别号
- */
- private String GMFSBH;
-
- /**
- * 购买方名称
- */
- private String GMFMC;
-
- /**
- * 购买方地址
- */
- private String GMFDZ;
-
- /**
- * 购买方固定电话
- */
- private String GMFDH;
-
- /**
- * 购买方银行账号名称
- */
- private String GMFYH;
-
- /**
- * 购买方银行账号
- */
- private String GMFZH;
-
- /**
- * 购买方企业类型
- */
- private String GMFLX;
-
- /**
- * 购买方省份
- */
- private String GMFSF;
-
- /**
- * 购买方手机
- */
- private String GMFSJH;
-
- /***
- * 购买方邮箱
- */
- private String GMFDZYX;
-
- /**
- * 开票人
- */
- private String KPR;
-
- /**
- * 收款人
- */
- private String SKR;
-
- /**
- * 复核人
- */
- private String FHR;
-
- /**
- * 原发票代码
- */
- private String YFPDM;
-
- /**
- * 原发票号码红字发票必填
- */
- private String YFPHM;
-
- /**
- * 清单标志
- */
- private String QDBZ;
-
- /**
- * 清单发票项目名称
- */
- private String QDXMMC;
-
- /**
- * 价税合计
- */
- private String JSHJ;
-
- /**
- * 合计金额(不含税)
- */
- private String HJJE;
-
- /**
- * 合计税额
- */
- private String HJSE;
-
- /**
- * 备注 冲红时必填
- * 增值税发票红字发票(非专票)开具时,备注要求:
- * 开具负数发票,必须在备注中注明“对应正数发票代码:XXXXXXXXX号码:YYYYYYYY”字样,其中“X”为发票代码,“Y”为发票号码。如未注明,系统自动追加。
- * 增值税发票红字发票(专票)开具时,备注要求:
- * 开具负数发票,必须在备注中注明“开具红字增值税专用发票信息表编号ZZZZZZZZZZZZZZZZ”字样,其中“Z”为开具红字增值税专用发票所需要的长度为16位信息表编号。如未注明,系统报错。
- */
- private String BZ;
-
- /**
- * 冲红原因
- */
- private String CHYY;
-
- /**
- * 特殊冲红标志
- * 冲红时必填:0正常冲红(电子发票)1特殊冲红(冲红纸质等)
- */
- private String TSCHBZ;
-
- /**
- * 红字信息表编号
- */
- private String HZXXBBH;
-
- /**
- * 订单号
- */
- private String DDH;
-
- /**
- * 退货单号
- */
- private String THDH;
-
- /**
- * 订单时间
- */
- private String DDSJ;
-
- /**
- * 门店号
- */
- private String MDH;
-
- /**
- * 业务类型区分企业业务线),可以企业自定义
- */
- private String YWLX;
-
- /**
- * 企业开票方式(0:自动开票;1:手动开票;2:静态码开票;3:动态码开票),默认为0
- */
- private String KPFS;
-
- /**
- * 提取码
- */
- private String TQM;
-
- /**
- * 动态码URL
- */
- private String DTM;
-
- /**
- * 订单状态
- */
- private String DDZT;
-
- /**
- * 订单状态对应的信息
- */
- private String DDZTXX;
-
- /**
- * 订单状态对应的信息
- */
- private String FPLXDM;
-
- /**
- * 订单类型(目前只有数据导入时使用,8为历史数据导入,9为发票修复数据)
- */
- private String DDLY;
-
- /**
- * 冲红标志(0:未冲红;1:全部冲红),针对历史数据导入使用
- */
- private String CHBZ;
-
- /**
- * 作废标志 (0:正常;1:已作废),针对历史数据导入使用
- */
- private String ZFBZ;
-
- /**
- * 是否拆分订单(0:不拆分;1:拆分)
- */
- private String SFCF;
- /**
- * 备用字段
- */
- private String BYZD1;
- private String BYZD2;
- private String BYZD3;
- private String BYZD4;
- private String BYZD5;
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/constant/DdzxxBO.java b/order-check/src/main/java/com/dxhy/order/constant/DdzxxBO.java
deleted file mode 100644
index 8b35ec9d..00000000
--- a/order-check/src/main/java/com/dxhy/order/constant/DdzxxBO.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.dxhy.order.constant;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 订单全数据 协议bean
- * 机动车和二手车后来新增数据,校验根据种类代码分开校验
- *
- * @author zsc
- * @date 2018年9月19日 15:14:50
- */
-@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-@Setter
-@Getter
-@ToString
-public class DdzxxBO implements Serializable {
-
- /**
- * 订单主体信息
- */
- private DdtxxBO DDTXX;
-
- /**
- * 二手车信息
- */
- private EsctxxBO ESCTXX;
-
- /**
- * 机动车信息
- */
- private JdctxxBO JDCTXX;
-
- /**
- * 订单明细信息
- */
- private List DDMXXX;
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/constant/EsctxxBO.java b/order-check/src/main/java/com/dxhy/order/constant/EsctxxBO.java
deleted file mode 100644
index 45fa5b69..00000000
--- a/order-check/src/main/java/com/dxhy/order/constant/EsctxxBO.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package com.dxhy.order.constant;
-
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * 二手车信息
- *
- * @author ZSC-DXHY
- * @date 创建时间: 2020-12-07 17:01
- */
-@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-@Setter
-@Getter
-@ToString
-public class EsctxxBO implements Serializable {
-
- /**
- * 开票方类型
- */
- private String KPFLX;
-
- /**
- * 车牌照号
- */
- private String CPZH;
-
- /**
- * 登记证号
- */
- private String DJZH;
-
- /**
- * 车辆类型
- */
- private String CLLX;
-
- /**
- * 车架号/车辆识别代码
- */
- private String CLSBDM;
-
- /**
- * 厂牌型号
- */
- private String CPXH;
-
- /**
- * 转入地车辆管理所名称
- */
- private String ZRDCLGLSMC;
-
- /**
- * 经营、拍卖单位名称
- */
- private String JYPMDW_MC;
-
- /**
- * 经营、拍卖单位地址
- */
- private String JYPMDW_DZ;
-
- /**
- * 经营、拍卖单位税号
- */
- private String JYPMDW_SH;
-
- /**
- * 经营、拍卖单位银行账号
- */
- private String JYPMDW_YHZH;
-
- /**
- * 经营、拍卖单位电话
- */
- private String JYPMDW_DH;
-
- /**
- * 二手车市场名称
- */
- private String SC_MC;
-
- /**
- * 二手车市场税号
- */
- private String SC_SH;
-
- /**
- * 二手车市场地址
- */
- private String SC_DZ;
-
- /**
- * 二手车市场银行账号
- */
- private String SC_YHZH;
-
- /**
- * 二手车市场电话
- */
- private String SC_DH;
-
- /**
- * 二手车销方代码
- */
- private String ESC_XHFDM;
-
- /**
- * 二手车销方名称
- */
- private String ESC_XHFMC;
-
- /**
- * 二手车销方地址
- */
- private String ESC_XHFDZ;
-
- /**
- * 二手车销方电话
- */
- private String ESC_XHFDH;
-
- /**
- * 车购税完税凭证号码
- */
- private String SC_CGSWSPZHM;
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/constant/JdctxxBO.java b/order-check/src/main/java/com/dxhy/order/constant/JdctxxBO.java
deleted file mode 100644
index 97060313..00000000
--- a/order-check/src/main/java/com/dxhy/order/constant/JdctxxBO.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.dxhy.order.constant;
-
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-/**
- * 机动车信息
- *
- * @author ZSC-DXHY
- * @date 创建时间: 2020-12-07 17:01
- */
-@SuppressWarnings("AlibabaLowerCamelCaseVariableNaming")
-@Setter
-@Getter
-@ToString
-public class JdctxxBO implements Serializable {
-
- /**
- * 车辆类型
- */
- private String CLLX;
-
- /**
- * 厂牌型号
- */
- private String CPXH;
-
- /**
- * 产地
- */
- private String CLCD;
-
- /**
- * 合格证号
- */
- private String HGZH;
-
- /**
- * 进口证明书号
- */
- private String JKZMSH;
-
- /**
- * 商检单号
- */
- private String SJDH;
-
- /**
- * 发动机号码
- */
- private String FDJHM;
-
- /**
- * 车辆识别单号
- */
- private String CLSBDH;
-
- /**
- * 完税凭证号码
- */
- private String WSPZHM;
-
- /**
- * 吨位
- */
- private String DW;
-
- /**
- * 限乘人数
- */
- private String XCRS;
-
- /**
- * 厂家信息
- */
- private String CJXX;
-
- /**
- * 身份证号码/组织机构代码
- */
- private String ZZJGDM;
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/util/BeanTransitionUtils.java b/order-check/src/main/java/com/dxhy/order/util/BeanTransitionUtils.java
deleted file mode 100644
index 074c940f..00000000
--- a/order-check/src/main/java/com/dxhy/order/util/BeanTransitionUtils.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package com.dxhy.order.util;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.RandomUtil;
-import com.dxhy.order.constant.*;
-import com.dxhy.order.model.*;
-import com.dxhy.order.utils.CommonUtils;
-import com.dxhy.order.utils.DecimalCalculateUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author :杨士勇
- * @ClassName :BeanTransition
- * @Description :bean转换工具类
- * @date :2018年10月15日 下午2:19:37
- */
-@SuppressWarnings("AlibabaMethodTooLong")
-@Slf4j
-public class BeanTransitionUtils {
- private static final String LOGGER_MSG = "(对象转换工具类)";
-
- /**
- * 对外订单数据转换为订单业务数据
- *
- * @param ddzxx
- * @return
- */
- public static CommonOrderInfo transitionCommonOrderInfoV3(DdzxxBO ddzxx) {
- CommonOrderInfo commonOrderInfo = new CommonOrderInfo();
-
- OrderInfo orderInfo = transitionOrderInfoV3(ddzxx.getDDTXX());
-
-
- List orderItemInfos = transitionOrderItemInfoV3(ddzxx.getDDMXXX(), orderInfo.getXhfNsrsbh());
-
- /**
- * 默认开票项目为明细行首行数据
- */
- orderInfo.setKpxm(orderItemInfos.get(0).getXmmc());
-
- commonOrderInfo.setOrderInfo(orderInfo);
- if (OrderInfoEnum.ORDER_INVOICE_TYPE_12.getKey().equals(orderInfo.getFpzlDm())) {
- /**
- * 如果机动车信息不为空,补全机动车信息
- */
-
- OrderInfoJdc orderInfoJdc = transitionJdctxx(ddzxx.getJDCTXX(), orderInfo);
- commonOrderInfo.setOrderInfoJdc(orderInfoJdc);
- }
- if (OrderInfoEnum.ORDER_INVOICE_TYPE_42.getKey().equals(orderInfo.getFpzlDm())) {
- /**
- * 如果二手车信息不为空,补全二手车信息
- */
- OrderInfoEsc orderInfoEsc = transitionOrderInfoEsc(ddzxx.getESCTXX(), orderInfo);
- commonOrderInfo.setOrderInfoEsc(orderInfoEsc);
- }
-
-
- commonOrderInfo.setOrderItemInfo(orderItemInfos);
-
- return commonOrderInfo;
- }
-
-
- /**
- * 自动开票接口数据转换--订单主体信息V3
- *
- * @param ddtxx
- * @return
- */
- public static OrderInfo transitionOrderInfoV3(DdtxxBO ddtxx) {
-
- OrderInfo orderInfo = new OrderInfo();
- orderInfo.setFpqqlsh(ddtxx.getDDQQLSH());
- //如果订单号为空的话, 自动生成12位的订单号
- orderInfo.setDdh(StringUtils.isBlank(ddtxx.getDDH()) ? RandomUtil.randomNumbers(ConfigureConstant.INT_12) : ddtxx.getDDH());
- orderInfo.setThdh(ddtxx.getTHDH());
- orderInfo.setGhfId(ddtxx.getGMFBM());
- orderInfo.setDdlx("0");
- Date ddrq = StringUtils.isBlank(ddtxx.getDDSJ()) ? new Date() : DateUtil.parse(ddtxx.getDDSJ());
- if (ddrq == null) {
- ddrq = new Date();
- }
- orderInfo.setDdrq(ddrq);
- orderInfo.setDsptbm("");
- orderInfo.setNsrsbh(ddtxx.getNSRSBH());
- orderInfo.setNsrmc(ddtxx.getNSRMC());
- orderInfo.setNsrdzdah(ddtxx.getNSRSBH());
- orderInfo.setSwjgDm("");
- orderInfo.setDkbz("0");
- /**
- * 外层进行补全,使用明细行第一行商品名称作为开票项目
- */
- orderInfo.setKpxm("");
- orderInfo.setBbmBbh(ddtxx.getBMBBBH());
- orderInfo.setXhfMc(ddtxx.getXHFMC());
- orderInfo.setXhfNsrsbh(ddtxx.getXHFSBH());
- orderInfo.setXhfDz(ddtxx.getXHFDZ());
- orderInfo.setXhfDh(ddtxx.getXHFDH());
- if (StringUtils.isNotBlank(ddtxx.getXHFYH())) {
- orderInfo.setXhfYh(ddtxx.getXHFYH());
- }
- if (StringUtils.isNotBlank(ddtxx.getXHFZH())) {
- orderInfo.setXhfZh(ddtxx.getXHFZH());
- }
- orderInfo.setGhfQylx(ddtxx.getGMFLX());
- orderInfo.setGhfSf(ddtxx.getGMFSF());
- orderInfo.setGhfMc(ddtxx.getGMFMC());
- orderInfo.setGhfNsrsbh(ddtxx.getGMFSBH());
- orderInfo.setGhfDz(ddtxx.getGMFDZ());
- orderInfo.setGhfDh(ddtxx.getGMFDH());
- if (StringUtils.isNotBlank(ddtxx.getGMFYH())) {
- orderInfo.setGhfYh(ddtxx.getGMFYH());
- }
- if (StringUtils.isNotBlank(ddtxx.getGMFZH())) {
- orderInfo.setGhfZh(ddtxx.getGMFZH());
- }
- orderInfo.setGhfSj(ddtxx.getGMFSJH());
- orderInfo.setGhfEmail(ddtxx.getGMFDZYX());
- orderInfo.setHyDm("");
- orderInfo.setHyMc("");
- orderInfo.setKpr(ddtxx.getKPR());
- orderInfo.setSkr(ddtxx.getSKR());
- orderInfo.setFhr(ddtxx.getFHR());
- orderInfo.setKplx(ddtxx.getKPLX());
-
- orderInfo.setFpzlDm(ddtxx.getFPLXDM());
- orderInfo.setYfpDm(ddtxx.getYFPDM());
- orderInfo.setYfpHm(ddtxx.getYFPHM());
- orderInfo.setChyy(ddtxx.getCHYY());
- orderInfo.setTschbz(ddtxx.getTSCHBZ());
- orderInfo.setHzxxbbh(ddtxx.getHZXXBBH());
- orderInfo.setCzdm("10");
- orderInfo.setQdBz(ddtxx.getQDBZ());
- orderInfo.setQdXmmc(ddtxx.getQDXMMC());
- if(StringUtils.isBlank(orderInfo.getQdXmmc())){
- CommonUtils.setQdXmmc(orderInfo);
- }
- orderInfo.setKphjje(ddtxx.getJSHJ());
- orderInfo.setHjbhsje(ddtxx.getHJJE());
- orderInfo.setHjse(ddtxx.getHJSE());
- if (StringUtils.isNotBlank(ddtxx.getJSHJ())) {
- orderInfo.setKphjje(DecimalCalculateUtil.decimalFormatToString(ddtxx.getJSHJ(), 2));
- }
- if (StringUtils.isNotBlank(ddtxx.getHJJE())) {
- orderInfo.setHjbhsje(DecimalCalculateUtil.decimalFormatToString(ddtxx.getHJJE(), 2));
- }
- if (StringUtils.isNotBlank(ddtxx.getHJSE())) {
- orderInfo.setHjse(DecimalCalculateUtil.decimalFormatToString(ddtxx.getHJSE(), 2));
- }
-
-
- orderInfo.setMdh("");
- orderInfo.setYwlx("");
-
- /**
- * 外层进行补全,使用最外层的数据进行填充
- */
- orderInfo.setKpjh("");
- orderInfo.setSld("");
- orderInfo.setSldMc("");
- orderInfo.setTqm(ddtxx.getTQM());
- orderInfo.setSfcf(ddtxx.getSFCF());
-
- orderInfo.setBz(ddtxx.getBZ());
- orderInfo.setCreateTime(new Date());
- orderInfo.setUpdateTime(new Date());
- orderInfo.setByzd1(ddtxx.getBYZD1());
- orderInfo.setByzd2(ddtxx.getBYZD2());
- orderInfo.setByzd3(ddtxx.getBYZD3());
- orderInfo.setByzd4(ddtxx.getBYZD4());
- orderInfo.setByzd5(ddtxx.getBYZD5());
- return orderInfo;
- }
-
- /**
- * 自动开票接口数据转换--机动车订单主体信息
- *
- * @param jdctxx
- * @return
- */
- public static OrderInfoJdc transitionJdctxx(JdctxxBO jdctxx, OrderInfo orderInfo) {
-
- OrderInfoJdc orderInfoJdc = new OrderInfoJdc();
- orderInfoJdc.setId("");
- orderInfoJdc.setOrderId("");
- orderInfoJdc.setProcessId("");
- orderInfoJdc.setFpqqlsh(orderInfo.getFpqqlsh());
- orderInfoJdc.setXhfNsrsbh(orderInfo.getXhfNsrsbh());
- orderInfoJdc.setCllx(jdctxx.getCLLX());
- orderInfoJdc.setCpxh(jdctxx.getCPXH());
- orderInfoJdc.setClcd(jdctxx.getCLCD());
- orderInfoJdc.setHgzh(jdctxx.getHGZH());
- orderInfoJdc.setJkzmsh(jdctxx.getJKZMSH());
- orderInfoJdc.setSjdh(jdctxx.getSJDH());
- orderInfoJdc.setFdjhm(jdctxx.getFDJHM());
- orderInfoJdc.setClsbdh(jdctxx.getCLSBDH());
- orderInfoJdc.setWspzhm(jdctxx.getWSPZHM());
- orderInfoJdc.setDw(jdctxx.getDW());
- orderInfoJdc.setXcrs(jdctxx.getXCRS());
- orderInfoJdc.setCjxx(jdctxx.getCJXX());
- orderInfoJdc.setZzjgdm(jdctxx.getZZJGDM());
- orderInfoJdc.setCreateTime(new Date());
- orderInfoJdc.setUpdateTime(new Date());
- orderInfoJdc.setByzd1("");
- orderInfoJdc.setByzd2("");
- orderInfoJdc.setByzd3("");
-
- return orderInfoJdc;
- }
-
-
- /**
- * 自动开票接口数据转换--二手车订单主体信息
- *
- * @param esctxx
- * @return
- */
- public static OrderInfoEsc transitionOrderInfoEsc(EsctxxBO esctxx, OrderInfo orderInfo) {
-
- OrderInfoEsc orderInfoEsc = new OrderInfoEsc();
- orderInfoEsc.setId("");
- orderInfoEsc.setOrderId("");
- orderInfoEsc.setProcessId("");
- orderInfoEsc.setFpqqlsh(orderInfo.getFpqqlsh());
- orderInfoEsc.setXhfNsrsbh(orderInfo.getXhfNsrsbh());
- orderInfoEsc.setKpflx(esctxx.getKPFLX());
- orderInfoEsc.setCpzh(esctxx.getCPZH());
- orderInfoEsc.setDjzh(esctxx.getDJZH());
- orderInfoEsc.setCllx(esctxx.getCLLX());
- orderInfoEsc.setClsbdm(esctxx.getCLSBDM());
- orderInfoEsc.setCpxh(esctxx.getCPXH());
- orderInfoEsc.setZrdclglsmc(esctxx.getZRDCLGLSMC());
- orderInfoEsc.setJypmdwMc(esctxx.getJYPMDW_MC());
- orderInfoEsc.setJypmdwDz(esctxx.getJYPMDW_DZ());
- orderInfoEsc.setJypmdwSh(esctxx.getJYPMDW_SH());
- orderInfoEsc.setJypmdwYhzh(esctxx.getJYPMDW_YHZH());
- orderInfoEsc.setJypmdwDh(esctxx.getJYPMDW_DH());
- orderInfoEsc.setScMc(esctxx.getSC_MC());
- orderInfoEsc.setScSh(esctxx.getSC_SH());
- orderInfoEsc.setScDz(esctxx.getSC_DZ());
- orderInfoEsc.setScYhzh(esctxx.getSC_YHZH());
- orderInfoEsc.setScDh(esctxx.getSC_DH());
- orderInfoEsc.setEscXhfdm(esctxx.getESC_XHFDM());
- orderInfoEsc.setEscXhfmc(esctxx.getESC_XHFMC());
- orderInfoEsc.setEscXhfdz(esctxx.getESC_XHFDZ());
- orderInfoEsc.setEscXhfdh(esctxx.getESC_XHFDH());
- orderInfoEsc.setScCgswspzhm(esctxx.getSC_CGSWSPZHM());
- orderInfoEsc.setCreateTime(new Date());
- orderInfoEsc.setUpdateTime(new Date());
- orderInfoEsc.setByzd1("");
- orderInfoEsc.setByzd2("");
- orderInfoEsc.setByzd3("");
-
- return orderInfoEsc;
- }
-
- /**
- * 自动开票接口数据转换--订单明细信息
- *
- * @param ddmxxxes
- * @return
- */
- public static List transitionOrderItemInfoV3(List ddmxxxes, String xhfNsrsbh) {
- List orderItemInfos = new ArrayList<>();
- for (int i = 0; i < ddmxxxes.size(); i++) {
- OrderItemInfo orderItemInfo = new OrderItemInfo();
- DdmxxxBO orderInvoiceItem = ddmxxxes.get(i);
- orderItemInfo.setSphxh(StringUtils.isBlank(orderInvoiceItem.getXH()) ? String.valueOf(i + 1) : orderInvoiceItem.getXH());
- orderItemInfo.setXmmc(orderInvoiceItem.getXMMC());
- orderItemInfo.setXmdw(orderInvoiceItem.getDW());
- orderItemInfo.setGgxh(orderInvoiceItem.getGGXH());
-
- orderItemInfo.setXmdj(orderInvoiceItem.getDJ());
- orderItemInfo.setXmsl(orderInvoiceItem.getSPSL());
-
- orderItemInfo.setHsbz(orderInvoiceItem.getHSBZ());
- orderItemInfo.setFphxz(orderInvoiceItem.getFPHXZ());
- orderItemInfo.setSpbm(orderInvoiceItem.getSPBM());
- orderItemInfo.setZxbm(orderInvoiceItem.getZXBM());
- orderItemInfo.setYhzcbs(orderInvoiceItem.getYHZCBS());
- orderItemInfo.setLslbs(orderInvoiceItem.getLSLBS());
- orderItemInfo.setZzstsgl(orderInvoiceItem.getZZSTSGL());
- orderItemInfo.setKce(orderInvoiceItem.getKCE());
- orderItemInfo.setXmje(orderInvoiceItem.getJE());
- orderItemInfo.setSl(orderInvoiceItem.getSL());
- orderItemInfo.setSe(orderInvoiceItem.getSE());
- orderItemInfo.setXhfNsrsbh(xhfNsrsbh);
- orderItemInfo.setWcje("0.00");
- orderItemInfo.setByzd1(orderInvoiceItem.getBYZD1());
- orderItemInfo.setByzd2(orderInvoiceItem.getBYZD2());
- orderItemInfo.setByzd3(orderInvoiceItem.getBYZD3());
- orderItemInfo.setCreateTime(new Date());
- orderItemInfos.add(orderItemInfo);
- }
- return orderItemInfos;
- }
-
-
-}
diff --git a/order-check/src/main/java/com/dxhy/order/util/OrderCheckUtil.java b/order-check/src/main/java/com/dxhy/order/util/OrderCheckUtil.java
deleted file mode 100644
index 1c92e92b..00000000
--- a/order-check/src/main/java/com/dxhy/order/util/OrderCheckUtil.java
+++ /dev/null
@@ -1,2606 +0,0 @@
-package com.dxhy.order.util;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.dxhy.order.constant.*;
-import com.dxhy.order.model.*;
-import com.dxhy.order.utils.CheckParamUtil;
-import com.dxhy.order.utils.CommonUtils;
-import com.dxhy.order.utils.DecimalCalculateUtil;
-import com.dxhy.order.utils.ValidateUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.regex.Matcher;
-
-/**
- * 校验工具类
- *
- * @author ZSC-DXHY
- * @date 创建时间: 2021-12-23 16:13
- */
-@SuppressWarnings({"AlibabaMethodTooLong", "AlibabaAvoidComplexCondition"})
-@Slf4j
-public class OrderCheckUtil {
-
- private static final String LOGGER_MSG = "(开票接口校验类)";
-
- /**
- * 开票接口数据校验
- *
- * @param commonOrderReq
- * @return
- */
- public static Map checkInterfaceParam(DdpcxxReqBO commonOrderReq) {
- String terminalCode = "001";
- //声明返回结果map
- Map checkResultMap = new HashMap<>(10);
- checkResultMap.put(OrderManagementConstant.ERRORCODE, OrderInfoContentEnum.SUCCESS.getKey());
-
- if (commonOrderReq == null) {
- return generateErrorMap(OrderInfoContentEnum.HANDLE_ISSUE_202008);
- }
- DdpcxxBO ddpcxx = commonOrderReq.getDDPCXX();
- if (ddpcxx == null) {
- return generateErrorMap(OrderInfoContentEnum.HANDLE_ISSUE_202008);
- }
- List ddzxx = commonOrderReq.getDDZXX();
- if (ddzxx == null || ddzxx.size() <= 0) {
- return generateErrorMap(OrderInfoContentEnum.HANDLE_ISSUE_202004);
- }
-
- //校验批次表数据正确性与合法性
- checkResultMap = checkCommonOrderBatch(ddpcxx);
- if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
- return checkResultMap;
- }
-
- //校验发票主体数据和明细信息
- checkResultMap = checkCommonOrder(ddzxx, ddpcxx, terminalCode);
- if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
- return checkResultMap;
- }
- return checkResultMap;
- }
-
- /**
- * 校验请求订单批次数据信息正确性与合法性
- *
- * @param ddpcxx
- * @return
- */
- private static Map checkCommonOrderBatch(DdpcxxBO ddpcxx) {
- //声明返回结果map
- Map checkResultMap = new HashMap<>(10);
- checkResultMap.put(OrderManagementConstant.ERRORCODE, OrderInfoContentEnum.SUCCESS.getKey());
-
- /*
- * 订单请求批次号
- */
- checkResultMap = CheckParamUtil.checkParam(OrderInfoContentEnum.CHECK_ISS7PRI_107003, ddpcxx.getDDQQPCH());
- if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
- return checkResultMap;
- }
-
- /*
- * 订单请求纳税人识别号
- */
-
- checkResultMap = CheckParamUtil.checkNsrsbhParam(OrderInfoContentEnum.CHECK_ISS7PRI_107005,
- OrderInfoContentEnum.CHECK_ISS7PRI_107163, ddpcxx.getNSRSBH());
- if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
- return checkResultMap;
- }
-
- /*
- * 订单请求发票类型
- */
- checkResultMap = CheckParamUtil.checkParam(OrderInfoContentEnum.CHECK_ISS7PRI_107010, ddpcxx.getFPLXDM());
- if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
- return checkResultMap;
- }
- //订单请求发票类型合法性
- if (CommonUtils.checkFpzldm(ddpcxx.getFPLXDM())) {
- return generateErrorMap(OrderInfoContentEnum.CHECK_ISS7PRI_107013);
- }
-
- /*
- * 订单请求开票点
- */
- checkResultMap = CheckParamUtil.checkParam(OrderInfoContentEnum.CHECK_ISS7PRI_107009, ddpcxx.getKPZD());
- if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
- return checkResultMap;
- }
-
- /*
- * 订单请求开票方式
- */
- checkResultMap = CheckParamUtil.checkParam(OrderInfoContentEnum.CHECK_ISS7PRI_107015, ddpcxx.getKPFS());
- if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
- return checkResultMap;
- }
- //订单请求开票方式校验
- if (StringUtils.isNotBlank(ddpcxx.getKPFS()) && !OrderInfoEnum.ORDER_REQUEST_TYPE_0.getKey().equals(ddpcxx.getKPFS()) && !OrderInfoEnum.ORDER_REQUEST_TYPE_1.getKey().equals(ddpcxx.getKPFS()) && !OrderInfoEnum.ORDER_REQUEST_TYPE_2.getKey().equals(ddpcxx.getKPFS()) && !OrderInfoEnum.ORDER_REQUEST_TYPE_3.getKey().equals(ddpcxx.getKPFS())) {
- return generateErrorMap(OrderInfoContentEnum.CHECK_ISS7PRI_107165);
- }
-
- /*
- * 订单请求是否成品油
- */
- checkResultMap = CheckParamUtil.checkParam(OrderInfoContentEnum.CHECK_ISS7PRI_107008, ddpcxx.getCPYBS());
- if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
- return checkResultMap;
- }
- //订单请求是否成品油校验
- if (StringUtils.isNotBlank(ddpcxx.getCPYBS()) && !OrderInfoEnum.ORDER_REQUEST_OIL_0.getKey().equals(ddpcxx.getCPYBS()) && !OrderInfoEnum.ORDER_REQUEST_OIL_1.getKey().equals(ddpcxx.getCPYBS())) {
- return generateErrorMap(OrderInfoContentEnum.CHECK_ISS7PRI_107166);
- }
-
- return checkResultMap;
- }
-
- /**
- * 校验请求发票数据信息
- *
- * @param ddzxxes
- * @param ddpcxx
- * @param terminalCode
- * @return
- */
- private static Map checkCommonOrder(List ddzxxes, DdpcxxBO ddpcxx, String terminalCode) {
- //声明返回结果map
- Map checkResultMap = new HashMap<>(10);
- checkResultMap.put(OrderManagementConstant.ERRORCODE, OrderInfoContentEnum.SUCCESS.getKey());
-
- /*
- * 循环处理数据
- */
- List