From 26260ec1c57115c24b3ac8e66a1853a817f13d1c Mon Sep 17 00:00:00 2001
From: ky <592468495@qq.com>
Date: Fri, 8 May 2020 10:47:25 +0800
Subject: [PATCH] p

---
 .../gszc/controller/MiniUserController.java   | 39 +++++++++++++++++++
 src/main/java/com/gszc/entity/Custom.java     |  4 +-
 src/main/java/com/gszc/entity/Invoice.java    |  9 +++++
 .../com/gszc/service/IMiniUserService.java    | 16 ++++++++
 .../gszc/service/impl/InvoiceServiceImpl.java | 21 ++++++++++
 .../service/impl/MiniUserServiceImpl.java     | 30 ++++++++++++++
 6 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/gszc/controller/MiniUserController.java
 create mode 100644 src/main/java/com/gszc/service/IMiniUserService.java
 create mode 100644 src/main/java/com/gszc/service/impl/MiniUserServiceImpl.java

diff --git a/src/main/java/com/gszc/controller/MiniUserController.java b/src/main/java/com/gszc/controller/MiniUserController.java
new file mode 100644
index 0000000..15dc128
--- /dev/null
+++ b/src/main/java/com/gszc/controller/MiniUserController.java
@@ -0,0 +1,39 @@
+package com.gszc.controller;
+
+import com.gszc.build.Result;
+import com.gszc.build.ResultBuilder;
+import com.gszc.entity.MiniUser;
+import com.gszc.entity.PcUser;
+import com.gszc.service.impl.MiniUserServiceImpl;
+import com.gszc.service.impl.PcUserServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@Api(value = "工商注册 API", tags = {"小程序用户api"})
+@RestController
+@RequestMapping("/mini/user")
+public class MiniUserController {
+
+    @Autowired
+    MiniUserServiceImpl miniUserService;
+
+    @PostMapping("/queryMiniUser")
+    @ApiImplicitParam(name = "token", value = "token", required = true, dataType = "String", paramType = "header")
+    @ApiOperation(value = "查询小程序用户信息", notes = "查询小程序用户信息")
+    public Result queryMiniUser(String miniUserId) {
+        MiniUser miniUser = miniUserService.queryMiniUser(miniUserId);
+        return ResultBuilder.withPayload(miniUser).build();
+    }
+
+
+
+}
diff --git a/src/main/java/com/gszc/entity/Custom.java b/src/main/java/com/gszc/entity/Custom.java
index 370aa34..fc367ce 100644
--- a/src/main/java/com/gszc/entity/Custom.java
+++ b/src/main/java/com/gszc/entity/Custom.java
@@ -80,13 +80,13 @@ taxpayer 一般纳税人
      * 法人身份证正面
      */
     @ApiModelProperty(value = "公司法人身份证正面")
-    private String compabyManIdCardFront;
+    private String companyManIdCardFront;
 
     /**
      * 法人身份证反面
      */
     @ApiModelProperty(value = "公司法人身份证反面")
-    private String compabyManIdCardBack;
+    private String companyManIdCardBack;
 
     @ApiModelProperty(value = "监事姓名")
     private String supervisorName;
