diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java index 2b7db05..2771fb0 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/InvoiceAllImpl.java @@ -103,7 +103,7 @@ public class InvoiceAllImpl implements IInvoiceAll { if ("0000".equals(code)) { InvoiceAllYhdj yhdj = BeanUtil.copyProperties(yhdjDTO.getJsonData(), InvoiceAllYhdj.class); - + yhdj.setDqbm(yhdjDTO.getDqbm()); QueryWrapper yhdjQueryWrapper = new QueryWrapper<>(); yhdjQueryWrapper.eq("nsrsbh", yhdj.getNsrsbh()); yhdjQueryWrapper.eq("identity", companyservice.getIdentity()); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java index d80b3b9..5dde0ae 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java @@ -342,6 +342,10 @@ public class BillInfo extends BaseEntity @ApiModelProperty(value = "冲红原因") private String chyy; + + + + @TableField(exist=false) @ApiModelProperty(value = "开票人证件类型") private String KPRZJLX; @@ -352,8 +356,6 @@ public class BillInfo extends BaseEntity // 大象数电新增 @TableField(exist=false) - private String tdys; // 特定要素 - @TableField(exist=false) private String cezslxdm; // 差额征税类型代码 @TableField(exist=false) private String sgfplxdm; // 收购发票类型代码 @@ -428,13 +430,6 @@ public class BillInfo extends BaseEntity this.jzfwList = jzfwList; } - public String getTdys() { - return tdys; - } - - public void setTdys(String tdys) { - this.tdys = tdys; - } public String getCezslxdm() { return cezslxdm; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java index f5df871..93b4aa6 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java @@ -126,6 +126,11 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService { //kk TODO : 2023/9/15 V6数电新增 // 标准开具 Qdtxx qdtxx = BeanUtil.copyProperties(billInfo, Qdtxx.class); + + // TODO: 2023/9/22 特定要素类型代码处理 + qdtxx.setTdys(billInfo.getTdyslxdm()); + + qdtxx.setQydm(billInfo.getDqbm()); qdtxx.setFJYSLIST(billInfo.getFjyslist());// 附加要素列表 qdtxx.setHWYSLIST(billInfo.getHwysList()); // 货物运输 diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java index 1422d7a..bae30ee 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/JcskTest.java @@ -19,7 +19,8 @@ public class JcskTest { // String key = "Nlc6k8hs+KIPiTLxih3IZw=="; // 1486 // String key = "HwHDdrtl8VkuZ/K+mLn0lA=="; // 1235 // String key = "5lkC/Y5cRCtdzeroilBYFw=="; // 1246 - String key = "ubDUJvWWr26KTYHfzz02KA=="; // 1247 +// String key = "ubDUJvWWr26KTYHfzz02KA=="; // 1247 + String key = "S1jIlJRLXBNtIFihvQ0VPw=="; // 1501 // String key = "uIawjnF+dXZa60h8cyI/MA=="; // 1483 // String key = "W45KUNcF+EA9rodLz96V2w=="; // 1487 // String key = "GGzLrdR6Y8FXIXkMq94StA=="; // 1488 @@ -523,6 +524,29 @@ public class JcskTest { "}"; order = "{\"terminalNumber\":\"\",\"orderno\":\"22481b71-a120-6718-1d10-f738bbd562c8\",\"sellerBank\":\"安国中成村镇银行股份有限公司\",\"checker\":\"\",\"saleaddress\":\"北京市东城区朝阳外大街1021\",\"payee\":\"\",\"hsbz\":\"2\",\"kjlx\":\"\",\"saleaccount\":\"37011619041050001239\",\"qdbz\":\"0\",\"ext\":{\"sfhqsyed\":false},\"xsfnsrsbh\":\"92370214MACAAEK16E\",\"xsflxdh\":\"18761829981\",\"cpybz\":\"0\",\"fjh\":\"\",\"tax\":\"0.06\",\"dkbz\":\"0\",\"phone\":\"\",\"dqbm\":\"\",\"xsfyhzh\":\"37011619041050001239\",\"jshj\":\"1.06\",\"tsfs\":\"2\",\"detail\":[{\"fphxz\":\"0\",\"lslbs\":\"\",\"unit\":\"\",\"hsbz\":\"0\",\"taxrate\":\"0.06\",\"yhzcbs\":\"0\",\"zzstsgl\":\"\",\"price\":\"\",\"num\":\"\",\"goodsname\":\"维修费\",\"spbm\":\"202\",\"spec\":\"\",\"taxfreeamt\":\"1.00\",\"tax\":\"0.06\",\"taxamt\":\"1.06\"}],\"taxamt\":\"1\",\"saletaxnum\":\"92370214MACAAEK16E\",\"sellerName\":\"城阳区兴顺通制冷设备维修服务部\",\"billInfono\":\"\",\"xsfkhh\":\"安国中成村镇银行股份有限公司\",\"fpqqlsh\":\"22481b71-a120-6718-1d10-f738bbd562c8\",\"qdxmmc\":\"\",\"gfxxconfirm\":\"\",\"invoiceLine\":\"82\",\"serviceId\":\"lzfpkj\",\"email\":\"\",\"salephone\":\"18761829981\",\"address\":\"山东省-济南市-历城区-浪潮路 18718221291\",\"fpdm\":\"\",\"bsrysfzjhm\":\"370882198408212815\",\"kptype\":\"1\",\"message\":\"\",\"clerk\":\"刘旭\",\"async\":\"true\",\"xsfmc\":\"城阳区兴顺通制冷设备维修服务部\",\"xsfdz\":\"北京市东城区朝阳外大街1021\",\"taxnum\":\"142421198604061019\",\"jqbh\":\"370882198408212815\",\"account\":\"中国建设银行济南市泉城支行 37011619041050001239\",\"invoicedate\":\"2023-08-16\",\"buyername\":\"鹿旭\",\"fphm\":\"\"}"; + + order = "{ \n" + + " \"appkey\": \"935248bf224f6c8431cdc1969f029519\",\n" + + " \"async\": false,\n" + + " \"bsrysfzjhm\":\"210682199210231083\",\n" + + " \"serviceId\": \"yhdj\",\n" + + " \"dqbm\": \"tianjin\",\n" + + " \"nsrsbh\": \"91120116093457252D\",\n" + + " \"jsonData\": {\n" + + " \"bsryxm\": \"钟琳\",\n" + + " \"dlsf\": \"3\",\n" + + " \"dlsfmm\": \"Qwerty12\",\n" + + " \"dlfs\": \"3\",\n" + + " \"dlmm\": \"Qwerty12\",\n" + + " \"dlzh\": \"17695929928\",\n" + + " \"nsrmc\": \"中交天航环保工程有限公司\",\n" + + " \"nsrsbh\": \"91120116093457252D\",\n" + + " \"bsrysfzjhm\": \"210682199210231083\",\n" + + " \"bsrysjhm\": \"17695929928\",\n" + + " \"zjh\": \"\",\n" + + " \"loginType\": \"0\"\n" + + " }\n" + + "}"; System.out.println(order); m = AisinoInvoiceDecryptUtil.encrypt(order, key); System.out.println("-------------------获取发票下载地址-----------------------------");