单据管理

jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java

@@ -1,16 +1,13 @@
 package com.jianshui.api.controller.http.invoice.v1;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.jianshui.common.core.domain.AjaxResult;
 import com.jianshui.common.core.domain.entity.Companyservice;
-import com.jianshui.common.core.redis.RedisCache;
 import com.jianshui.common.enums.ErrorCode;
 import com.jianshui.common.exception.jianshui.JianshuiParamErrorException;
 import com.jianshui.common.utils.StringUtils;
 import com.jianshui.common.utils.http.HttpHelper;
-import com.jianshui.common.utils.spring.SpringUtils;
 import com.jianshui.invoice.domain.BillInfo;
 import com.jianshui.platform.dto.InvoiceAdd.BillInfoPDTO;
 import com.jianshui.invoice.domain.Redinfo;
@@ -23,21 +20,18 @@ import com.jianshui.invoice.factory.IInvoiceResponseFactory;
 import com.jianshui.invoice.factory.IInvoiceServiceFactory;
 import com.jianshui.invoice.service.IInvoiceResponseService;
 import com.jianshui.invoice.utils.ApiRequestUtils;
-import com.jianshui.platform.service.InvoiceAddService;
+import com.jianshui.platform.service.InvoiceAddPService;
 import com.jianshui.system.service.ICompanyserviceService;
 import com.jianshui.system.service.IServiceManageService;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @Description
@@ -66,7 +60,7 @@ public class InvoiceController {
     private IInvoiceServiceFactory invoiceServiceFactory;
 
     @Autowired
-    private InvoiceAddService addService;
+    private InvoiceAddPService addService;
 
 
     /**

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

@@ -6,17 +6,11 @@ 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.service.InvoiceAddPService;
 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;
@@ -32,10 +26,10 @@ import java.util.List;
 @Api(tags={"单据管理"},value = "")
 @RestController
 @RequestMapping("/platForm/billInfoAdd/")
-public class BillInfoAddController extends BaseController {
+public class BillInfoAddPController extends BaseController {
 
     @Autowired
-    private InvoiceAddService addService;
+    private InvoiceAddPService addService;
 
     @Autowired
     private BillInfoMapper billInfoMapper;
@@ -69,7 +63,7 @@ public class BillInfoAddController extends BaseController {
 
 
     @ApiOperation(value = "差额",notes = "开发中")
-    @PostMapping( "difference")
+    @PostMapping( "difference1")
     public AjaxResult difference(@RequestBody JSONObject jsonObject) throws Exception {
 
         // TODO: 差额：

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

@@ -1,9 +1,7 @@
 package com.jianshui.web.controller.platform;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.json.JSONObject;
 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;
@@ -11,7 +9,7 @@ import com.jianshui.invoice.mapper.InvoiceMapper;
 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.service.InvoiceAddPService;
 import com.jianshui.platform.vo.InvoiceListPVO;
 import com.jianshui.platform.vo.invoicered.InvoiceQueryPVO;
 import io.swagger.annotations.*;
@@ -28,9 +26,9 @@ import java.util.List;
 @Api(tags={"发票管理"},value = "发票管理")
 @RestController
 @RequestMapping("/platForm/invoiceAdd/")
-public class InvoiceAddController extends BaseController {
+public class InvoiceAddPController extends BaseController {
     @Autowired
-    private InvoiceAddService addService;
+    private InvoiceAddPService addService;
 
     @Autowired
     private InvoiceMapper invoiceMapper;

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

@@ -0,0 +1,29 @@
+package com.jianshui.platform.service;
+
+
+/**
+* @Author: kk
+* @Description: 单据管理
+* @DateTime: 2023/6/26 11:57
+*/
+public interface BillInfoAddPService {
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

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

@@ -1,32 +0,0 @@
-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 {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}

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

@@ -3,16 +3,13 @@ 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;
 
 /**
 * @Author: kk
 * @Description: 发票管理
 * @DateTime: 2023/6/26 11:55
 */
-public interface InvoiceAddService {
+public interface InvoiceAddPService {
 
 
     /**

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

@@ -0,0 +1,30 @@
+package com.jianshui.platform.service.impl;
+
+import com.jianshui.invoice.mapper.BillInfoMapper;
+import com.jianshui.platform.service.BillInfoAddPService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+* @Author: kk
+* @Description: 单据管理
+* @DateTime: 2023/6/26 11:58
+*/
+@Service
+@Slf4j
+public class BillInfoAddPServiceImpl implements BillInfoAddPService {
+
+    @Autowired
+    private static BillInfoMapper billInfoMapper;
+
+
+
+
+
+
+
+
+
+}

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

@@ -1,51 +0,0 @@
-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;
-
-
-
-
-
-
-
-
-
-}

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

@@ -1,14 +1,11 @@
 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;
@@ -19,9 +16,8 @@ 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.enums.InvoiceType;
-import com.jianshui.platform.service.InvoiceAddService;
+import com.jianshui.platform.service.InvoiceAddPService;
 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;
@@ -29,7 +25,6 @@ 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;
 
 
@@ -40,7 +35,7 @@ import java.util.Optional;
 */
 @Service
 @Slf4j
-public class InvoiceAddServiceImpl implements InvoiceAddService {
+public class InvoiceAddPServiceImpl implements InvoiceAddPService {
 
     @Autowired
     private static BillInfoMapper billInfoMapper;