p

src/main/java/com/gszc/controller/MiniCustomController.java

@@ -1,5 +1,6 @@
 package com.gszc.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gszc.build.Result;
 import com.gszc.build.ResultBuilder;
@@ -37,7 +38,7 @@ public class MiniCustomController {
     @ApiOperation(value = "可开票公司列表", notes = "可开票公司列表")
     public Result invoiceCustomList(String userId) {
 
-        List<Custom> customs = customService.invoiceCustomList(userId);
+        JSONArray customs = customService.invoiceCustomList(userId);
         return ResultBuilder.withPayload(customs).build();
     }
 
@@ -50,7 +51,7 @@ public class MiniCustomController {
     @ApiOperation(value = "注册公司列表", notes = "注册公司列表")
     public Result customList(String userId,String type) {
 
-        List<Custom> customs = customService.customList(userId,type);
+        JSONArray customs = customService.customList(userId,type);
         return ResultBuilder.withPayload(customs).build();
     }
 

src/main/java/com/gszc/entity/Invoice.java

@@ -54,6 +54,10 @@ public class Invoice implements Serializable {
     @TableField(exist = false)
     private String invoiceHeaderName;
 
+    @ApiModelProperty(hidden = true)
+    @TableField(exist = false)
+    private String taxCode;
+
     @ApiModelProperty(value = "备注")
     private String remark;
 

src/main/java/com/gszc/service/impl/CustomServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gszc.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -85,12 +86,23 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
      * @param userId
      * @return
      */
-    public List<Custom> invoiceCustomList(String userId){
+    public JSONArray invoiceCustomList(String userId){
+        JSONArray jsonArray = new JSONArray();
+
         List<Custom> customs = customMapper.selectList(new EntityWrapper<Custom>().eq("mini_user_id", userId).eq("status_code","enable"));
-        return customs;
+        for(Custom custom:customs){
+            List<CustomSupport> customSupports = customSupportMapper.selectList(new EntityWrapper<CustomSupport>().eq("custom_id", custom.getId()));
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("custom",custom);
+            jsonObject.put("customSupports",customSupports);
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
     }
 
-    public List<Custom> customList(String userId,String type){
+    public JSONArray customList(String userId,String type){
+        JSONArray jsonArray = new JSONArray();
+
         Wrapper<Custom> miniUserId = new EntityWrapper<Custom>().eq("mini_user_id", userId);
         if(null==type){
 
@@ -102,7 +114,14 @@ public class CustomServiceImpl extends ServiceImpl<CustomMapper, Custom> impleme
             miniUserId.eq("status_code","enable");
         }
         List<Custom> customs = customMapper.selectList(miniUserId);
-        return customs;
+        for(Custom custom:customs){
+            List<CustomSupport> customSupports = customSupportMapper.selectList(new EntityWrapper<CustomSupport>().eq("custom_id", custom.getId()));
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("custom",custom);
+            jsonObject.put("customSupports",customSupports);
+            jsonArray.add(jsonObject);
+        }
+        return jsonArray;
     }
 
     public JSONObject customDetail(String customId){

src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gszc.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -59,9 +60,9 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
 
     public List<Invoice> invoiceList(String userId,String type){
         List<Invoice> list = new ArrayList<>();
-        List<Custom> customs = customService.customList(userId,null);
-        for(Custom custom:customs){
-            Wrapper<Invoice> customId = new EntityWrapper<Invoice>().eq("custom_id", custom.getId());
+        JSONArray customs = customService.customList(userId,null);
+        for(int i = 0;i<customs.size();i++){
+            Wrapper<Invoice> customId = new EntityWrapper<Invoice>().eq("custom_id", customs.getJSONObject(i).getJSONObject("custom").getString("id"));
             if(null==type){
 
             }else if(type.equals("disable")){
@@ -70,6 +71,13 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
                 customId.eq("status_code","enable");
             }
             List<Invoice> invoiceList = invoiceMapper.selectList(customId);
+            for(Invoice invoice:invoiceList){
+                invoice.setCustomName(customs.getJSONObject(i).getString("companyName"));
+                String invoiceHeaderId = invoice.getInvoiceHeaderId();
+                InvoiceHeader invoiceHeader = invoiceHeaderMapper.selectById(invoiceHeaderId);
+                invoice.setInvoiceHeaderName(invoiceHeader.getCompanyName());
+                invoice.setTaxCode(invoiceHeader.getTaxCode());
+            }
             if(invoiceList.size()>0){
                 list.addAll(invoiceList);
             }