From 8c90f46a14c9595a6f84e7c693ffe342ff3ec4e7 Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Sun, 10 May 2020 16:31:36 +0800
Subject: [PATCH] p

---
 .../java/com/gszc/controller/MiniCustomController.java   | 9 +++++++++
 .../java/com/gszc/controller/PcCustomController.java     | 4 ++--
 src/main/java/com/gszc/entity/Custom.java                | 2 ++
 src/main/java/com/gszc/entity/Invoice.java               | 4 ++++
 .../java/com/gszc/service/impl/CustomServiceImpl.java    | 3 ++-
 .../java/com/gszc/service/impl/InvoiceServiceImpl.java   | 3 ++-
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gszc/controller/MiniCustomController.java b/src/main/java/com/gszc/controller/MiniCustomController.java
index fa4f099..062f0e8 100644
--- a/src/main/java/com/gszc/controller/MiniCustomController.java
+++ b/src/main/java/com/gszc/controller/MiniCustomController.java
@@ -64,4 +64,13 @@ public class MiniCustomController {
         return ResultBuilder.withPayload(jsonObject).build();
     }
 
+    @PostMapping("/logoutCustom")
+    @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header")
+    @ApiOperation(value = "注销公司", notes = "注销公司")
+    public Result logoutCustom(String customId) {
+
+        customService.logoutCustom(customId);
+        return ResultBuilder.success().build();
+    }
+
 }
diff --git a/src/main/java/com/gszc/controller/PcCustomController.java b/src/main/java/com/gszc/controller/PcCustomController.java
index 9cd0ade..9d3a785 100644
--- a/src/main/java/com/gszc/controller/PcCustomController.java
+++ b/src/main/java/com/gszc/controller/PcCustomController.java
@@ -95,9 +95,9 @@ public class PcCustomController {
     @PostMapping("/enableCustom")
     @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header")
     @ApiOperation(value = "认证公司", notes = "认证公司")
-    public Result enableCustom(String customId, String businessLicense, String socialCreditCode,Long serviceBeginDate,Long serviceEndDate) {
+    public Result enableCustom(String customId, String businessLicense, String socialCreditCode,Long serviceBeginDate,Long serviceEndDate,Long buildDate) {
 
-        customService.enableCustom(customId,businessLicense,socialCreditCode,serviceBeginDate,serviceEndDate);
+        customService.enableCustom(customId,businessLicense,socialCreditCode,serviceBeginDate,serviceEndDate,buildDate);
         return ResultBuilder.success().build();
     }
 
diff --git a/src/main/java/com/gszc/entity/Custom.java b/src/main/java/com/gszc/entity/Custom.java
index a2f204b..cae4322 100644
--- a/src/main/java/com/gszc/entity/Custom.java
+++ b/src/main/java/com/gszc/entity/Custom.java
@@ -135,4 +135,6 @@ red yellow blue purple
     private String miniUserId;
     @ApiModelProperty(value = "园区")
     private String park;
+    @ApiModelProperty(value = "成立日期")
+    private Date buildDate;
 }
diff --git a/src/main/java/com/gszc/entity/Invoice.java b/src/main/java/com/gszc/entity/Invoice.java
index ed7b545..2ba5461 100644
--- a/src/main/java/com/gszc/entity/Invoice.java
+++ b/src/main/java/com/gszc/entity/Invoice.java
@@ -35,6 +35,10 @@ public class Invoice implements Serializable {
     @TableField(exist = false)
     private String customName;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String customType;
+
     @ApiModelProperty(value = "开票金额")
     private BigDecimal money;
 
diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
index ffe3c34..7c8d7bd 100644
--- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
@@ -278,7 +278,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
      * 认证
      * @param customId
      */
-    public void enableCustom(String customId, String businessLicense, String socialCreditCode,Long serviceBeginDate,Long serviceEndDate){
+    public void enableCustom(String customId, String businessLicense, String socialCreditCode,Long serviceBeginDate,Long serviceEndDate,Long buildDate){
 
         Custom custom = new Custom();
         custom.setId(customId);
@@ -288,6 +288,7 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         custom.setStatusCode("enable");
         custom.setServiceBeginDate(new Date(serviceBeginDate));
         custom.setServiceEndDate(new Date(serviceEndDate));
+        custom.setBuildDate(new Date(buildDate));
         customMapper.updateById(custom);
 
         miniUserService.certified(custom.getMiniUserId());
diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
index a41b379..a6759b4 100644
--- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
@@ -72,7 +72,8 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
             }
             List<Invoice> invoiceList = invoiceMapper.selectList(customId);
             for(Invoice invoice:invoiceList){
-                invoice.setCustomName(customs.getJSONObject(i).getString("companyName"));
+                invoice.setCustomName(customs.getJSONObject(i).getJSONObject("custom").getString("companyName"));
+                invoice.setCustomType(customs.getJSONObject(i).getJSONObject("custom").getString("registerType"));
                 String invoiceHeaderId = invoice.getInvoiceHeaderId();
                 InvoiceHeader invoiceHeader = invoiceHeaderMapper.selectById(invoiceHeaderId);
                 invoice.setInvoiceHeaderName(invoiceHeader.getCompanyName());