Merge branch 'release' of http://192.168.12.182/invoice/pt into 0507

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;
+
+
 }

dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java

@@ -230,18 +230,32 @@ public class CheckTaskServiceImpl implements CheckTaskService {
         requestData.setBuyerTaxNo(checkNoDetailInvoice.getBuyerTaxNo());
         // 发票类型
         requestData.setInvoiceType(checkNoDetailInvoice.getInvoiceType());
-        // 发票代码
-        requestData.setInvoiceCode(checkNoDetailInvoice.getInvoiceCode());
-        // 发票号码
-        requestData.setInvoiceNo(checkNoDetailInvoice.getInvoiceNo());
+
+        if("31".equals(checkNoDetailInvoice.getInvoiceType())
+                || "32".equals(checkNoDetailInvoice.getInvoiceType())
+                || "185".equals(checkNoDetailInvoice.getInvoiceType())
+                || "186".equals(checkNoDetailInvoice.getInvoiceType())){
+            // 发票代码
+            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;
     }

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'

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

@@ -389,10 +389,10 @@ public class SDNYMainProcessController extends AbstractController {
 
         if("31".equals(invoiceType) || "32".equals(invoiceType) || "185".equals(invoiceType) || "186".equals(invoiceType)){
             checkInvoice.put("invoiceCode", "");
-            checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString());
+            checkInvoice.put("invoiceNumber", invoiceCode == null ? checkInvoice.get("invoiceNo").toString() :invoiceCode + checkInvoice.get("invoiceNo").toString());
         }else {
             checkInvoice.put("invoiceCode", invoiceCode);
-            checkInvoice.put("invoiceNumber", invoiceCode == null ? checkInvoice.get("invoiceNo").toString() :invoiceCode + checkInvoice.get("invoiceNo").toString());
+            checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString());
         }
         String uuid = "";
         if (invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)) {
@@ -450,7 +450,7 @@ public class SDNYMainProcessController extends AbstractController {
                 if (detail.getString("detailAmount") != null && detail.getString("taxAmount") != null) {
                     Float je = Float.parseFloat(detail.getString("detailAmount"));
                     if(detail.getString("taxAmount") != null) {
-                        Float se = Float.parseFloat(detail.getString("se"));
+                        Float se = Float.parseFloat(detail.getString("taxAmount"));
                         hjje = je + se;
                     }else{
                         hjje = je;