开票时间

admin-web/src/views/admin/invoice/index.vue

@@ -242,12 +242,13 @@ const state = reactive({
       {label: '总服务费', prop: 'serviceMoney', resizable: true, width: 90},
       {label: '总服务费', prop: 'elecMoney', resizable: true, width: 90},
       {label: '服务费优惠', prop: 'serviceMoneyDiscount', resizable: true, width: 105},
+      {label: '公司税号', prop: 'taxId', resizable: true, width: 115},
+      {label: '发票类型', prop: 'invoiceType', resizable: true, width: 90},
+      {label: '发票抬头', prop: 'invoiceTitle', resizable: true, width: 110},
       {label: '开票人', prop: 'biller', resizable: true, width: 80},
-      {label: '公司税号', prop: 'taxId', resizable: true, width: 110},
+      {label: '开票时间', prop: 'fapiaoTime', resizable: true, width: 170},
       {label: '接收发票邮箱', prop: 'email', resizable: true, width: 120},
       {label: '电话', prop: 'phone', resizable: true, width: 90},
-      {label: '发票类型', prop: 'invoiceType', resizable: true, width: 90},
-      {label: '发票抬头', prop: 'invoiceTitle', resizable: true, width: 110},
       /*
 
             {label: '公司地址', prop: 'address', resizable: true, width: 130},

entity/src/main/java/com/kym/entity/admin/InvoiceDetail.java

@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-@TableName(value = "t_invoice_detail",autoResultMap = true)
+@TableName(schema = "charge_admin",value = "t_invoice_detail",autoResultMap = true)
 @Accessors(chain = true)
 public class InvoiceDetail extends BaseEntity {
 

entity/src/main/java/com/kym/entity/miniapp/Invoice.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Setter
 @Getter
 @NoArgsConstructor
-@TableName(value = "t_invoice", autoResultMap = true)
+@TableName(schema = "charge_app", value = "t_invoice", autoResultMap = true)
 @Accessors(chain = true)
 public class Invoice extends BaseEntity {
     public static final String TYPE_个人 = "INDIVIDUAL";

entity/src/main/java/com/kym/entity/miniapp/User.java

@@ -20,7 +20,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("t_user")
+@TableName(schema = "charge_app",value = "t_user")
 public class User extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;

entity/src/main/java/com/kym/entity/miniapp/vo/InvoiceVo.java

@@ -2,6 +2,7 @@ package com.kym.entity.miniapp.vo;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.kym.entity.BaseEntity;
 import com.kym.entity.typehandle.InvoiceOrderDetailListTypeHandle;
 import com.kym.entity.wechat.InvoiceOrderDetail;
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -125,6 +127,12 @@ public class InvoiceVo extends BaseEntity {
      * 开票人
      */
     private String biller;
+
+    /**
+     * 开票时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime fapiaoTime;
     /**
      * 发票状态
      */

service/src/main/java/com/kym/service/miniapp/impl/InvoiceServiceImpl.java

@@ -14,6 +14,7 @@ import com.kym.common.IQuery;
 import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.CommUtil;
 import com.kym.common.utils.OrderUtils;
+import com.kym.entity.admin.InvoiceDetail;
 import com.kym.entity.admin.queryParams.InvoiceQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.ChargeOrder;
@@ -143,7 +144,9 @@ public class InvoiceServiceImpl extends MPJBaseServiceImpl<InvoiceMapper, Invoic
                 .selectAsClass(Invoice.class, InvoiceVo.class)
                 .selectAll(Invoice.class)
                 .select(User::getMobilePhone)
+                .select(InvoiceDetail::getFapiaoTime)
                 .leftJoin(User.class, User::getId, Invoice::getUserId)
+                .leftJoin(InvoiceDetail.class, InvoiceDetail::getApplyId,Invoice::getApplyId)
                 .like(CommUtil.isNotEmptyAndNull(params.getPhone()), User::getMobilePhone, params.getPhone())
                 .like(CommUtil.isNotEmptyAndNull(params.getInvoiceTitle()), Invoice::getInvoiceTitle, params.getInvoiceTitle())
                 .like(CommUtil.isNotEmptyAndNull(params.getBiller()), Invoice::getBiller, params.getBiller())