From 01b8955fdc499b45fad489fe244c4f0fa53a00fd Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Mon, 26 Jun 2023 12:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/BillInfoAddController.java | 85 +++++++++++++++++++ .../platform/InvoiceAddController.java | 34 +------- .../platform/service/BillInfoAddService.java | 32 +++++++ .../platform/service/InvoiceAddService.java | 13 +-- .../service/impl/BillInfoAddServiceImpl.java | 51 +++++++++++ .../service/impl/InvoiceAddServiceImpl.java | 6 +- 6 files changed, 178 insertions(+), 43 deletions(-) create mode 100644 jianshui-admin/src/main/java/com/jianshui/web/controller/platform/BillInfoAddController.java create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/service/BillInfoAddService.java create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/service/impl/BillInfoAddServiceImpl.java diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/BillInfoAddController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/BillInfoAddController.java new file mode 100644 index 0000000..be307cd --- /dev/null +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/BillInfoAddController.java @@ -0,0 +1,85 @@ +package com.jianshui.web.controller.platform; + +import cn.hutool.core.bean.BeanUtil; +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.BillInfo; +import com.jianshui.invoice.domain.Invoice; +import com.jianshui.invoice.domain.dto.HXResponse; +import com.jianshui.invoice.mapper.BillInfoMapper; +import com.jianshui.invoice.mapper.InvoiceMapper; +import com.jianshui.platform.dto.DocumentListQueryPDTO; +import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO; +import com.jianshui.platform.dto.InvoiceListQueryPDTO; +import com.jianshui.platform.dto.invoicered.InvoiceQueryPDTO; +import com.jianshui.platform.service.InvoiceAddService; +import com.jianshui.platform.vo.InvoiceListPVO; +import com.jianshui.platform.vo.invoicered.InvoiceQueryPVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 发票录入 + * + */ +@Api(tags={"单据管理"},value = "") +@RestController +@RequestMapping("/platForm/billInfoAdd/") +public class BillInfoAddController extends BaseController { + + @Autowired + private InvoiceAddService addService; + + @Autowired + private BillInfoMapper billInfoMapper; + + @ApiOperation(value = "单据保存",notes = "单据保存请求(支持数电普票、数电专票)") + @PostMapping( "invoiceSave") + public AjaxResult invoiceSave(@RequestBody BillInfoPDTO billInfoPDTO) throws Exception { + return toAjax(addService.invoiceSave(billInfoPDTO)); + } + + @ApiOperation(value = "单据管理列表",notes = "发票管理") + @GetMapping( "documentList") + public TableDataInfo documentList(DocumentListQueryPDTO queryPDTO) throws Exception { + + startPage(); + BillInfo billInfo = BeanUtil.copyProperties(queryPDTO,BillInfo.class); + List billInfoList = billInfoMapper.selectBillInfoList(billInfo); + + List invoiceListPVOS = BeanUtil.copyToList(billInfoList,InvoiceListPVO.class); + return getDataTable(invoiceListPVOS); + } + + + + + + + + + + + + + + + + + + + + + + + + + + +} diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java index a133246..78fa3d1 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java @@ -1,17 +1,11 @@ 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.BillInfo; import com.jianshui.invoice.domain.Invoice; import com.jianshui.invoice.domain.dto.HXResponse; -import com.jianshui.invoice.mapper.BillInfoMapper; import com.jianshui.invoice.mapper.InvoiceMapper; -import com.jianshui.platform.dto.DocumentListQueryPDTO; import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO; import com.jianshui.platform.dto.InvoiceListQueryPDTO; import com.jianshui.platform.dto.invoicered.InvoiceQueryPDTO; @@ -29,33 +23,22 @@ import java.util.List; * 发票录入 * */ -@Api(tags={"单据、发票管理"},value = "蓝字、红字发票开具") +@Api(tags={"发票管理"},value = "发票管理") @RestController -@RequestMapping("/platForm/documentEntry/") +@RequestMapping("/platForm/invoiceAdd/") public class InvoiceAddController extends BaseController { - @Autowired private InvoiceAddService addService; @Autowired private InvoiceMapper invoiceMapper; - @Autowired - private BillInfoMapper billInfoMapper; - - @ApiOperation(value = "单据保存",notes = "单据保存请求(支持数电普票、数电专票)") - @PostMapping( "invoiceSave") - public AjaxResult invoiceSave(@RequestBody BillInfoPDTO billInfoPDTO) throws Exception { - return toAjax(addService.invoiceSave(billInfoPDTO)); - } - @ApiOperation(value = "发票开具",notes = "发票直接开具请求(支持数电普票、数电专票)") @PostMapping( "invoiceIssuance") public HXResponse invoiceIssuance(@RequestBody BillInfoPDTO billInfoPDTO) throws Exception { return addService.invoiceIssuance(billInfoPDTO); } - @ApiOperation(value = "蓝字发票查询",notes = "查询所有未冲红蓝字发票") @GetMapping( "invoiceQuery") public TableDataInfo invoiceQuery(InvoiceQueryPDTO invoiceQueryPDTO) throws Exception { @@ -68,8 +51,6 @@ public class InvoiceAddController extends BaseController { return getDataTable(invoiceQueryPVOS); } - - @ApiOperation(value = "发票管理列表",notes = "发票管理") @GetMapping( "invoiceList") public TableDataInfo invoiceList(InvoiceListQueryPDTO queryPDTO) throws Exception { @@ -82,17 +63,6 @@ public class InvoiceAddController extends BaseController { return getDataTable(invoiceListPVOS); } - @ApiOperation(value = "单据管理列表",notes = "发票管理") - @GetMapping( "documentList") - public TableDataInfo documentList(DocumentListQueryPDTO queryPDTO) throws Exception { - - startPage(); - BillInfo billInfo = BeanUtil.copyProperties(queryPDTO,BillInfo.class); - List billInfoList = billInfoMapper.selectBillInfoList(billInfo); - - List invoiceListPVOS = BeanUtil.copyToList(billInfoList,InvoiceListPVO.class); - return getDataTable(invoiceListPVOS); - } diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/BillInfoAddService.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/BillInfoAddService.java new file mode 100644 index 0000000..65ace90 --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/BillInfoAddService.java @@ -0,0 +1,32 @@ +package com.jianshui.platform.service; + + +import com.jianshui.invoice.domain.dto.HXResponse; +import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO; + +/** +* @Author: kk +* @Description: 单据管理 +* @DateTime: 2023/6/26 11:57 +*/ +public interface BillInfoAddService { + + + + + + + + + + + + + + + + + + + +} diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/InvoiceAddService.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/InvoiceAddService.java index be9acef..e4b7fcf 100644 --- a/jianshui-platform/src/main/java/com/jianshui/platform/service/InvoiceAddService.java +++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/InvoiceAddService.java @@ -8,10 +8,10 @@ import com.jianshui.platform.vo.invoicered.InvoiceQueryPVO; import java.util.List; /** - * 发票录入 - * - */ - +* @Author: kk +* @Description: 发票管理 +* @DateTime: 2023/6/26 11:55 +*/ public interface InvoiceAddService { @@ -19,18 +19,13 @@ public interface InvoiceAddService { * @Author: kk * @Description: 单据录入 * @DateTime: 2023/6/5 17:14 - * @Params: - * @Return */ - int invoiceSave(BillInfoPDTO billInfoPDTO); /** * @Author: kk * @Description: 发票开具 * @DateTime: 2023/6/7 14:11 - * @Params: - * @Return */ HXResponse invoiceIssuance(BillInfoPDTO billInfoPDTO); diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/BillInfoAddServiceImpl.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/BillInfoAddServiceImpl.java new file mode 100644 index 0000000..f79a87f --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/BillInfoAddServiceImpl.java @@ -0,0 +1,51 @@ +package com.jianshui.platform.service.impl; + +import cn.hutool.core.bean.BeanUtil; +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.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.BillInfoAddService; +import com.jianshui.platform.service.InvoiceAddService; +import com.jianshui.platform.utils.InvoiceAllYhdjUtils; +import com.jianshui.system.domain.InvoiceAllYhdj; +import com.jianshui.system.mapper.CompanyserviceMapper; +import com.jianshui.system.service.IServiceManageService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Optional; + + +/** +* @Author: kk +* @Description: 单据管理 +* @DateTime: 2023/6/26 11:58 +*/ +@Service +@Slf4j +public class BillInfoAddServiceImpl implements BillInfoAddService { + + @Autowired + private static BillInfoMapper billInfoMapper; + + + + + + + + + +} diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceAddServiceImpl.java b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceAddServiceImpl.java index 59667bc..ffc831e 100644 --- a/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceAddServiceImpl.java +++ b/jianshui-platform/src/main/java/com/jianshui/platform/service/impl/InvoiceAddServiceImpl.java @@ -33,8 +33,10 @@ import java.util.Optional; /** - * 发票录入 - */ +* @Author: kk +* @Description: 发票管理 +* @DateTime: 2023/6/26 11:59 +*/ @Service @Slf4j public class InvoiceAddServiceImpl implements InvoiceAddService {