fix 发票

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceAddBo.java

@@ -100,4 +100,7 @@ public class OrderInvoiceAddBo {
     /** 收件人手机号码 */
     @ApiModelProperty("收件人手机号码")
     private String receivingTel;
+    /** 发票号码 */
+    @ApiModelProperty("发票号码")
+    private String invoiceNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceEditBo.java

@@ -127,4 +127,8 @@ public class OrderInvoiceEditBo {
     @ApiModelProperty("收件人手机号码")
     private String receivingTel;
 
+    /** 发票号码 */
+    @ApiModelProperty("发票号码")
+    private String invoiceNum;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderInvoice.java

@@ -52,7 +52,7 @@ private static final long serialVersionUID=1L;
     private Integer invoiceStatus;
     /** 发票金额 */
     private BigDecimal amount;
-    /** 发票代码/发票号码 */
+    /** 发票代码 */
     private String invoiceCode;
     /** 是否上传发票 0否 1是 */
     private Integer uploadInvoice;
@@ -82,4 +82,6 @@ private static final long serialVersionUID=1L;
     private String receivingName;
     /** 收件人手机号码 */
     private String receivingTel;
+    /** 发票号码 */
+    private String invoiceNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderInvoiceVo.java

@@ -66,8 +66,8 @@ public class OrderInvoiceVo {
 	@ApiModelProperty("发票金额")
 	private BigDecimal amount;
 	/** 发票代码/发票号码 */
-	@Excel(name = "发票代码/发票号码")
-	@ApiModelProperty("发票代码/发票号码")
+	@Excel(name = "发票代码")
+	@ApiModelProperty("发票代码")
 	private String invoiceCode;
 	/** 是否上传发票 0否 1是 */
 	@Excel(name = "是否上传发票 0否 1是")
@@ -131,5 +131,9 @@ public class OrderInvoiceVo {
 	private String idCard;
 	@ApiModelProperty("学员姓名")
 	private String realname;
+	/** 发票号码 */
+	@Excel(name = "发票号码")
+	@ApiModelProperty("发票号码")
+	private String invoiceNum;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderInvoiceMapper.xml

@@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="receivingAddress" column="receiving_address"/>
         <result property="receivingName" column="receiving_name"/>
         <result property="receivingTel" column="receiving_tel"/>
+        <result property="invoiceNum" column="invoice_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderInvoiceVo" id="OrderInvoiceVoResult">
@@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="receivingTel" column="receiving_tel"/>
         <result property="idCard" column="id_card"/>
         <result property="realname" column="realname"/>
+        <result property="invoiceNum" column="invoice_num"/>
         <collection property="orderList" column="invoice_id" select="findOrderList"/>
     </resultMap>