简税升级

jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java

@@ -1,26 +1,39 @@
 package com.jianshui.web.controller.platform;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jianshui.common.core.controller.BaseController;
 import com.jianshui.common.core.domain.AjaxResult;
+import com.jianshui.common.core.page.TableDataInfo;
+import com.jianshui.invoice.domain.Invoice;
 import com.jianshui.invoice.domain.dto.HXResponse;
+import com.jianshui.invoice.mapper.InvoiceMapper;
 import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO;
+import com.jianshui.platform.dto.invoicered.InvoiceQueryPDTO;
 import com.jianshui.platform.service.InvoiceAddService;
+import com.jianshui.platform.vo.invoicered.InvoiceQueryPVO;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 
 /**
  * 发票录入
  * 
  */
-@Api(tags={"单据录入"},value = "单据录入")
+@Api(tags={"发票管理"},value = "蓝字、红字发票开具")
 @RestController
 @RequestMapping("/platForm/documentEntry/")
 public class InvoiceAddController extends BaseController {
 
     @Autowired
-    private static InvoiceAddService addService;
+    private InvoiceAddService addService;
+
+    @Autowired
+    private InvoiceMapper invoiceMapper;
 
     @ApiOperation(value = "单据保存",notes = "单据保存请求(支持数电普票、数电专票)")
     @PostMapping( "invoiceSave")
@@ -35,6 +48,32 @@ public class InvoiceAddController extends BaseController {
     }
 
 
+    @ApiOperation(value = "蓝字发票查询",notes = "查询所有未冲红蓝字发票")
+    @GetMapping( "invoiceQuery")
+    public TableDataInfo invoiceQuery(InvoiceQueryPDTO invoiceQueryPDTO) throws Exception {
+
+        startPage();
+        Invoice invoice = BeanUtil.copyProperties(invoiceQueryPDTO,Invoice.class);
+        List<Invoice> invoiceLIst = invoiceMapper.selectInvoiceList(invoice);
+
+        List<InvoiceQueryPVO> invoiceQueryPVOS = BeanUtil.copyToList(invoiceLIst,InvoiceQueryPVO.class);
+        return getDataTable(invoiceQueryPVOS);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

jianshui-common/src/main/java/com/jianshui/common/core/page/PageDomain.java

@@ -1,18 +1,23 @@
 package com.jianshui.common.core.page;
 
 import com.jianshui.common.utils.StringUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 分页数据
  * 
  * @author 简税平台
  */
+@ApiModel("分页数据")
 public class PageDomain
 {
     /** 当前记录起始索引 */
+    @ApiModelProperty(value = "当前记录起始索引")
     private Integer pageNum;
 
     /** 每页显示记录数 */
+    @ApiModelProperty(value = "每页显示记录数")
     private Integer pageSize;
 
     /** 排序列 */

jianshui-platform/src/main/java/com/jianshui/platform/dto/invoicered/InvoiceQueryPDTO.java

@@ -0,0 +1,40 @@
+package com.jianshui.platform.dto.invoicered;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jianshui.common.annotation.Excel;
+import com.jianshui.common.core.page.PageDomain;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @Author: kk
+* @Description: 发票查询返回
+* @DateTime: 2023/6/8 16:23
+* @Params: 
+* @Return 
+*/
+@Data
+@ApiModel("单据录入")
+public class InvoiceQueryPDTO extends PageDomain {
+
+    @ApiModelProperty(value = "购方名称")
+    private String buyerName;
+
+    @ApiModelProperty(value = "发票代码")
+    private String fpdm;
+
+    @ApiModelProperty(value = "发票号码")
+    private String fphm;
+
+
+
+
+
+
+    
+}

jianshui-platform/src/main/java/com/jianshui/platform/service/InvoiceAddService.java

@@ -3,6 +3,9 @@ package com.jianshui.platform.service;
 
 import com.jianshui.invoice.domain.dto.HXResponse;
 import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO;
+import com.jianshui.platform.vo.invoicered.InvoiceQueryPVO;
+
+import java.util.List;
 
 /**
  * 发票录入
@@ -33,4 +36,17 @@ public interface InvoiceAddService {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceAddServiceImpl.java

@@ -1,21 +1,26 @@
 package com.jianshui.platform.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jianshui.common.core.domain.entity.Companyservice;
 import com.jianshui.common.exception.jianshui.JianshuiServiceException;
 import com.jianshui.common.utils.SecurityUtils;
 import com.jianshui.common.utils.ValidateUtils;
 import com.jianshui.invoice.domain.BillInfo;
+import com.jianshui.invoice.domain.Invoice;
 import com.jianshui.invoice.domain.dto.HXResponse;
 import com.jianshui.invoice.enums.ChannelSource;
 import com.jianshui.invoice.factory.IInvoiceServiceFactory;
 import com.jianshui.invoice.mapper.BillInfoMapper;
+import com.jianshui.invoice.mapper.InvoiceMapper;
 import com.jianshui.invoice.service.IInvoiceApiService;
 import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO;
 import com.jianshui.platform.dto.InvoiceAdd.species.BillInfoSDGenInvoicePDTO;
 import com.jianshui.platform.dto.InvoiceAdd.species.BillInfoSDSpecialInvoicePDTO;
 import com.jianshui.platform.service.InvoiceAddService;
 import com.jianshui.platform.utils.InvoiceAllYhdjUtils;
+import com.jianshui.platform.vo.invoicered.InvoiceQueryPVO;
 import com.jianshui.system.domain.InvoiceAllYhdj;
 import com.jianshui.system.mapper.CompanyserviceMapper;
 import com.jianshui.system.service.IServiceManageService;
@@ -23,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Optional;
 
 
@@ -45,6 +51,9 @@ public class InvoiceAddServiceImpl implements InvoiceAddService {
     @Autowired
     private CompanyserviceMapper companyServiceMapper;
 
+    @Autowired
+    private InvoiceMapper invoiceMapper;
+
 
     @Override
     public int invoiceSave(BillInfoPDTO billInfoPDTO) {
@@ -82,6 +91,8 @@ public class InvoiceAddServiceImpl implements InvoiceAddService {
 
         billInfo = BeanUtil.copyProperties(billInfoPDTO, BillInfo.class);
 
+        // 蓝票
+        billInfo.setKptype("1");
         billInfo.setSource(ChannelSource.PLATFORM.getCode());
 
         // 获取用户信息
@@ -96,7 +107,6 @@ public class InvoiceAddServiceImpl implements InvoiceAddService {
             return new HXResponse(("未获取到用户服务信息，请联系管理员配置！"));
         }
 
-        // TODO: 2023/6/8 这里看看多通道的时候怎么处理
         InvoiceAllYhdjUtils invoiceAllYhdjUtils = new InvoiceAllYhdjUtils();
         InvoiceAllYhdj userInfo = invoiceAllYhdjUtils.getUserInfo(companyservice);
 
@@ -125,6 +135,21 @@ public class InvoiceAddServiceImpl implements InvoiceAddService {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

jianshui-platform/src/main/java/com/jianshui/platform/vo/invoicered/InvoiceQueryPVO.java

@@ -0,0 +1,59 @@
+package com.jianshui.platform.vo.invoicered;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jianshui.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @Author: kk
+* @Description: 发票查询返回
+* @DateTime: 2023/6/8 16:23
+* @Params: 
+* @Return 
+*/
+@Data
+@ApiModel("单据录入")
+public class InvoiceQueryPVO{
+
+    @ApiModelProperty(value = "购方名称")
+    private String buyerName;
+
+    @ApiModelProperty(value = "购方税号")
+    private String buyerTaxnum;
+
+    @ApiModelProperty(value = "发票代码")
+    private String fpdm;
+
+    @ApiModelProperty(value = "发票号码")
+    private String fphm;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "开票日期")
+    private Date kprq;
+
+    @ApiModelProperty(value = "不含税金额")
+    private BigDecimal taxfreeamt;
+
+    @ApiModelProperty(value = "税额")
+    private BigDecimal tax;
+
+    @ApiModelProperty(value = "价税合计")
+    private String jshj;
+
+    @ApiModelProperty(value = "销方名称")
+    private String sellerName;
+
+    @ApiModelProperty(value = "销方税号")
+    private String sellerTaxnum;
+
+
+
+
+    
+}