From ecffab39febbbf5213d285148e19912d0d957012 Mon Sep 17 00:00:00 2001 From: ky <592468495@qq.com> Date: Sun, 10 May 2020 10:49:21 +0800 Subject: [PATCH] p --- .../gszc/controller/MiniCustomController.java | 5 ++-- src/main/java/com/gszc/entity/Invoice.java | 4 +++ .../gszc/service/impl/CustomServiceImpl.java | 27 ++++++++++++++++--- .../gszc/service/impl/InvoiceServiceImpl.java | 14 +++++++--- 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/gszc/controller/MiniCustomController.java b/src/main/java/com/gszc/controller/MiniCustomController.java index 1ab2bb2..fa4f099 100644 --- a/src/main/java/com/gszc/controller/MiniCustomController.java +++ b/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 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 customs = customService.customList(userId,type); + JSONArray customs = customService.customList(userId,type); return ResultBuilder.withPayload(customs).build(); } diff --git a/src/main/java/com/gszc/entity/Invoice.java b/src/main/java/com/gszc/entity/Invoice.java index 5f55e7a..ed7b545 100644 --- a/src/main/java/com/gszc/entity/Invoice.java +++ b/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; diff --git a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java b/src/main/java/com/gszc/service/impl/CustomServiceImpl.java index aa28bf5..ffe3c34 100644 --- a/src/main/java/com/gszc/service/impl/CustomServiceImpl.java +++ b/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 impleme * @param userId * @return */ - public List invoiceCustomList(String userId){ + public JSONArray invoiceCustomList(String userId){ + JSONArray jsonArray = new JSONArray(); + List customs = customMapper.selectList(new EntityWrapper().eq("mini_user_id", userId).eq("status_code","enable")); - return customs; + for(Custom custom:customs){ + List customSupports = customSupportMapper.selectList(new EntityWrapper().eq("custom_id", custom.getId())); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("custom",custom); + jsonObject.put("customSupports",customSupports); + jsonArray.add(jsonObject); + } + return jsonArray; } - public List customList(String userId,String type){ + public JSONArray customList(String userId,String type){ + JSONArray jsonArray = new JSONArray(); + Wrapper miniUserId = new EntityWrapper().eq("mini_user_id", userId); if(null==type){ @@ -102,7 +114,14 @@ public class CustomServiceImpl extends ServiceImpl impleme miniUserId.eq("status_code","enable"); } List customs = customMapper.selectList(miniUserId); - return customs; + for(Custom custom:customs){ + List customSupports = customSupportMapper.selectList(new EntityWrapper().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){ diff --git a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java b/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java index 07ba8c1..a41b379 100644 --- a/src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java +++ b/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 impl public List invoiceList(String userId,String type){ List list = new ArrayList<>(); - List customs = customService.customList(userId,null); - for(Custom custom:customs){ - Wrapper customId = new EntityWrapper().eq("custom_id", custom.getId()); + JSONArray customs = customService.customList(userId,null); + for(int i = 0;i customId = new EntityWrapper().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 impl customId.eq("status_code","enable"); } List 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); }