瀏覽代碼

包名统一小写

mashengyi 3 年之前
父節點
當前提交
c106321d67
共有 65 個文件被更改,包括 142 次插入159 次删除
  1. 1 1
      src/main/java/com/jkcredit/invoice/annotation/annotationDes/AuthenticationInterceptor.java
  2. 1 1
      src/main/java/com/jkcredit/invoice/annotation/annotationDes/CurrentUserMethodArgumentResolver.java
  3. 2 3
      src/main/java/com/jkcredit/invoice/config/InvoiceWebMvcConfigurer.java
  4. 2 2
      src/main/java/com/jkcredit/invoice/controller/localBussiness/CustomerController.java
  5. 4 4
      src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java
  6. 8 8
      src/main/java/com/jkcredit/invoice/controller/localBussiness/SelfCarController.java
  7. 2 2
      src/main/java/com/jkcredit/invoice/controller/service/CustomerLowerServiceController.java
  8. 5 5
      src/main/java/com/jkcredit/invoice/controller/service/NoCarServiceController.java
  9. 3 3
      src/main/java/com/jkcredit/invoice/controller/service/SelfCarServiceController.java
  10. 1 1
      src/main/java/com/jkcredit/invoice/controller/manager/ParamController.java
  11. 3 3
      src/main/java/com/jkcredit/invoice/credit/InterfaceCheckServer.java
  12. 1 1
      src/main/java/com/jkcredit/invoice/credit/custInterface/CustomerInterLowerService.java
  13. 2 2
      src/main/java/com/jkcredit/invoice/credit/custInterface/CustomerInterLowerServiceImpl.java
  14. 1 1
      src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterService.java
  15. 3 3
      src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterServiceImpl.java
  16. 1 1
      src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterService.java
  17. 3 3
      src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterServiceImpl.java
  18. 1 1
      src/main/java/com/jkcredit/invoice/mapper/Binvoce/BillInvoiceMapper.java
  19. 1 1
      src/main/java/com/jkcredit/invoice/mapper/Binvoce/SelfCarApplMapper.java
  20. 1 1
      src/main/java/com/jkcredit/invoice/mapper/Binvoce/SelfCarInvoiceMapper.java
  21. 2 2
      src/main/java/com/jkcredit/invoice/mapper/calculateInfor/MounthAccMapper.java
  22. 2 2
      src/main/java/com/jkcredit/invoice/mapper/calculateInfor/NoCarCalculateInforMapper.java
  23. 2 3
      src/main/java/com/jkcredit/invoice/mapper/calculateInfor/SelfCarCalculateInforMapper.java
  24. 1 1
      src/main/java/com/jkcredit/invoice/model/entity/Calculate/MounthAcc.java
  25. 1 1
      src/main/java/com/jkcredit/invoice/model/entity/Calculate/NoCarCalculateInfor.java
  26. 1 1
      src/main/java/com/jkcredit/invoice/model/entity/Calculate/SelfCarCalculateInfor.java
  27. 2 2
      src/main/java/com/jkcredit/invoice/service/CalculateInfor/NoCarCalculateInfoService.java
  28. 2 3
      src/main/java/com/jkcredit/invoice/service/CalculateInfor/SelfCarCalculateInfoService.java
  29. 4 4
      src/main/java/com/jkcredit/invoice/service/CalculateInfor/impl/NocarCalculateInfoServiceImpl.java
  30. 4 7
      src/main/java/com/jkcredit/invoice/service/CalculateInfor/impl/SelfcarCalculateInfoServiceImpl.java
  31. 1 4
      src/main/java/com/jkcredit/invoice/service/lowerService/CustomeLowerService.java
  32. 3 3
      src/main/java/com/jkcredit/invoice/service/lowerService/NoCarService.java
  33. 2 4
      src/main/java/com/jkcredit/invoice/service/lowerService/SelfCarServiceL.java
  34. 6 6
      src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java
  35. 9 9
      src/main/java/com/jkcredit/invoice/service/lowerService/impl/NoCarServiceImpl.java
  36. 7 7
      src/main/java/com/jkcredit/invoice/service/lowerService/impl/SelfCarServiceLImpl.java
  37. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/ApplQueryInvVo.java
  38. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/CarVo.java
  39. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcBindVo.java
  40. 1 3
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcQueryVo.java
  41. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcValidVo.java
  42. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/HCInvoiceQueryVo.java
  43. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/InvoiceApplVo.java
  44. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/InvoicePackageVo.java
  45. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/MonthAccountQueryVo.java
  46. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/NoCarQueryVo.java
  47. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/SelfCarDueQueryVo.java
  48. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/SelfcarInvoiceByTimeVo.java
  49. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/TradeRequestCarNumVo.java
  50. 1 1
      src/main/java/com/jkcredit/invoice/service/lowerService/vo/TradeRequestVo.java
  51. 1 1
      src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java
  52. 1 1
      src/main/java/com/jkcredit/invoice/service/nocar/impl/NocarInvoiceServiceImpl.java
  53. 1 2
      src/main/java/com/jkcredit/invoice/service/selfCar/SelfCarInvoiceService.java
  54. 1 1
      src/main/java/com/jkcredit/invoice/service/selfCar/SelfCarService.java
  55. 1 2
      src/main/java/com/jkcredit/invoice/service/selfCar/SelfCarTradeService.java
  56. 3 4
      src/main/java/com/jkcredit/invoice/service/selfCar/impl/SelfCarInvoiceServiceImpl.java
  57. 3 4
      src/main/java/com/jkcredit/invoice/service/selfCar/impl/SelfCarServiceImpl.java
  58. 4 4
      src/main/java/com/jkcredit/invoice/service/selfCar/impl/SelfCarTradeServiceImpl.java
  59. 5 5
      src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java
  60. 3 3
      src/main/resources/mapper/calculateInfor/MounthAccMapper.xml
  61. 3 3
      src/main/resources/mapper/calculateInfor/NoCarCalculateInforMapper.xml
  62. 4 4
      src/main/resources/mapper/calculateInfor/SefCarCalculateInforMapper.xml
  63. 1 1
      src/main/resources/mapper/invoice/BillInvoiceMapper.xml
  64. 1 1
      src/main/resources/mapper/invoice/SelfCarApplMapper.xml
  65. 1 1
      src/main/resources/mapper/invoice/SelfCarInvoiceMapper.xml

