Merge remote-tracking branch 'origin/test' into test

release
yishiqihuasheng 2 years ago
commit 66578409a5
  1. 16
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@ -610,19 +610,15 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
|| SNFplxEnum.JPXCD.getFplxDm().equals(fplxdm) || SNFplxEnum.CP.getFplxDm().equals(fplxdm)
|| SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)) {
//0523晚成伟提出新需求,客运汽车票必须实名才可以进行价税分离
if (SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm) && StringUtils.isEmpty(reimburse.getPassenger()) || StringUtils.isEmpty(reimburse.getPassengerSFZH())) {
return result;
}
InvoiceInfo invoiceInfo = convertToInvoiceInfo(invoice);
log.info("进行价税分离的发票信息为:{}", invoiceInfo);
if(SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)){
if(StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())){
return result;
}
}
//0523晚成伟提出新需求,客运汽车票必须实名才可以进行价税分离
// if(SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)){
// if(StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())){
// return result;
// }
// }
ServiceResult<InvoiceInfo> invoiceResult = this.valoremTaxCount(invoiceInfo, "Y");
InvoiceInfo data = invoiceResult.getData();

Loading…
Cancel
Save