diff --git a/src/main/java/com/gszc/entity/Invoice.java b/src/main/java/com/gszc/entity/Invoice.java
index b721e19..5f55e7a 100644
--- a/src/main/java/com/gszc/entity/Invoice.java
+++ b/src/main/java/com/gszc/entity/Invoice.java
@@ -1,5 +1,6 @@
 package com.gszc.entity;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,6 +31,10 @@ public class Invoice implements Serializable {
 
     private String customId;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String customName;
+
     @ApiModelProperty(value = "开票金额")
     private BigDecimal money;
 
@@ -45,6 +50,10 @@ public class Invoice implements Serializable {
     @ApiModelProperty(value = "发票抬头")
     private String invoiceHeaderId;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String invoiceHeaderName;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 
diff --git a/src/main/java/com/gszc/service/IMiniUserService.java b/src/main/java/com/gszc/service/IMiniUserService.java
new file mode 100644
index 0000000..42e3da8
--- /dev/null
+++ b/src/main/java/com/gszc/service/IMiniUserService.java
@@ -0,0 +1,16 @@
+package com.gszc.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.gszc.entity.MiniUser;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ky
+ * @since 2020-04-27
+ */
+public interface IMiniUserService extends IService<MiniUser> {
+
+}
diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
index 45af308..899830e 100644
--- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
+++ b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java
@@ -7,6 +7,7 @@ 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.mapper.CustomMapper;
 import com.gszc.mapper.InvoiceHeaderMapper;
 import com.gszc.mapper.InvoiceMapper;
 import com.gszc.service.IInvoiceService;
@@ -44,6 +45,9 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     @Autowired
     CustomServiceImpl customService;
 
+    @Autowired
+    CustomMapper customMapper;
+
     public void addInvoice(Invoice invoice){
         String id = Uuid8Utils.generateShortUUID();
         invoice.setId(id);
@@ -112,6 +116,15 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     public JSONObject pcDisableInvoiceList(Integer pageNum,Integer pageSize){
         Integer count = invoiceMapper.selectCount(new EntityWrapper<Invoice>().eq("status_code", "disable"));
         List<Invoice> invoiceList = invoiceMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Invoice>().eq("status_code", "disable").orderBy("create_date",false));
+
+        for(Invoice invoice :invoiceList){
+            String invoiceHeaderId = invoice.getInvoiceHeaderId();
+            String customId = invoice.getCustomId();
+            Custom custom = customMapper.selectById(customId);
+            InvoiceHeader invoiceHeader = invoiceHeaderMapper.selectById(invoiceHeaderId);
+            invoice.setCustomName(custom.getCompanyName());
+            invoice.setInvoiceHeaderName(invoiceHeader.getCompanyName());
+        }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("count",count);
         jsonObject.put("invoiceList",invoiceList);
@@ -121,6 +134,14 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
     public JSONObject pcEnableInvoiceList(Integer pageNum,Integer pageSize){
         Integer count = invoiceMapper.selectCount(new EntityWrapper<Invoice>().eq("status_code", "enable"));
         List<Invoice> invoiceList = invoiceMapper.selectPage(new RowBounds((pageNum-1)*pageSize,pageSize),new EntityWrapper<Invoice>().eq("status_code", "enable").orderBy("create_date",false));
+        for(Invoice invoice :invoiceList){
+            String invoiceHeaderId = invoice.getInvoiceHeaderId();
+            String customId = invoice.getCustomId();
+            Custom custom = customMapper.selectById(customId);
+            InvoiceHeader invoiceHeader = invoiceHeaderMapper.selectById(invoiceHeaderId);
+            invoice.setCustomName(custom.getCompanyName());
+            invoice.setInvoiceHeaderName(invoiceHeader.getCompanyName());
+        }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("count",count);
         jsonObject.put("invoiceList",invoiceList);
diff --git a/src/main/java/com/gszc/service/impl/MiniUserServiceImpl.java b/src/main/java/com/gszc/service/impl/MiniUserServiceImpl.java
new file mode 100644
index 0000000..25e941a
--- /dev/null
+++ b/src/main/java/com/gszc/service/impl/MiniUserServiceImpl.java
@@ -0,0 +1,30 @@
+package com.gszc.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.gszc.entity.MiniUser;
+import com.gszc.mapper.MiniUserMapper;
+import com.gszc.service.IMiniUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ky
+ * @since 2020-04-27
+ */
+@Service
+public class MiniUserServiceImpl extends ServiceImpl<MiniUserMapper, MiniUser> implements IMiniUserService {
+
+    @Autowired
+    MiniUserMapper miniUserMapper;
+
+    public MiniUser queryMiniUser(String miniUserId){
+
+        MiniUser miniUser = miniUserMapper.selectById(miniUserId);
+        miniUser.setOpenId(null);
+        return miniUser;
+    }
+}