+ 1 - 1
src/main/java/com/jkcredit/invoice/annotation/annotationDes/AuthenticationInterceptor.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.annotation.annotationDes;
+package com.jkcredit.invoice.annotation.annotationdes;
 
 import cn.hutool.json.JSONUtil;
 import com.jkcredit.invoice.annotation.LoginRequired;

+ 1 - 1
src/main/java/com/jkcredit/invoice/annotation/annotationDes/CurrentUserMethodArgumentResolver.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.annotation.annotationDes;
+package com.jkcredit.invoice.annotation.annotationdes;
 
 import com.jkcredit.invoice.annotation.CurrentUser;
 import com.jkcredit.invoice.model.entity.user.User;

+ 2 - 3
src/main/java/com/jkcredit/invoice/config/InvoiceWebMvcConfigurer.java

@@ -1,9 +1,8 @@
 package com.jkcredit.invoice.config;
 
-import com.jkcredit.invoice.annotation.annotationDes.AuthenticationInterceptor;
-import com.jkcredit.invoice.annotation.annotationDes.CurrentUserMethodArgumentResolver;
+import com.jkcredit.invoice.annotation.annotationdes.AuthenticationInterceptor;
+import com.jkcredit.invoice.annotation.annotationdes.CurrentUserMethodArgumentResolver;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.*;
 

+ 2 - 2
src/main/java/com/jkcredit/invoice/controller/localBussiness/CustomerController.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.controller.localBussiness;
+package com.jkcredit.invoice.controller.business;
 
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.com.taiji.sdk.model.comm.protocol.eoms.company.B2bCompanyModel;
@@ -12,7 +12,7 @@ import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.customer.CustomerRechargeService;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
+import com.jkcredit.invoice.service.lowerservice.CustomeLowerService;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.ExportUtil;

+ 4 - 4
src/main/java/com/jkcredit/invoice/controller/localBussiness/NoCarController.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.controller.localBussiness;
+package com.jkcredit.invoice.controller.business;
 
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
@@ -6,15 +6,15 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
-import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.NoCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerOper;
 import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.model.vo.CodeAndNumVo;
-import com.jkcredit.invoice.service.CalculateInfor.NoCarCalculateInfoService;
+import com.jkcredit.invoice.service.calculateinfor.NoCarCalculateInfoService;
 import com.jkcredit.invoice.service.customer.CustomerOperService;
-import com.jkcredit.invoice.service.lowerService.NoCarService;
+import com.jkcredit.invoice.service.lowerservice.NoCarService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;

+ 8 - 8
src/main/java/com/jkcredit/invoice/controller/localBussiness/SelfCarController.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.controller.localBussiness;
+package com.jkcredit.invoice.controller.business;
 import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.B2BInvoiceListModel;
