1、http地址增加a标签 2、无车运单号查询发票增加发票状态和发票状态原因

pom.xml

@@ -300,11 +300,11 @@
 
         <!--无车-->
         <dependency>
-            <groupId>sdk-waybill-protocol-1.3.10</groupId>
+            <groupId>sdk-waybill-protocol-1.3.11</groupId>
             <artifactId>sdk</artifactId>
             <scope>system</scope>
             <version>1.0</version>
-            <systemPath>${project.basedir}/lib/sdk-waybill-protocol-1.3.10.jar</systemPath>
+            <systemPath>${project.basedir}/lib/sdk-waybill-protocol-1.3.11.jar</systemPath>
         </dependency>
         <!--有车-->
         <dependency>

src/main/java/com/jkcredit/invoice/model/entity/invoice/BillInvoice.java

@@ -158,6 +158,18 @@ public class BillInvoice {
 
     private String calculateTimeEnd;
 
+    /**
+     * 发票状态
+     * 待开票	1
+     * 开票中	2
+     * 开票完成	3
+     */
+    private  Integer invoiceStatus;
+
+    /**
+     * 发票状态信息
+     */
+    private String msg;
 
     /**
      * 对接方式 0 接口 1平台
@@ -477,6 +489,22 @@ public class BillInvoice {
         this.waybillNums = waybillNums;
     }
 
+    public Integer getInvoiceStatus() {
+        return invoiceStatus;
+    }
+
+    public void setInvoiceStatus(Integer invoiceStatus) {
+        this.invoiceStatus = invoiceStatus;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
     @Override
     public String toString() {
         return "BillInvoice{" +
@@ -485,6 +513,7 @@ public class BillInvoice {
                 ", customerName='" + customerName + '\'' +
                 ", companyName='" + companyName + '\'' +
                 ", invoiceNum='" + invoiceNum + '\'' +
+                ", codeAndNumVos=" + codeAndNumVos +
                 ", invoiceCode='" + invoiceCode + '\'' +
                 ", invoiceMakeTime='" + invoiceMakeTime + '\'' +
                 ", invoiceMakeStart='" + invoiceMakeStart + '\'' +
@@ -501,6 +530,7 @@ public class BillInvoice {
                 ", sellerName='" + sellerName + '\'' +
                 ", sellerTaxpayerCode='" + sellerTaxpayerCode + '\'' +
                 ", waybillNum='" + waybillNum + '\'' +
+                ", waybillNums=" + waybillNums +
                 ", waybillStatus=" + waybillStatus +
                 ", waybillStartTime='" + waybillStartTime + '\'' +
                 ", waybillEndTime='" + waybillEndTime + '\'' +
@@ -512,6 +542,13 @@ public class BillInvoice {
                 ", tradeMatchTime='" + tradeMatchTime + '\'' +
                 ", buyerName='" + buyerName + '\'' +
                 ", buyerTaxpayerCode='" + buyerTaxpayerCode + '\'' +
+                ", billStatus='" + billStatus + '\'' +
+                ", calculateTime='" + calculateTime + '\'' +
+                ", calculateTimeStart='" + calculateTimeStart + '\'' +
+                ", calculateTimeEnd='" + calculateTimeEnd + '\'' +
+                ", invoiceStatus=" + invoiceStatus +
+                ", msg='" + msg + '\'' +
+                ", interType=" + interType +
                 '}';
     }
 }

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

@@ -37,6 +37,8 @@
         <result column="billStatus" property="billStatus"/>
         <result column="calculateTime" property="calculateTime"/>
         <result column="interType" property="interType"/>
+        <result column="invoiceStatus" property="invoiceStatus"/>
+        <result column="msg" property="msg"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -74,7 +76,7 @@
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
-        <include refid="baseSql" />,waybillStatus billStatus,calculateTime
+        <include refid="baseSql" />,waybillStatus billStatus,calculateTime,invoiceStatus,msg
         from t_billInvoice
         <where>
             <if test="billInvoice.customerName != null and billInvoice.customerName != ''">
@@ -180,7 +182,9 @@
             transactionId,
             tradeMatchTime,
             buyerName,
-            buyerTaxpayerCode,calculateTime
+            buyerTaxpayerCode,calculateTime,
+            invoiceStatus,
+            msg
         )
         values ( #{companyNum,jdbcType=VARCHAR},#{customerName,jdbcType=VARCHAR},#{companyName,jdbcType=VARCHAR},#{waybillNum,jdbcType=VARCHAR}, #{invoiceNum,jdbcType=VARCHAR},
                 #{invoiceCode,jdbcType=VARCHAR}, #{invoiceMakeTime,jdbcType=VARCHAR}, #{invoiceUrl,jdbcType=VARCHAR},
@@ -189,7 +193,10 @@
                 #{plateNum,jdbcType=VARCHAR},#{vehicleType,jdbcType=VARCHAR},#{sellerName,jdbcType=VARCHAR},
                 #{sellerTaxpayerCode,jdbcType=VARCHAR},#{waybillStatus,jdbcType=INTEGER}, #{waybillStartTime,jdbcType=VARCHAR}, #{waybillEndTime,jdbcType=VARCHAR}
                 , #{totalAmount,jdbcType=INTEGER}, #{taxRate,jdbcType=DOUBLE},#{invoiceType,jdbcType=VARCHAR},#{amount,jdbcType=INTEGER},
-                #{transactionId,jdbcType=VARCHAR},#{tradeMatchTime,jdbcType=VARCHAR},#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR},#{calculateTime,jdbcType=VARCHAR}
+                #{transactionId,jdbcType=VARCHAR},#{tradeMatchTime,jdbcType=VARCHAR},#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR}
+                ,#{calculateTime,jdbcType=VARCHAR}
+                ,#{invoiceStatus,jdbcType=INTEGER}
+                ,#{msg,jdbcType=VARCHAR}
         )
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.jkcredit.invoice.model.entity.invoice.BillInvoice" >
@@ -266,7 +273,7 @@
     </update>
     <select id="selectByBillNum" resultMap="BaseResultMap" parameterType="java.lang.String" >
         select
-        <include refid="baseSql" />,calculateTime
+        <include refid="baseSql" />,calculateTime,invoiceStatus,msg
         from t_billInvoice
         where  waybillNum = BINARY #{waybillNum,jdbcType=VARCHAR}
     </select>