diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/CheckNoDetailInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/CheckNoDetailInvoice.java index 9bbb30ab..75d1eaf7 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/CheckNoDetailInvoice.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/CheckNoDetailInvoice.java @@ -44,7 +44,14 @@ public class CheckNoDetailInvoice { private String checkCode; /** - * 金额 + * 不含税金额 */ private BigDecimal invoiceAmount; + + /** + * 总金额 + */ + private BigDecimal totalAmount; + + } diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java index dbdabbd5..2361d530 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java +++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java @@ -239,20 +239,23 @@ public class CheckTaskServiceImpl implements CheckTaskService { requestData.setInvoiceCode(""); // 发票号码 requestData.setInvoiceNo(checkNoDetailInvoice.getInvoiceCode() + checkNoDetailInvoice.getInvoiceNo()); + // 金额 + requestData.setInvoiceAmount(checkNoDetailInvoice.getTotalAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString()); + }else { // 发票代码 requestData.setInvoiceCode(checkNoDetailInvoice.getInvoiceCode()); // 发票号码 requestData.setInvoiceNo(checkNoDetailInvoice.getInvoiceNo()); + // 金额 + requestData.setInvoiceAmount(checkNoDetailInvoice.getInvoiceAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString()); + } // 开票时间 String sdate = (new SimpleDateFormat("yyyyMMdd")).format(checkNoDetailInvoice.getInvoiceDate()); requestData.setInvoiceDate(sdate); // 验证码 requestData.setCheckCode(checkNoDetailInvoice.getCheckCode()); - // 金额 - requestData - .setInvoiceAmount(checkNoDetailInvoice.getInvoiceAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString()); return requestData; } diff --git a/dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml b/dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml index 8e5ce341..627286da 100644 --- a/dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml +++ b/dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml @@ -38,7 +38,8 @@ invoice_no, invoice_date, check_code, - invoice_amount + invoice_amount, + total_amount FROM t_dx_record_invoice where detail_yesorno = '0' and source_system = '0'