@@ -7,18 +7,18 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
-import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
-import com.jkcredit.invoice.service.CalculateInfor.SelfCarCalculateInfoService;
+import com.jkcredit.invoice.service.calculateinfor.SelfCarCalculateInfoService;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
-import com.jkcredit.invoice.service.lowerService.vo.*;
-import com.jkcredit.invoice.service.selfCar.SelfCarInvoiceService;
-import com.jkcredit.invoice.service.selfCar.SelfCarService;
-import com.jkcredit.invoice.service.selfCar.SelfCarTradeService;
+import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.vo.*;
+import com.jkcredit.invoice.service.selfcar.SelfCarInvoiceService;
+import com.jkcredit.invoice.service.selfcar.SelfCarService;
+import com.jkcredit.invoice.service.selfcar.SelfCarTradeService;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/com/jkcredit/invoice/controller/service/CustomerLowerServiceController.java

@@ -1,8 +1,8 @@
-package com.jkcredit.invoice.controller.service;
+package com.jkcredit.invoice.controller.interserver;
 
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
+import com.jkcredit.invoice.service.lowerservice.CustomeLowerService;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 5 - 5
src/main/java/com/jkcredit/invoice/controller/service/NoCarServiceController.java

@@ -1,11 +1,11 @@
-package com.jkcredit.invoice.controller.service;
+package com.jkcredit.invoice.controller.interserver;
 
-import com.jkcredit.invoice.mapper.calculateInfor.MounthAccMapper;
+import com.jkcredit.invoice.mapper.calculateinfor.MounthAccMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
-import com.jkcredit.invoice.service.lowerService.NoCarService;
-import com.jkcredit.invoice.service.lowerService.vo.HCInvoiceQueryVo;
-import com.jkcredit.invoice.service.lowerService.vo.MonthAccountQueryVo;
+import com.jkcredit.invoice.service.lowerservice.NoCarService;
+import com.jkcredit.invoice.service.lowerservice.vo.HCInvoiceQueryVo;
+import com.jkcredit.invoice.service.lowerservice.vo.MonthAccountQueryVo;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 3 - 3
src/main/java/com/jkcredit/invoice/controller/service/SelfCarServiceController.java

@@ -1,9 +1,9 @@
-package com.jkcredit.invoice.controller.service;
+package com.jkcredit.invoice.controller.interserver;
 
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
-import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
-import com.jkcredit.invoice.service.lowerService.vo.*;
+import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.util.RespR;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 1 - 1
src/main/java/com/jkcredit/invoice/controller/manager/ParamController.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.controller.manager;
+package com.jkcredit.invoice.controller.param;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;

+ 3 - 3
src/main/java/com/jkcredit/invoice/credit/InterfaceCheckServer.java

@@ -2,9 +2,9 @@ package com.jkcredit.invoice.credit;
 
 import com.jkcredit.invoice.common.DataResult;
 import com.jkcredit.invoice.component.StatisRequestIdTimeComp;
-import com.jkcredit.invoice.credit.custInterface.CustomerInterLowerService;
-import com.jkcredit.invoice.credit.custInterface.NoCarInterService;
-import com.jkcredit.invoice.credit.custInterface.SelfCarInterService;
+import com.jkcredit.invoice.credit.interserver.CustomerInterLowerService;
+import com.jkcredit.invoice.credit.interserver.NoCarInterService;
+import com.jkcredit.invoice.credit.interserver.SelfCarInterService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 1 - 1
src/main/java/com/jkcredit/invoice/credit/custInterface/CustomerInterLowerService.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.credit.custInterface;
+package com.jkcredit.invoice.credit.interserver;
 
 import com.jkcredit.invoice.common.DataResult;
 

+ 2 - 2
src/main/java/com/jkcredit/invoice/credit/custInterface/CustomerInterLowerServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.credit.custInterface;
+package com.jkcredit.invoice.credit.interserver;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jkcredit.invoice.common.DataResult;
@@ -7,7 +7,7 @@ import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
+import com.jkcredit.invoice.service.lowerservice.CustomeLowerService;
 import com.jkcredit.invoice.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

+ 1 - 1
src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterService.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.credit.custInterface;
+package com.jkcredit.invoice.credit.interserver;
 
 import com.jkcredit.invoice.common.DataResult;
 

+ 3 - 3
src/main/java/com/jkcredit/invoice/credit/custInterface/NoCarInterServiceImpl.java

