he2802 3 سال پیش
والد
کامیت
aa3c563ab3

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

@@ -103,4 +103,7 @@ public class OrderInvoiceAddBo {
     /** 发票号码 */
     @ApiModelProperty("发票号码")
     private String invoiceNum;
+    /** 审核时间 */
+    @ApiModelProperty("审核时间")
+    private Long periodTime;
 }

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

@@ -131,4 +131,8 @@ public class OrderInvoiceEditBo {
     @ApiModelProperty("发票号码")
     private String invoiceNum;
 
+    /** 审核时间 */
+    @ApiModelProperty("审核时间")
+    private Long periodTime;
+
 }

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

@@ -84,4 +84,6 @@ private static final long serialVersionUID=1L;
     private String receivingTel;
     /** 发票号码 */
     private String invoiceNum;
+    /** 审核时间 */
+    private Long periodTime;
 }

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -119,9 +119,12 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         if(bo.getPeriodStatus()==3){
             //已上传发票或有快递单号则为已开票
             if(Validator.isNotEmpty(bo.getInvoiceImg())||Validator.isNotEmpty(bo.getTrackingNum())){
-                bo.setInvoiceStatus(2);
+                update.setInvoiceStatus(2);
             }
         }
+        if(old.getPeriodStatus()==1&&old.getPeriodStatus()!=bo.getPeriodStatus()){
+            update.setPeriodTime(DateUtils.getNowTime());
+        }
         update.setUpdateTime(DateUtils.getNowTime());
         return this.updateById(update);
     }

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

@@ -135,5 +135,8 @@ public class OrderInvoiceVo {
 	@Excel(name = "发票号码")
 	@ApiModelProperty("发票号码")
 	private String invoiceNum;
-
+	/** 审核时间 */
+	@Excel(name = "审核时间")
+	@ApiModelProperty("审核时间")
+	private Long periodTime;
 }

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

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