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

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

@@ -718,19 +718,6 @@ public class NoCarServiceImpl implements NoCarService{
         hcInvoiceParam.setBuyerTaxpayerCode(hcInvoiceQueryVo.getBuyerTaxpayerCode());
         hcInvoiceParam.setYearMonth(hcInvoiceQueryVo.getMonth());
         List<HcInvoice> hcInvoices = hcInvoiceMapper.selectInvoiceByCondition(hcInvoiceParam);
-        if(hcInvoices == null || hcInvoices.size()==0){
-            hcInvoiceParam.setBuyerName("");
-            hcInvoiceParam.setBuyerTaxpayerCode("");
-            hcInvoices = hcInvoiceMapper.selectInvoiceByCondition(hcInvoiceParam);
-            if(hcInvoices == null || hcInvoices.size()==0){
-                hCInvoiceUpdate(hcInvoiceQueryVo);
-                hcInvoiceParam.setBuyerName(hcInvoiceQueryVo.getBuyerName());
-                hcInvoiceParam.setBuyerTaxpayerCode(hcInvoiceQueryVo.getBuyerTaxpayerCode());
-                hcInvoices = hcInvoiceMapper.selectInvoiceByCondition(hcInvoiceParam);
-            }else{
-                hcInvoices = null;
-            }
-        }
         if(hcInvoices == null){
             hcInvoices = new ArrayList<>();
         }
@@ -764,6 +751,7 @@ public class NoCarServiceImpl implements NoCarService{
                 for(WaybillInvoiceRedQueryModel waybillInvoiceRedQueryModel :waybillInvoiceRedQueryModels){
                     HcInvoice hcInvoice = new HcInvoice();
                     BeanUtils.copyProperties(waybillInvoiceRedQueryModel,hcInvoice);
+                    hcInvoice.setYearMonth(hcInvoiceQueryVo.getMonth());
                     hcInvoiceMapper.insertHcInvoice(hcInvoice);
                 }
             }

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

@@ -3,7 +3,6 @@
 <mapper namespace="com.jkcredit.invoice.mapper.binvoce.HcInvoiceMapper">
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.jkcredit.invoice.model.entity.invoice.HcInvoice">
-        <id column="id" property="id"/>
         <result column="sellerName" property="sellerName"/>
         <result column="sellerTaxpayerCode" property="sellerTaxpayerCode"/>
         <result column="buyerName" property="buyerName"/>
@@ -27,12 +26,14 @@
         rawInvoiceId,
         rawInvoiceCode,
         rawInvoiceNum,
+        invoiceCode,
+        invoiceNum,
         invoiceUrl,
         yearMonth
     </sql>
     <select id="selectInvoiceByCondition" parameterType="com.jkcredit.invoice.model.entity.invoice.HcInvoice" resultMap="BaseResultMap">
         select
-        id,<include refid="baseSql" />
+        <include refid="baseSql" />
         from t_hcinvoice
         where yearMonth = #{yearMonth,jdbcType=VARCHAR}
         <if test="buyerName != null and buyerName != ''">
@@ -52,6 +53,8 @@
                     #{rawInvoiceId,jdbcType=VARCHAR},
                     #{rawInvoiceCode,jdbcType=VARCHAR},
                     #{rawInvoiceNum,jdbcType=VARCHAR},
+                    #{invoiceCode,jdbcType=VARCHAR},
+                    #{invoiceNum,jdbcType=VARCHAR},
                     #{invoiceUrl,jdbcType=VARCHAR},
                     #{yearMonth,jdbcType=VARCHAR}
         )