@@ -1,9 +1,9 @@
-package com.jkcredit.invoice.credit.custInterface;
+package com.jkcredit.invoice.credit.interserver;
 
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryResponse;
 import com.alibaba.fastjson.JSONObject;
 import com.jkcredit.invoice.common.DataResult;
-import com.jkcredit.invoice.mapper.Binvoce.BillInvoiceMapper;
+import com.jkcredit.invoice.mapper.binvoce.BillInvoiceMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerMapper;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
@@ -14,7 +14,7 @@ import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.customer.CustomerRecService;
-import com.jkcredit.invoice.service.lowerService.NoCarService;
+import com.jkcredit.invoice.service.lowerservice.NoCarService;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.util.DateUtil;

+ 1 - 1
src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterService.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.credit.custInterface;
+package com.jkcredit.invoice.credit.interserver;
 
 import com.jkcredit.invoice.common.DataResult;
 

+ 3 - 3
src/main/java/com/jkcredit/invoice/credit/custInterface/SelfCarInterServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.credit.custInterface;
+package com.jkcredit.invoice.credit.interserver;
 
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
 import com.alibaba.fastjson.JSONArray;
@@ -7,8 +7,8 @@ import com.jkcredit.invoice.common.DataResult;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.service.customer.CustomerRecService;
-import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
-import com.jkcredit.invoice.service.lowerService.vo.*;
+import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
src/main/java/com/jkcredit/invoice/mapper/Binvoce/BillInvoiceMapper.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.mapper.Binvoce;
+package com.jkcredit.invoice.mapper.binvoce;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 1 - 1
src/main/java/com/jkcredit/invoice/mapper/Binvoce/SelfCarApplMapper.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.mapper.Binvoce;
+package com.jkcredit.invoice.mapper.binvoce;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 1 - 1
src/main/java/com/jkcredit/invoice/mapper/Binvoce/SelfCarInvoiceMapper.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.mapper.Binvoce;
+package com.jkcredit.invoice.mapper.binvoce;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

+ 2 - 2
src/main/java/com/jkcredit/invoice/mapper/calculateInfor/MounthAccMapper.java

@@ -1,6 +1,6 @@
-package com.jkcredit.invoice.mapper.calculateInfor;
+package com.jkcredit.invoice.mapper.calculateinfor;
 
-import com.jkcredit.invoice.model.entity.Calculate.MounthAcc;
+import com.jkcredit.invoice.model.entity.calculate.MounthAcc;
 import org.springframework.stereotype.Repository;
 
 @Repository

+ 2 - 2
src/main/java/com/jkcredit/invoice/mapper/calculateInfor/NoCarCalculateInforMapper.java

@@ -1,9 +1,9 @@
-package com.jkcredit.invoice.mapper.calculateInfor;
+package com.jkcredit.invoice.mapper.calculateinfor;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.NoCarCalculateInfor;
 import com.jkcredit.invoice.model.vo.CompanyVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

+ 2 - 3
src/main/java/com/jkcredit/invoice/mapper/calculateInfor/SelfCarCalculateInforMapper.java

@@ -1,10 +1,9 @@
-package com.jkcredit.invoice.mapper.calculateInfor;
+package com.jkcredit.invoice.mapper.calculateinfor;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
-import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor;
 import com.jkcredit.invoice.model.vo.CompanyVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;

