diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml index 8740cf2..322c40b 100644 --- a/jianshui-admin/src/main/resources/application-dev.yml +++ b/jianshui-admin/src/main/resources/application-dev.yml @@ -9,9 +9,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://81.70.100.158:3306/jianshui_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jianshui_dev - password: tHsWetXEjYFJsdAC +# url: jdbc:mysql://81.70.100.158:3306/jianshui_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://58.87.71.213:3306/jianshui_dev_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jianshui_dev + username: jianshui_dev_new +# password: tHsWetXEjYFJsdAC + password: WhpPBbmRpkfk7fBT # url: jdbc:mysql://101.42.102.111:3306/jianshui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: jianshui # password: ScDsCb2xPMtb5eW6 diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java index baadf18..dd47858 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java @@ -230,6 +230,7 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { contentJson = queryResult.getJsonData(); if (contentJson != null) { String ztdm = contentJson.getString("ZTDM"); +// 021002 020111 if (!StringUtils.equalsAny(ztdm, "020111", "020000", "010000")) { // 开票失败 if (StringUtils.equals("020002", ztdm)) { @@ -410,16 +411,20 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService { // 处理开票信息 String ddzt = ddfpxx.getDDZT(); // 000000 成功,001000 订单处理成功 001999开票失败 + // 021002 020111 + if (StringUtils.equals(ddzt, "000000")) { invoice.setState(2); // "开票状态" } else if (StringUtils.equals(ddzt, "001999")) { invoice.setState(22); // "开票状态" } else if (StringUtils.equals(ddzt, "002000")) { - if (StringUtils.equals(ztdm, "002000")) { + //kk TODO : 2023/9/6 目前的状态是开票中 + /*if (StringUtils.equals(ztdm, "002000")) { invoice.setState(22); // "开票状态" 辣鸡大象,订单开票异常的外层报文也是002000,内层报文也是这个 } else { invoice.setState(20); // "开票状态" - } + }*/ + invoice.setState(20); // "开票状态" } else if (StringUtils.equals(ddzt, "003000")) { invoice.setState(3); // "开票状态" } else if (StringUtils.equals(ddzt, "004000")) {