无车优化，自有车接口返回

src/main/java/com/jkcredit/invoice/credit/interserver/NoCarInterServiceImpl.java

@@ -850,13 +850,13 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             JSONObject jsonObject = JSONObject.parseObject(data);
             String taxplayerCode =  jsonObject.getString("taxplayerCode");//企业税号 必输
             String month = jsonObject.getString("month");//开票月份 样例：yyyy-MM   必输
-            Integer pageNo = jsonObject.getInteger("pageNo");//查询第几页  示例1,2,3,4…
-
+            Long pageNo = jsonObject.getLong("pageNo");//查询第几页  示例1,2,3,4…
+            Long pageSize = jsonObject.getLong("pageSize");//查询第几页  示例1,2,3,4… 没有就默认1000
 
             if(StringUtils.isEmpty(data)|| null == jsonObject){
                 return  result;
             }
-            if(StringUtils.isEmpty(taxplayerCode) || StringUtils.isEmpty(month) || null == pageNo){
+            if(StringUtils.isEmpty(taxplayerCode) || StringUtils.isEmpty(month) || null == pageNo ||pageNo<1){
                 return  result;
             }
 
@@ -868,7 +868,9 @@ public class NoCarInterServiceImpl implements NoCarInterService {
             HCInvoiceQueryVo hcInvoiceQueryVo = new HCInvoiceQueryVo();
             hcInvoiceQueryVo.setBuyerTaxpayerCode(taxplayerCode);
             hcInvoiceQueryVo.setMonth(month);
-            RespR rs = noCarService.hCInvoiceQuery(hcInvoiceQueryVo);
+            hcInvoiceQueryVo.setPageSize(pageSize);
+            hcInvoiceQueryVo.setPageNo(pageNo);
+            RespR rs = noCarService.hCInvoiceQueryInter(hcInvoiceQueryVo);
             long costtimeend = System.currentTimeMillis();
             log.info("[-NoCarInterServiceImpl.redInkInvoiceQuery-] result is "
                     + rs.toString() + ", request is " + data + " ,costtime="

src/main/java/com/jkcredit/invoice/mapper/binvoce/HcInvoiceMapper.java

@@ -3,9 +3,7 @@ package com.jkcredit.invoice.mapper.binvoce;
 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.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.invoice.HcInvoice;
-import com.jkcredit.invoice.model.vo.CompanyVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -13,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 @Repository
-public interface HcInvoiceMapper{
+public interface HcInvoiceMapper extends BaseMapper<HcInvoice>{
     /**
      * 插入红冲发票
      * @param hcInvoice
@@ -30,4 +28,6 @@ public interface HcInvoiceMapper{
 
 
     List<HcInvoice> selectInvoiceByCondition(HcInvoice hcInvoice);
+
+    IPage<HcInvoice> selectAllByPage(Page page, @Param("hcInvoice") HcInvoice hcInvoice);
 }

src/main/java/com/jkcredit/invoice/service/lowerservice/NoCarService.java

@@ -74,6 +74,13 @@ public interface NoCarService {
     RespR hCInvoiceQuery(HCInvoiceQueryVo hcInvoiceQueryVo);
 
     /**
+     * 红冲发票查询接口
+     * @param hcInvoiceQueryVo
+     * @return
+     */
+    RespR hCInvoiceQueryInter(HCInvoiceQueryVo hcInvoiceQueryVo);
+
+    /**
      * 红冲发票更新
      * @param hcInvoiceQueryVo
      * @return

src/main/java/com/jkcredit/invoice/service/lowerservice/impl/NoCarServiceImpl.java

@@ -5,6 +5,8 @@ import cn.com.taiji.sdk.model.comm.protocol.tts.vehicle.VehicleQueryResponse;
 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.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.common.CommonConstants;
 import com.jkcredit.invoice.mapper.binvoce.BillInvoiceMapper;
 import com.jkcredit.invoice.mapper.binvoce.HcInvoiceMapper;
@@ -27,6 +29,7 @@ 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.HcInvoiceService;
 import com.jkcredit.invoice.service.nocar.NoCarRecService;
 import com.jkcredit.invoice.service.upService.NoCarInterface;
 import com.jkcredit.invoice.util.*;
@@ -715,7 +718,6 @@ public class NoCarServiceImpl implements NoCarService{
         log.info("取红冲票啦：NoCarServiceImpl.hCInvoiceQuery{}",hcInvoiceQueryVo);
         HcInvoice hcInvoiceParam = new HcInvoice();
         hcInvoiceParam.setBuyerName(hcInvoiceQueryVo.getBuyerName());
-        hcInvoiceParam.setBuyerTaxpayerCode(hcInvoiceQueryVo.getBuyerTaxpayerCode());
         hcInvoiceParam.setYearMonth(hcInvoiceQueryVo.getMonth());
         List<HcInvoice> hcInvoices = hcInvoiceMapper.selectInvoiceByCondition(hcInvoiceParam);
         if(hcInvoices == null){
@@ -726,6 +728,28 @@ public class NoCarServiceImpl implements NoCarService{
         return new RespR(map);
     }
     @Autowired
+    HcInvoiceService hcInvoiceService;
+    @Override
+    public RespR hCInvoiceQueryInter(HCInvoiceQueryVo hcInvoiceQueryVo) {
+        Page page = new Page();
+        page.setCurrent(hcInvoiceQueryVo.getPageNo());
+        if(StringUtils.isEmpty(hcInvoiceQueryVo.getPageSize())){
+            page.setSize(1000);
+        }else{
+            page.setSize(hcInvoiceQueryVo.getPageSize());
+        }
+        HcInvoice hcInvoiceParam = new HcInvoice();
+        hcInvoiceParam.setBuyerTaxpayerCode(hcInvoiceQueryVo.getBuyerTaxpayerCode());
+        hcInvoiceParam.setYearMonth(hcInvoiceQueryVo.getMonth());
+        IPage<HcInvoice> listIPage = hcInvoiceService.findByPageAndWayBill(page,hcInvoiceParam);
+        Map<String,Object> map = new HashMap<>();
+        map.put("result",listIPage.getRecords());
+        map.put("total",listIPage.getTotal());
+        map.put("pages",listIPage.getPages());
+        return new RespR(map);
+    }
+
+    @Autowired
     HcInvoiceMapper hcInvoiceMapper;
 
     @Override

src/main/java/com/jkcredit/invoice/service/lowerservice/vo/HCInvoiceQueryVo.java

@@ -21,6 +21,10 @@ public class HCInvoiceQueryVo {
      */
     private String month;
 
+    private Long pageNo;
+
+    private Long pageSize;
+
     public String getBuyerName() {
         return buyerName;
     }
@@ -53,6 +57,22 @@ public class HCInvoiceQueryVo {
         this.companyNum = companyNum;
     }
 
+    public Long getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Long pageNo) {
+        this.pageNo = pageNo;
+    }
+
+    public Long getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Long pageSize) {
+        this.pageSize = pageSize;
+    }
+
     @Override
     public String toString() {
         return "HCInvoiceQueryVo{" +

src/main/java/com/jkcredit/invoice/service/nocar/HcInvoiceService.java

@@ -0,0 +1,18 @@
+package com.jkcredit.invoice.service.nocar;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jkcredit.invoice.model.entity.invoice.HcInvoice;
+import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
+
+import java.util.List;
+
+public interface HcInvoiceService {
+    /**
+     * 查询所有红冲发票接口
+     * @param page
+     * @param hcInvoice
+     * @return
+     */
+    IPage<HcInvoice> findByPageAndWayBill(Page page, HcInvoice hcInvoice);
+}

src/main/java/com/jkcredit/invoice/service/nocar/impl/HcInvoiceServiceImpl.java

@@ -0,0 +1,21 @@
+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.HcInvoiceMapper;
+import com.jkcredit.invoice.model.entity.invoice.HcInvoice;
+import com.jkcredit.invoice.service.nocar.HcInvoiceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+public class HcInvoiceServiceImpl extends ServiceImpl<HcInvoiceMapper,HcInvoice> implements HcInvoiceService{
+    @Autowired
+    HcInvoiceMapper hcInvoiceMapper;
+    @Override
+    public IPage<HcInvoice> findByPageAndWayBill(Page page, HcInvoice hcInvoice) {
+        return hcInvoiceMapper.selectAllByPage(page,hcInvoice);
+    }
+}

src/main/java/com/jkcredit/invoice/util/QueryDemo_Test.java

@@ -110,7 +110,8 @@ public class QueryDemo_Test {
 	      dataJson.put("mobile","15562139518");*/
 		   dataJson.put("taxplayerCode", "91149900MA0LBCKM6F");
 	       dataJson.put("month", "2022-04");
-		  dataJson.put("pageNo", 1);
+		  dataJson.put("pageNo", 4);
+		  dataJson.put("pageSize",10); //没有就默认1000
 
 		 /* List<String> list = new ArrayList<>();
 			list.add("13752639577");

src/main/resources/mapper/invoice/hcInvoiceMapper.xml

@@ -31,6 +31,14 @@
         invoiceUrl,
         yearMonth
     </sql>
+
+    <select id="selectAllByPage" resultMap="BaseResultMap">
+        select
+        <include refid="baseSql" />
+        from t_hcinvoice
+        where yearMonth = #{hcInvoice.yearMonth,jdbcType=VARCHAR}
+              and  buyerTaxpayerCode = BINARY #{hcInvoice.buyerTaxpayerCode,jdbcType=VARCHAR}
+    </select>
     <select id="selectInvoiceByCondition" parameterType="com.jkcredit.invoice.model.entity.invoice.HcInvoice" resultMap="BaseResultMap">
         select
         <include refid="baseSql" />