root
/
jianshui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'beta' into kk

Browse Source
beta-enc
dongxiaoke 2 years ago
parent a1ec608e27 7172a4ca12
commit 58c3295f24
2 changed files with 120 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 120
      jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java
  2. 11
      jianshui-platform/src/main/java/com/jianshui/platform/enums/InvoiceType.java

120
jianshui-admin/src/main/java/com/jianshui/api/controller/webservice/income/v1/impl/InvoiceCheckWebServiceImpl.java
Unescape View File

@ -414,7 +414,7 @@ public class InvoiceCheckWebServiceImpl {
getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
getInvoiceVO.setBz(invoiceCheck.getBz());
getInvoiceVO.setJqbh(invoiceCheck.getJqbh());
getInvoiceVO.setFpzl(invoiceCheck.getFpzl());
getInvoiceVO.setFplx(invoiceCheck.getFpzl());
getInvoiceVO.setJym(invoiceCheck.getJym());
getInvoiceVO.setFpje(invoiceCheck.getFpje());
getInvoiceVO.setFpse(invoiceCheck.getFpse());
@ -435,7 +435,7 @@ public class InvoiceCheckWebServiceImpl {
getInvoiceVO.setBz(invoiceCheck.getBz());
getInvoiceVO.setJqbh(invoiceCheck.getJqbh());
getInvoiceVO.setZfbz(invoiceCheck.getZfbz());
getInvoiceVO.setFpzl(invoiceCheck.getFpzl());
getInvoiceVO.setFplx(invoiceCheck.getFpzl());
getInvoiceVO.setJym(invoiceCheck.getJym());
getInvoiceVO.setFpje(invoiceCheck.getFpje());
getInvoiceVO.setFpse(invoiceCheck.getFpse());
@ -482,6 +482,69 @@ public class InvoiceCheckWebServiceImpl {
getInvoiceVO.setFpje(invoiceCheck.getFpje());
getInvoiceVO.setFpse(invoiceCheck.getFpse());
getInvoiceVO.setJshj(invoiceCheck.getJshj());
}else if (InvoiceType.DIAN_ZI_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())){
// 电子普票
getInvoiceVO.setFpdm(invoiceCheck.getFpdm());
getInvoiceVO.setFphm(invoiceCheck.getFphm());
getInvoiceVO.setKprq(newKprq);
getInvoiceVO.setGmfmc(invoiceCheck.getGmfmc());
getInvoiceVO.setGmfsbh(invoiceCheck.getGmfsbh());
getInvoiceVO.setGmfdzdh(invoiceCheck.getGmfdzdh());
getInvoiceVO.setGmfyhzh(invoiceCheck.getGmfyhzh());
getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
getInvoiceVO.setXfsbh(invoiceCheck.getXhfsbh());
getInvoiceVO.setXfdzdh(invoiceCheck.getXhfdzdh());
getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
getInvoiceVO.setBz(invoiceCheck.getBz());
getInvoiceVO.setJqbh(invoiceCheck.getJqbh());
getInvoiceVO.setFplx(invoiceCheck.getFpzl());
getInvoiceVO.setJym(invoiceCheck.getJym());
getInvoiceVO.setZfbz(invoiceCheck.getZfbz());
getInvoiceVO.setFpje(invoiceCheck.getFpje());
getInvoiceVO.setFpse(invoiceCheck.getFpse());
getInvoiceVO.setJshj(invoiceCheck.getJshj());
}else if (InvoiceType.ZHENG_ZHI_SHUI_PU_TONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())){
// 增值税普通发票
getInvoiceVO.setFpdm(invoiceCheck.getFpdm());
getInvoiceVO.setFphm(invoiceCheck.getFphm());
getInvoiceVO.setKprq(newKprq);
getInvoiceVO.setGmfmc(invoiceCheck.getGmfmc());
getInvoiceVO.setGmfsbh(invoiceCheck.getGmfsbh());
getInvoiceVO.setGmfdzdh(invoiceCheck.getGmfdzdh());
getInvoiceVO.setGmfyhzh(invoiceCheck.getGmfyhzh());
getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
getInvoiceVO.setXfsbh(invoiceCheck.getXhfsbh());
getInvoiceVO.setXfdzdh(invoiceCheck.getXhfdzdh());
getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
getInvoiceVO.setBz(invoiceCheck.getBz());
getInvoiceVO.setJqbh(invoiceCheck.getJqbh());
getInvoiceVO.setFplx(invoiceCheck.getFpzl());
getInvoiceVO.setJym(invoiceCheck.getJym());
getInvoiceVO.setZfbz(invoiceCheck.getZfbz());
getInvoiceVO.setFpje(invoiceCheck.getFpje());
getInvoiceVO.setFpse(invoiceCheck.getFpse());
getInvoiceVO.setJshj(invoiceCheck.getJshj());
}else if (InvoiceType.DIAN_ZI_ZHUAN_YONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())){
// 电子专用发票
getInvoiceVO.setFpdm(invoiceCheck.getFpdm());
getInvoiceVO.setFphm(invoiceCheck.getFphm());
getInvoiceVO.setKprq(newKprq);
getInvoiceVO.setGmfmc(invoiceCheck.getGmfmc());
getInvoiceVO.setGmfsbh(invoiceCheck.getGmfsbh());
getInvoiceVO.setGmfdzdh(invoiceCheck.getGmfdzdh());
getInvoiceVO.setGmfyhzh(invoiceCheck.getGmfyhzh());
getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
getInvoiceVO.setXfsbh(invoiceCheck.getXhfsbh());
getInvoiceVO.setXfdzdh(invoiceCheck.getXhfdzdh());
getInvoiceVO.setXfyhzh(invoiceCheck.getXhfyhzh());
getInvoiceVO.setBz(invoiceCheck.getBz());
getInvoiceVO.setJqbh(invoiceCheck.getJqbh());
getInvoiceVO.setFplx(invoiceCheck.getFpzl());
getInvoiceVO.setJym(invoiceCheck.getJym());
getInvoiceVO.setZfbz(invoiceCheck.getZfbz());
getInvoiceVO.setFpje(invoiceCheck.getFpje());
getInvoiceVO.setFpse(invoiceCheck.getFpse());
getInvoiceVO.setJshj(invoiceCheck.getJshj());
}else {
//通用结果
getInvoiceVO.setXfmc(invoiceCheck.getXhfmc());
@ -583,6 +646,42 @@ public class InvoiceCheckWebServiceImpl {
getInvoiceSphVO.setSl(detail.getSl());
getInvoiceSphVO.setSsflbm(detail.getSsflbm());
getInvoiceSphVOList.add(getInvoiceSphVO);
}else if (InvoiceType.DIAN_ZI_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())){
// 电子普票
getInvoiceSphVO.setHwmc(detail.getHwmc());
getInvoiceSphVO.setGgxh(detail.getGgxh());
getInvoiceSphVO.setJldw(detail.getJldw());
getInvoiceSphVO.setSpsl(detail.getSpsl());
getInvoiceSphVO.setBhsdj(detail.getBhsdj());
getInvoiceSphVO.setBhsje(detail.getJe());
getInvoiceSphVO.setSe("***");
getInvoiceSphVO.setSl("免税");
getInvoiceSphVO.setSsflbm(detail.getSsflbm());
getInvoiceSphVOList.add(getInvoiceSphVO);
}else if (InvoiceType.ZHENG_ZHI_SHUI_PU_TONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())){
// 增值税普通发票
getInvoiceSphVO.setHwmc(detail.getHwmc());
getInvoiceSphVO.setGgxh(detail.getGgxh());
getInvoiceSphVO.setJldw(detail.getJldw());
getInvoiceSphVO.setSpsl(detail.getSpsl());
getInvoiceSphVO.setBhsdj(detail.getBhsdj());
getInvoiceSphVO.setBhsje(detail.getJe());
getInvoiceSphVO.setSe(detail.getSe());
getInvoiceSphVO.setSl(detail.getSl());
getInvoiceSphVO.setSsflbm(detail.getSsflbm());
getInvoiceSphVOList.add(getInvoiceSphVO);
}else if (InvoiceType.DIAN_ZI_ZHUAN_YONG_FA_PIAO.getCode().equals(invoiceCheck.getFpzl())){
// 电子专用发票
getInvoiceSphVO.setHwmc(detail.getHwmc());
getInvoiceSphVO.setGgxh(detail.getGgxh());
getInvoiceSphVO.setJldw(detail.getJldw());
getInvoiceSphVO.setSpsl(detail.getSpsl());
getInvoiceSphVO.setBhsdj(detail.getBhsdj());
getInvoiceSphVO.setBhsje(detail.getJe());
getInvoiceSphVO.setSe(detail.getSe());
getInvoiceSphVO.setSl(detail.getSl());
getInvoiceSphVO.setSsflbm(detail.getSsflbm());
getInvoiceSphVOList.add(getInvoiceSphVO);
}else {
getInvoiceSphVO.setSsflbm(detail.getSpbmjc());
BeanUtils.copyProperties(detail, getInvoiceSphVO);
@ -609,11 +708,18 @@ public class InvoiceCheckWebServiceImpl {
// 航信明细行从1开始
getInvoiceSphVO.setId(getInvoiceSphVO.getId() + count);
// 防止转义
String getInvoiceSphVOJsonStr = JSON.toJSONString(getInvoiceSphVO, SerializerFeature.WriteSlashAsSpecial);
getInvoiceSphVOJsonStr = getInvoiceSphVOJsonStr.replace("免税","0.0%").replace("***","0.00");
JSONObject getInvoiceSphVOJson = JSONObject.parseObject(getInvoiceSphVOJsonStr);
Element sphElement = json2Element(result, "Sph", getInvoiceSphVOJson);
getInvoiceDoc.appendChild(sphElement);
if (!InvoiceType.DIAN_ZI_PU_PIAO.getCode().equals(invoiceCheck.getFpzl())){
String getInvoiceSphVOJsonStr = JSON.toJSONString(getInvoiceSphVO, SerializerFeature.WriteSlashAsSpecial);
getInvoiceSphVOJsonStr = getInvoiceSphVOJsonStr.replace("免税","0.0%").replace("***","0.00");
JSONObject getInvoiceSphVOJson = JSONObject.parseObject(getInvoiceSphVOJsonStr);
Element sphElement = json2Element(result, "Sph", getInvoiceSphVOJson);
getInvoiceDoc.appendChild(sphElement);
}else {
String getInvoiceSphVOJsonStr = JSON.toJSONString(getInvoiceSphVO, SerializerFeature.WriteSlashAsSpecial);
JSONObject getInvoiceSphVOJson = JSONObject.parseObject(getInvoiceSphVOJsonStr);
Element sphElement = json2Element(result, "Sph", getInvoiceSphVOJson);
getInvoiceDoc.appendChild(sphElement);
}
count ++;
}

11
jianshui-platform/src/main/java/com/jianshui/platform/enums/InvoiceType.java
Unescape View File

@ -7,14 +7,17 @@ package com.jianshui.platform.enums;
public enum InvoiceType {
SHU_DIAN_ZHUAN_PIAO("1", "数电专票"),
ZHUAN_PIAO("01", "专票"),
SHU_DIAN_PU_PIAO("2", "数电普票"),
JUAN_PIAO("11", "卷票"),
JI_DONG_CHE_PIAO("03", "机动车票"),
ZHENG_ZHI_SHUI_PU_TONG_FA_PIAO("04", "增值税普通发票"),
DIAN_ZI_ZHUAN_YONG_FA_PIAO("08", "电子专用发票"),
DIAN_ZI_PU_PIAO("10", "电子普票"),
JUAN_PIAO("11", "卷票"),
TONG_XING_FEI_FA_PIAO("14", "通行费发票"),
ER_SHOU_CHE_PIAO("15", "二手车票"),
QUAN_DIAN_PU_PIAO("22", "全电普票"),
QUAN_DIAN_ZHUAN_PIAO("21", "全电专票"),
TONG_XING_FEI_FA_PIAO("14", "通行费发票"),
ZHUAN_PIAO("01", "专票");
QUAN_DIAN_PU_PIAO("22", "全电普票");
private String code;

Write Preview
Loading…
Cancel
Save