diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java index bb9c7c6d..bfa83a0d 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java @@ -148,7 +148,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { queryMap.put("bzdh",bzdh); List orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(queryMap, null, null); //过滤留下有效订单,且判断有效订单是否存在开票中、已开票 - esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); + esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); if(orderProcessInfos == null || orderProcessInfos.isEmpty()){ esOutput.setZMESSAGE("根据报账单号未查询到唯一结算单"); poCommonResponseParam.setES_OUTPUT(esOutput); @@ -202,7 +202,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { return poCommonResponseParam; } - esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); + //esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); esOutput.setZMESSAGE("驳回状态更新成功"); poCommonResponseParam.setES_OUTPUT(esOutput); return poCommonResponseParam; 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 423f84a0..97fb0ae8 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 @@ -3603,7 +3603,7 @@ public class BeanTransitionUtils { EsOutput esOutput = new EsOutput(); esOutput.setBSKEY(ddpcxxRspV5.getDDQQPCH()); esOutput.setSAPKEY(ddpcxxRspV5.getDDQQPCH()); - if (OrderInfoContentEnum.INVOICE_ERROR_CODE_010000_V3.getKey().equals(ddpcxxRspV5.getZTDM())) { + if (OrderInfoContentEnum.INVOICE_ERROR_CODE_010000_V3.getKey().equals(ddpcxxRspV5.getZTDM())||OrderInfoContentEnum.INVOICE_ERROR_CODE_010002_V3.getKey().equals(ddpcxxRspV5.getZTDM())) { esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey()); } else { esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); diff --git a/order-management-consumer/src/main/resources/bootstrap.yaml b/order-management-consumer/src/main/resources/bootstrap.yaml index e3a47db7..d8ede0bf 100644 --- a/order-management-consumer/src/main/resources/bootstrap.yaml +++ b/order-management-consumer/src/main/resources/bootstrap.yaml @@ -39,7 +39,7 @@ sims: #订单数据库类型区分,要么mysql,要么Oracle,要么weblogic db: mysql #订单redis数据库类型区分,要么redis,要么redis-sentinel - redisDb: redis-sentinel + redisDb: redis # 0 mysql 1 oracle dataType: 0