From e4b3d330b04a42bb4baf9695d7954353d9c44962 Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Mon, 11 May 2020 17:10:34 +0800
Subject: [PATCH] p

---
 .../com/gszc/controller/PcCustomController.java    | 12 ++++++++++++
 src/main/java/com/gszc/entity/Invoice.java         |  4 ++++
 .../com/gszc/service/impl/CustomServiceImpl.java   | 14 ++++++++++++++
 .../com/gszc/service/impl/InvoiceServiceImpl.java  | 14 +++++++++++++-
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gszc/controller/PcCustomController.java b/src/main/java/com/gszc/controller/PcCustomController.java
index 9d3a785..e7de4d0 100644
--- a/src/main/java/com/gszc/controller/PcCustomController.java
+++ b/src/main/java/com/gszc/controller/PcCustomController.java
@@ -145,4 +145,16 @@ public class PcCustomController {
         customService.logoutCustom(customId);
         return ResultBuilder.success().build();
     }
+
+    @PostMapping("/pcMessage")
+    @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header")
+    @ApiOperation(value = "查询是否有新消息", notes = "查询是否有新消息")
+    public Result pcMessage(String copycatId) {
+
+        JSONObject jsonObject = customService.pcMessage(copycatId);
+        return ResultBuilder.withPayload(jsonObject).build();
+    }
+
+
+
 }
diff --git a/src/main/java/com/gszc/entity/Invoice.java b/src/main/java/com/gszc/entity/Invoice.java
index 2b25faa..257625e 100644
--- a/src/main/java/com/gszc/entity/Invoice.java
+++ b/src/main/java/com/gszc/entity/Invoice.java
@@ -88,4 +88,8 @@ public class Invoice implements Serializable {
 
     @ApiModelProperty(hidden = true)
     private String taxMoney;
+
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String copycatName;
 }
diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
index 2980f12..fcc461a 100644
--- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java
@@ -358,4 +358,18 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
         custom.setStatusCode("logout");
         customMapper.updateById(custom);
     }
+
+    /**
+     * 消息
+     * @return
+     */
+    public JSONObject pcMessage(String copycatId){
+        JSONObject jsonObject = new JSONObject();
+        Integer count = customMapper.selectCount(new EntityWrapper<Custom>().eq("status_code", "todo").eq("copycat_id",copycatId));
+        if(count>0){
+            jsonObject.put("haveNew",true);
+        }
+        jsonObject.put("count",count);
+        return jsonObject;
+    }
 }
diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
index 7eccb70..3cbf1a7 100644
--- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
@@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.gszc.entity.Custom;
 import com.gszc.entity.Invoice;
 import com.gszc.entity.InvoiceHeader;
+import com.gszc.entity.PcUser;
 import com.gszc.mapper.CustomMapper;
 import com.gszc.mapper.InvoiceHeaderMapper;
 import com.gszc.mapper.InvoiceMapper;
+import com.gszc.mapper.PcUserMapper;
 import com.gszc.service.CountService;
 import com.gszc.service.IInvoiceService;
 import com.gszc.util.KdniaoTrackQueryAPI;
@@ -21,7 +23,6 @@ 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;
 import java.util.List;
@@ -55,6 +56,9 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     @Autowired
     CountService countService;
 
+    @Autowired
+    PcUserMapper pcUserMapper;
+
     public void addInvoice(Invoice invoice) {
         String id = Uuid8Utils.generateShortUUID();
         invoice.setId(id);
@@ -177,6 +181,10 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
             InvoiceHeader invoiceHeader = invoiceHeaderMapper.selectById(invoiceHeaderId);
             invoice.setCustomName(custom.getCompanyName());
             invoice.setInvoiceHeaderName(invoiceHeader.getCompanyName());
+            if(null!=copycatId){
+                PcUser pcUser = pcUserMapper.selectById(copycatId);
+                invoice.setCopycatName(pcUser.getName());
+            }
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("count", count);
@@ -207,6 +215,10 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
             InvoiceHeader invoiceHeader = invoiceHeaderMapper.selectById(invoiceHeaderId);
             invoice.setCustomName(custom.getCompanyName());
             invoice.setInvoiceHeaderName(invoiceHeader.getCompanyName());
+            if(null!=copycatId){
+                PcUser pcUser = pcUserMapper.selectById(copycatId);
+                invoice.setCopycatName(pcUser.getName());
+            }
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("count", count);