+ 1 - 1
src/main/java/com/jkcredit/invoice/model/entity/Calculate/MounthAcc.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.model.entity.Calculate;
+package com.jkcredit.invoice.model.entity.calculate;
 
 /**
  * 上游月账单

+ 1 - 1
src/main/java/com/jkcredit/invoice/model/entity/Calculate/NoCarCalculateInfor.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.model.entity.Calculate;
+package com.jkcredit.invoice.model.entity.calculate;
 
 import java.util.Objects;
 

+ 1 - 1
src/main/java/com/jkcredit/invoice/model/entity/Calculate/SelfCarCalculateInfor.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.model.entity.Calculate;
+package com.jkcredit.invoice.model.entity.calculate;
 
 /**
  * 自有车计费

+ 2 - 2
src/main/java/com/jkcredit/invoice/service/CalculateInfor/NoCarCalculateInfoService.java

@@ -1,8 +1,8 @@
-package com.jkcredit.invoice.service.CalculateInfor;
+package com.jkcredit.invoice.service.calculateinfor;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.NoCarCalculateInfor;
 import java.util.List;
 import java.util.Map;
 

+ 2 - 3
src/main/java/com/jkcredit/invoice/service/CalculateInfor/SelfCarCalculateInfoService.java

@@ -1,9 +1,8 @@
-package com.jkcredit.invoice.service.CalculateInfor;
+package com.jkcredit.invoice.service.calculateinfor;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
-import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor;
 
 import java.util.List;
 import java.util.Map;

+ 4 - 4
src/main/java/com/jkcredit/invoice/service/CalculateInfor/impl/NocarCalculateInfoServiceImpl.java

@@ -1,12 +1,12 @@
-package com.jkcredit.invoice.service.CalculateInfor.impl;
+package com.jkcredit.invoice.service.calculateinfor.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jkcredit.invoice.mapper.calculateInfor.NoCarCalculateInforMapper;
+import com.jkcredit.invoice.mapper.calculateinfor.NoCarCalculateInforMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerMapper;
-import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.NoCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.Customer;
-import com.jkcredit.invoice.service.CalculateInfor.NoCarCalculateInfoService;
+import com.jkcredit.invoice.service.calculateinfor.NoCarCalculateInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 4 - 7
src/main/java/com/jkcredit/invoice/service/CalculateInfor/impl/SelfcarCalculateInfoServiceImpl.java

@@ -1,13 +1,10 @@
-package com.jkcredit.invoice.service.CalculateInfor.impl;
+package com.jkcredit.invoice.service.calculateinfor.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jkcredit.invoice.mapper.calculateInfor.NoCarCalculateInforMapper;
-import com.jkcredit.invoice.mapper.calculateInfor.SelfCarCalculateInforMapper;
-import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
-import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
-import com.jkcredit.invoice.service.CalculateInfor.NoCarCalculateInfoService;
-import com.jkcredit.invoice.service.CalculateInfor.SelfCarCalculateInfoService;
+import com.jkcredit.invoice.mapper.calculateinfor.SelfCarCalculateInforMapper;
+import com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor;
+import com.jkcredit.invoice.service.calculateinfor.SelfCarCalculateInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 4
src/main/java/com/jkcredit/invoice/service/lowerService/CustomeLowerService.java

@@ -1,9 +1,6 @@
-package com.jkcredit.invoice.service.lowerService;
+package com.jkcredit.invoice.service.lowerservice;
 
-import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
-import com.jkcredit.invoice.service.lowerService.vo.EtcBindVo;
-import com.jkcredit.invoice.service.lowerService.vo.EtcValidVo;
 import com.jkcredit.invoice.util.RespR;
 
 import java.util.List;

+ 3 - 3
src/main/java/com/jkcredit/invoice/service/lowerService/NoCarService.java

@@ -1,9 +1,9 @@
-package com.jkcredit.invoice.service.lowerService;
+package com.jkcredit.invoice.service.lowerservice;
 
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
-import com.jkcredit.invoice.service.lowerService.vo.HCInvoiceQueryVo;
-import com.jkcredit.invoice.service.lowerService.vo.MonthAccountQueryVo;
+import com.jkcredit.invoice.service.lowerservice.vo.HCInvoiceQueryVo;
+import com.jkcredit.invoice.service.lowerservice.vo.MonthAccountQueryVo;
 import com.jkcredit.invoice.util.RespR;
 
 import java.util.List;

+ 2 - 4
src/main/java/com/jkcredit/invoice/service/lowerService/SelfCarServiceL.java

@@ -1,15 +1,13 @@
-package com.jkcredit.invoice.service.lowerService;
+package com.jkcredit.invoice.service.lowerservice;
 
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.B2BInvoiceListModel;
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.B2bInvoicePackageModel;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
-import com.jkcredit.invoice.model.entity.B2bInvoicePackage;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarAppl;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
-import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
-import com.jkcredit.invoice.service.lowerService.vo.*;
+import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.util.RespR;
 
 import java.util.List;

+ 6 - 6
src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java

@@ -1,11 +1,11 @@
-package com.jkcredit.invoice.service.lowerService.impl;
+package com.jkcredit.invoice.service.lowerservice.impl;
 
 import cn.com.taiji.sdk.model.comm.protocol.eoms.company.B2bCompanyModel;
 import com.jkcredit.invoice.component.SendMailService;
-import com.jkcredit.invoice.mapper.Binvoce.BillInvoiceMapper;
-import com.jkcredit.invoice.mapper.Binvoce.SelfCarInvoiceMapper;
-import com.jkcredit.invoice.mapper.calculateInfor.NoCarCalculateInforMapper;
-import com.jkcredit.invoice.mapper.calculateInfor.SelfCarCalculateInforMapper;
+import com.jkcredit.invoice.mapper.binvoce.BillInvoiceMapper;
+import com.jkcredit.invoice.mapper.binvoce.SelfCarInvoiceMapper;
+import com.jkcredit.invoice.mapper.calculateinfor.NoCarCalculateInforMapper;
+import com.jkcredit.invoice.mapper.calculateinfor.SelfCarCalculateInforMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
@@ -16,7 +16,7 @@ import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.vo.CompanyVo;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
+import com.jkcredit.invoice.service.lowerservice.CustomeLowerService;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.upService.NoCarInterface;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;

+ 9 - 9
src/main/java/com/jkcredit/invoice/service/lowerService/impl/NoCarServiceImpl.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.impl;
+package com.jkcredit.invoice.service.lowerservice.impl;
 
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryResponse;
@@ -6,24 +6,24 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleRegisterResponse;
 import cn.com.taiji.sdk.model.comm.protocol.tts.waybill.*;
 import com.jkcredit.invoice.common.CommonConstants;
-import com.jkcredit.invoice.mapper.Binvoce.BillInvoiceMapper;
-import com.jkcredit.invoice.mapper.calculateInfor.MounthAccMapper;
-import com.jkcredit.invoice.mapper.calculateInfor.NoCarCalculateInforMapper;
+import com.jkcredit.invoice.mapper.binvoce.BillInvoiceMapper;
+import com.jkcredit.invoice.mapper.calculateinfor.MounthAccMapper;
+import com.jkcredit.invoice.mapper.calculateinfor.NoCarCalculateInforMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
-import com.jkcredit.invoice.model.entity.Calculate.MounthAcc;
-import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.MounthAcc;
+import com.jkcredit.invoice.model.entity.calculate.NoCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
-import com.jkcredit.invoice.service.lowerService.NoCarService;
-import com.jkcredit.invoice.service.lowerService.vo.HCInvoiceQueryVo;
-import com.jkcredit.invoice.service.lowerService.vo.MonthAccountQueryVo;
+import com.jkcredit.invoice.service.lowerservice.NoCarService;
+import com.jkcredit.invoice.service.lowerservice.vo.HCInvoiceQueryVo;
+import com.jkcredit.invoice.service.lowerservice.vo.MonthAccountQueryVo;
 import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
 import com.jkcredit.invoice.service.upService.NoCarInterface;

+ 7 - 7
src/main/java/com/jkcredit/invoice/service/lowerService/impl/SelfCarServiceLImpl.java

@@ -1,18 +1,18 @@
-package com.jkcredit.invoice.service.lowerService.impl;
+package com.jkcredit.invoice.service.lowerservice.impl;
 import cn.com.taiji.sdk.model.comm.protocol.tts.card.server.*;
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.*;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeRequest;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeResponse;
 import com.jkcredit.invoice.common.CommonConstants;
-import com.jkcredit.invoice.mapper.Binvoce.SelfCarApplMapper;
-import com.jkcredit.invoice.mapper.Binvoce.SelfCarInvoiceMapper;
-import com.jkcredit.invoice.mapper.calculateInfor.SelfCarCalculateInforMapper;
+import com.jkcredit.invoice.mapper.binvoce.SelfCarApplMapper;
+import com.jkcredit.invoice.mapper.binvoce.SelfCarInvoiceMapper;
+import com.jkcredit.invoice.mapper.calculateinfor.SelfCarCalculateInforMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerRecMapper;
 import com.jkcredit.invoice.mapper.waybill.SellCarTradeMapper;
-import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
+import com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
@@ -20,8 +20,8 @@ import com.jkcredit.invoice.model.entity.invoice.SelfCarAppl;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
-import com.jkcredit.invoice.service.lowerService.vo.*;
+import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.vo.*;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;
 import com.jkcredit.invoice.util.*;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/ApplQueryInvVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 public class ApplQueryInvVo {
     /**

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/CarVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 /**
  * 车辆属性

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcBindVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 import java.util.List;
 

+ 1 - 3
src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcQueryVo.java

@@ -1,6 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
-
-import java.util.List;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 /**
  * 用户卡查询vo

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/EtcValidVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 /**
  * etc校验Vo

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/HCInvoiceQueryVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 /**
  * 红冲发票查询

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/InvoiceApplVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/InvoicePackageVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 /**
  * 发票打包下载请求VO

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/MonthAccountQueryVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 /**
  * 历史账单查询接口

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/NoCarQueryVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 /**
  * 无车备案查询

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/SelfCarDueQueryVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 /**
  * 自有车已开发票查询

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/SelfcarInvoiceByTimeVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 public class SelfcarInvoiceByTimeVo {
     private String startTime;

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/TradeRequestCarNumVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 public class TradeRequestCarNumVo {
     private String startTime;

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/lowerService/vo/TradeRequestVo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.lowerService.vo;
+package com.jkcredit.invoice.service.lowerservice.vo;
 
 public class TradeRequestVo {
     private String startTime;

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -12,7 +12,7 @@ import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.customer.CustomerOperService;
 import com.jkcredit.invoice.service.customer.CustomerRecService;
 import com.jkcredit.invoice.service.customer.CustomerService;
-import com.jkcredit.invoice.service.lowerService.NoCarService;
+import com.jkcredit.invoice.service.lowerservice.NoCarService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayImportService;
 import com.jkcredit.invoice.service.nocar.NoCarBillWayService;
 import com.jkcredit.invoice.util.DateUtil;

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/nocar/impl/NocarInvoiceServiceImpl.java

@@ -3,7 +3,7 @@ package com.jkcredit.invoice.service.nocar.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jkcredit.invoice.mapper.Binvoce.BillInvoiceMapper;
+import com.jkcredit.invoice.mapper.binvoce.BillInvoiceMapper;
 import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.service.nocar.NocarInvoiceService;
 import com.jkcredit.invoice.util.RespR;

+ 1 - 2
src/main/java/com/jkcredit/invoice/service/selfCar/SelfCarInvoiceService.java

@@ -1,9 +1,8 @@
-package com.jkcredit.invoice.service.selfCar;
+package com.jkcredit.invoice.service.selfcar;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
-import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
 import com.jkcredit.invoice.util.RespR;
 
 import java.util.List;

+ 1 - 1
src/main/java/com/jkcredit/invoice/service/selfCar/SelfCarService.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.service.selfCar;
+package com.jkcredit.invoice.service.selfcar;
 
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.util.RespR;

+ 1 - 2
src/main/java/com/jkcredit/invoice/service/selfCar/SelfCarTradeService.java

@@ -1,8 +1,7 @@
-package com.jkcredit.invoice.service.selfCar;
+package com.jkcredit.invoice.service.selfcar;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
 import com.jkcredit.invoice.util.RespR;
 

+ 3 - 4
src/main/java/com/jkcredit/invoice/service/selfCar/impl/SelfCarInvoiceServiceImpl.java

@@ -1,12 +1,11 @@
-package com.jkcredit.invoice.service.selfCar.impl;
+package com.jkcredit.invoice.service.selfcar.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jkcredit.invoice.mapper.Binvoce.SelfCarInvoiceMapper;
+import com.jkcredit.invoice.mapper.binvoce.SelfCarInvoiceMapper;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
-import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
-import com.jkcredit.invoice.service.selfCar.SelfCarInvoiceService;
+import com.jkcredit.invoice.service.selfcar.SelfCarInvoiceService;
 import com.jkcredit.invoice.util.RespR;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 3 - 4
src/main/java/com/jkcredit/invoice/service/selfCar/impl/SelfCarServiceImpl.java

@@ -1,10 +1,9 @@
-package com.jkcredit.invoice.service.selfCar.impl;
+package com.jkcredit.invoice.service.selfcar.impl;
 
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
-import com.jkcredit.invoice.service.lowerService.CustomeLowerService;
-import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
-import com.jkcredit.invoice.service.selfCar.SelfCarService;
+import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.selfcar.SelfCarService;
 import com.jkcredit.invoice.util.RespR;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 4 - 4
src/main/java/com/jkcredit/invoice/service/selfCar/impl/SelfCarTradeServiceImpl.java

@@ -1,12 +1,12 @@
-package com.jkcredit.invoice.service.selfCar.impl;
+package com.jkcredit.invoice.service.selfcar.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jkcredit.invoice.mapper.waybill.SellCarTradeMapper;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
-import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
-import com.jkcredit.invoice.service.lowerService.vo.TradeRequestVo;
-import com.jkcredit.invoice.service.selfCar.SelfCarTradeService;
+import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.vo.TradeRequestVo;
+import com.jkcredit.invoice.service.selfcar.SelfCarTradeService;
 import com.jkcredit.invoice.util.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import org.apache.commons.lang3.StringUtils;

+ 5 - 5
src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -1,17 +1,17 @@
 package com.jkcredit.invoice.task;
 
-import com.jkcredit.invoice.mapper.Binvoce.SelfCarApplMapper;
+import com.jkcredit.invoice.mapper.binvoce.SelfCarApplMapper;
 import com.jkcredit.invoice.mapper.customer.CustomerCarRecMapper;
 import com.jkcredit.invoice.mapper.waybill.NoCarWaybillMapper;
 import com.jkcredit.invoice.mapper.waybill.SellCarTradeMapper;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
-import com.jkcredit.invoice.service.lowerService.NoCarService;
-import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
-import com.jkcredit.invoice.service.lowerService.vo.SelfCarDueQueryVo;
+import com.jkcredit.invoice.service.lowerservice.NoCarService;
+import com.jkcredit.invoice.service.lowerservice.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerservice.vo.SelfCarDueQueryVo;
 import com.jkcredit.invoice.service.manager.ParamService;
-import com.jkcredit.invoice.service.selfCar.SelfCarTradeService;
+import com.jkcredit.invoice.service.selfcar.SelfCarTradeService;
 import com.jkcredit.invoice.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

+ 3 - 3
src/main/resources/mapper/calculateInfor/MounthAccMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jkcredit.invoice.mapper.calculateInfor.MounthAccMapper">
+<mapper namespace="com.jkcredit.invoice.mapper.calculateinfor.MounthAccMapper">
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.Calculate.MounthAcc">
+    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.calculate.MounthAcc">
         <id column="id" property="id"/>
         <result column="customerId" property="customerId"/>
         <result column="companyName" property="companyName"/>
@@ -29,7 +29,7 @@
           enStation,
           exStation
     </sql>
-    <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.Calculate.MounthAcc" >
+    <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.calculate.MounthAcc" >
         insert into t_mouth_cal (
          customerId,
           companyName,

+ 3 - 3
src/main/resources/mapper/calculateInfor/NoCarCalculateInforMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jkcredit.invoice.mapper.calculateInfor.NoCarCalculateInforMapper">
+<mapper namespace="com.jkcredit.invoice.mapper.calculateinfor.NoCarCalculateInforMapper">
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor">
+    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.calculate.NoCarCalculateInfor">
         <id column="id" property="id"/>
         <result column="customId" property="customId"/>
         <result column="companyNum" property="companyNum"/>
@@ -96,7 +96,7 @@
         <include refid="baseSql" />
         from t_CalculateInfor where  tradeId = BINARY #{tradeId,jdbcType=VARCHAR}
     </select>
-    <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor" >
+    <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.calculate.NoCarCalculateInfor" >
         insert into t_CalculateInfor (
         customId,
         companyNum,

+ 4 - 4
src/main/resources/mapper/calculateInfor/SefCarCalculateInforMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jkcredit.invoice.mapper.calculateInfor.SelfCarCalculateInforMapper">
+<mapper namespace="com.jkcredit.invoice.mapper.calculateinfor.SelfCarCalculateInforMapper">
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor">
+    <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor">
         <id column="id" property="id"/>
         <result column="customId" property="customId"/>
         <result column="companyNum" property="companyNum"/>
@@ -54,12 +54,12 @@
          </if>
          order by id DESC
      </select>
-     <select id="selectByEtcAndTime" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor">
+     <select id="selectByEtcAndTime" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor">
          select
          <include refid="baseSql" />
          from t_SelfCalculateInfor where calTime = #{calTime,jdbcType=VARCHAR} and BINARY etcNum = #{etcNum,jdbcType=VARCHAR}
      </select>
-     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor" >
+     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.calculate.SelfCarCalculateInfor" >
          insert into t_SelfCalculateInfor (
          customId,
          companyNum,

+ 1 - 1
src/main/resources/mapper/invoice/BillInvoiceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jkcredit.invoice.mapper.Binvoce.BillInvoiceMapper">
+<mapper namespace="com.jkcredit.invoice.mapper.binvoce.BillInvoiceMapper">
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.invoice.BillInvoice">
         <id column="id" property="id"/>

+ 1 - 1
src/main/resources/mapper/invoice/SelfCarApplMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jkcredit.invoice.mapper.Binvoce.SelfCarApplMapper">
+<mapper namespace="com.jkcredit.invoice.mapper.binvoce.SelfCarApplMapper">
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.invoice.SelfCarAppl">
         <id column="id" property="id"/>

+ 1 - 1
src/main/resources/mapper/invoice/SelfCarInvoiceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jkcredit.invoice.mapper.Binvoce.SelfCarInvoiceMapper">
+<mapper namespace="com.jkcredit.invoice.mapper.binvoce.SelfCarInvoiceMapper">
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice">
         <id column="id" property="id"/>