Merge branch 'dev-blfp' into test

release
高荣琳 2 years ago
commit 68c5bf1181
  1. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@ -1765,7 +1765,8 @@ public class OrderInfoServiceImpl implements OrderInfoService {
}
if(orderProcessInfo != null){
if(!OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt()) && OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){
if((!OrderInfoEnum.ORDER_STATUS_0.getKey().equals(orderProcessInfo.getDdzt())||ConfigureConstant.STRING_1.equals(orderProcessInfo.getYzfp()))
&& OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){
throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_OPERATED);
}

Loading…
Cancel
Save