ariesy 客运汽车票只有乘车人和身份证号都有的情况下才做价税分离

release
yefei 2 years ago
parent 0c92148d4a
commit 18c6b11297
  1. 2
      dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
  2. 42
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@ -454,6 +454,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
}
private void toDeptOrgCode(User user, List<TaxOrgCode> orgCodeList, List<SysDeptEntity> queryDept) {
log.info("查询到的企业列表为:{}",queryDept);
String qsStatus = "0";
String productType = "0";
if (queryDept.size() > 0) {
@ -469,6 +470,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
orgCodeList.addAll(oldTaxOrgCode);
qsStatus = queryDept.get(0).getQsStatus();
productType = queryDept.get(0).getProductType();
log.info("orgCodeList:{}",orgCodeList);
user.setOrgCodes(orgCodeList);
user.setQsStatus(qsStatus);
user.setProductType(productType);

@ -612,24 +612,24 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
InvoiceInfo invoiceInfo = convertToInvoiceInfo(invoice);
log.info("进行价税分离的发票信息为:{}", invoiceInfo);
ServiceResult<InvoiceInfo> invoiceResult = new ServiceResult<>();
//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();
if (data != null) {
invoice.setIsDeductible(data.getIsDeductible());
invoice.setTaxRate(data.getTaxRate());
if (data.getInvoiceAmount() != null) {
invoice.setTotalAmount(data.getInvoiceAmount().toString());
if(SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)){
if(StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())){
log.info("客运汽车票没有实名信息,不需要做价税分离");
}
if (data.getTaxAmount() != null) {
invoice.setTotalTax(data.getTaxAmount().toString());
}else{
invoiceResult = this.valoremTaxCount(invoiceInfo, "Y");
InvoiceInfo data = invoiceResult.getData();
if (data != null) {
invoice.setIsDeductible(data.getIsDeductible());
invoice.setTaxRate(data.getTaxRate());
if (data.getInvoiceAmount() != null) {
invoice.setTotalAmount(data.getInvoiceAmount().toString());
}
if (data.getTaxAmount() != null) {
invoice.setTotalTax(data.getTaxAmount().toString());
}
}
}
@ -637,16 +637,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
log.info("价税分离失败:{}", invoiceResult.getMsg());
return invoiceResult.getMsg();
}
// DynamicContextHolder.push(DbConstant.BASICS_READ);
//
// SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode);
// log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode));
// if(orgByCompCode != null) {
// reimburse.setGfTaxNo(orgByCompCode.getTaxno());
// reimburse.setGfName(orgByCompCode.getTaxname());
// reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone());
// reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount());
// }
reimburse = convertToReimburse(invoice, reimburse, fplxdm, company);

Loading…
Cancel
Save