Revert "红字信息表上传合并开发"

This reverts commit 7ca3f51d

jianshui-admin/src/main/resources/application-dev.yml

@@ -84,6 +84,3 @@ spring:
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
 ele_auth_url: https://sandbox.ele-cloud.com/api/
-logstash:
-  host: 43.138.58.64:14560
-  indexname: jianshui-dev

jianshui-admin/src/main/resources/application-prod.yml

@@ -81,6 +81,3 @@ spring:
         # #连接池最大阻塞等待时间（使用负值表示没有限制）
         max-wait: -1ms
 ele_auth_url: https://openapi.ele-cloud.com/api/dxhy-open-income/v1/
-logstash:
-  host: 43.138.58.64:14560
-  indexname: jianshui-prod

jianshui-admin/src/main/resources/application.yml

@@ -46,7 +46,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+    active: prod
   # 文件上传
   servlet:
     multipart:

jianshui-admin/src/main/resources/logback-spring.xml

@@ -71,51 +71,6 @@
         </encoder>
     </appender>
 	
-    <!--处理elk-->
-    <!--输出到logstash的appender-->
-    <springProperty scope="context" name="logstash-host" source="logstash.host"/>
-    <springProperty scope="context" name="logstash-indexname" source="logstash.indexname"/>
-
-    <appender name="logstash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <!--可以访问的logstash日志收集端口-->
-        <destination>${logstash-host}</destination>
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
-            <!--自定义字段，区分应用名称-->
-            <providers>
-                <pattern>
-                    <pattern>
-                        <!--输出日志可自定义，可根据自己需要配置-->
-                        {
-                        <!--es索引名称 -->
-                        "indexname":"${logstash-indexname}",
-                        <!--应用名称 -->
-                        "appname":"${spring.application.name}",
-                        <!--服务器ip -->
-                        <!--"host": "%ip",-->
-                        <!--应用端口 -->
-                        <!--"port": "${spring.application.index}",-->
-                        <!--打印时间 -->
-                        "timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS}",
-                        <!--线程名称 -->
-                        "thread": "%thread",
-                        <!--日志级别 -->
-                        "level": "%level",
-                        <!--日志名称 -->
-                        "logger_name": "%logger",
-                        <!--日志信息 -->
-                        "message": "%msg",
-                        <!--日志堆栈 -->
-                        "stack_trace": "%exception"
-                        }
-                    </pattern>
-                </pattern>
-            </providers>
-        </encoder>
-    </appender>
-    <root level="info">
-        <appender-ref ref="logstash" />
-    </root>
-	
 	<!-- 系统模块日志级别控制  -->
 	<logger name="com.jianshui" level="info" />
 	<!-- Spring日志级别控制  -->

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiServiceImpl.java

@@ -414,11 +414,12 @@ public class ElephantInvoiceApiServiceImpl implements IInvoiceApiService {
         } else if (StringUtils.equals(ddzt, "001999")) {
             invoice.setState(22); // "开票状态"
         } else if (StringUtils.equals(ddzt, "002000")) {
-            if (StringUtils.equals(ztdm, "002000")) {
+            /*f (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")) {