From 3cb1475730f9b86430369f263ffcfd679f7f0750 Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Sun, 10 May 2020 19:05:39 +0800
Subject: [PATCH] p

---
 src/main/java/com/gszc/entity/Invoice.java    |  6 ++++++
 .../gszc/service/impl/CustomServiceImpl.java  |  2 +-
 .../gszc/service/impl/InvoiceServiceImpl.java | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gszc/entity/Invoice.java b/src/main/java/com/gszc/entity/Invoice.java
index 2ba5461..c6d8c61 100644
--- a/src/main/java/com/gszc/entity/Invoice.java
+++ b/src/main/java/com/gszc/entity/Invoice.java
@@ -83,4 +83,10 @@ public class Invoice implements Serializable {
 
     private String statusCode;
 
+    @ApiModelProperty(value = "发票拍照")
+    private String invoiceImg;
+
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String taxMoney;
 }
diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
index 7c8d7bd..aa0930c 100644
--- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
@@ -115,7 +115,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         }
         List<Custom> customs = customMapper.selectList(miniUserId);
         for(Custom custom:customs){
-            List<CustomSupport> customSupports = customSupportMapper.selectList(new EntityWrapper<CustomSupport>().eq("custom_id", custom.getId()));
+            List<CustomSupport> customSupports = customSupportMapper.selectList(new EntityWrapper<CustomSupport>().eq("custom_id", custom.getId()).ne("status_code","logout"));
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("custom",custom);
             jsonObject.put("customSupports",customSupports);
diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
index f6b38b3..9b8013d 100644
--- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
@@ -11,6 +11,7 @@ import com.gszc.entity.InvoiceHeader;
 import com.gszc.mapper.CustomMapper;
 import com.gszc.mapper.InvoiceHeaderMapper;
 import com.gszc.mapper.InvoiceMapper;
+import com.gszc.service.CountService;
 import com.gszc.service.IInvoiceService;
 import com.gszc.util.KdniaoTrackQueryAPI;
 import com.gszc.util.Uuid8Utils;
@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Date;
@@ -49,12 +51,26 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     @Autowired
     CustomMapper customMapper;
 
+    @Autowired
+    CountService countService;
+
     public void addInvoice(Invoice invoice){
         String id = Uuid8Utils.generateShortUUID();
         invoice.setId(id);
         invoice.setStatusCode("disable");
         invoice.setCreateDate(new Date());
         invoice.setModifyDate(new Date());
+        BigDecimal money = invoice.getMoney();
+        String customId = invoice.getCustomId();
+        Custom custom = customMapper.selectById(customId);
+
+        try {
+            JSONObject jsonObject = countService.VATCount("4", "1", ""+custom.getRegisterType(), money.doubleValue());
+            BigDecimal money1 = jsonObject.getBigDecimal("money");
+            invoice.setTaxMoney(money1.toString());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         invoiceMapper.insert(invoice);
     }
 
@@ -90,6 +106,9 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     public JSONObject invoiceDetail(String invoiceId){
         JSONObject jsonObject = new JSONObject();
         Invoice invoice = invoiceMapper.selectById(invoiceId);
+        String customId = invoice.getCustomId();
+        Custom custom = customMapper.selectById(customId);
+        invoice.setCustomName(custom.getCompanyName());
         InvoiceHeader invoiceHeader = invoiceHeaderMapper.selectById(invoice.getInvoiceHeaderId());
         jsonObject.put("invoice",invoice);
         jsonObject.put("invoiceHeader",invoiceHeader);