2 Incheckningar 615b4ec44c ... 9dfc17f4fa

Upphovsman SHA1 Meddelande Datum
  lfx 9dfc17f4fa Merge remote-tracking branch 'origin/master' 2 månader sedan
  lfx affec74643 mc 2 månader sedan

+ 1 - 1
mjava-mc/src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@ logging:
   config: classpath:logback-spring.xml
   path: /home/server/mc/log/
   level:
-    com.malk.*: debug
+    com.malk.*: info
 
 # dingtalk
 dingtalk:

+ 2 - 2
mjava-xzkj/src/main/java/com/malk/xzkj/controller/IVController.java

@@ -168,7 +168,7 @@ public class IVController {
             String kind = UtilMap.getString(item, "TypeDescription");
             String invoiceName = UtilMap.getString(item, "SubTypeDescription");
             if (kind.equals("全电发票")) {
-                kind = invoiceName.contains("专用发票") ? "全电专用发票" : "全电普通发票";
+                kind = invoiceName.contains("铁路电子客票")?"火车票":invoiceName.contains("专用发票") ? "全电专用发票" : "全电普通发票";
             }
             if (kind.equals("增值税发票")) {
                 kind = invoiceName.contains("增值税专用发票") ? "增值税专用发票" : "增值税普通发票";
@@ -329,7 +329,7 @@ public class IVController {
                 McException.exceptionAccess(serial + "已存在, 请勿重复提交!");
             }
             // prd 仅仅识别 报销 用途的发票
-            if (dto.getType().equals("报销") && !dto.getKindName().contains("车票") && !dto.getKindName().contains("车发票") && !dto.getKindName().contains("定额发票")) {
+            if (dto.getType().contains("报销") && !dto.getKindName().contains("车票") && !dto.getKindName().contains("车发票") && !dto.getKindName().contains("定额发票")) {
                 String serialTips = serial + "有疑问";
                 try {
                     // ppExt: 识别与验真后抬头对比 [全电票, 新版本识别接口, 返回名称为: 电子发票(普通发票) 不包含全电标识, 发类型为: 全电发票. 注意取值]