From 4b2f365605ced3a472b3b39baadb065dfb8722da Mon Sep 17 00:00:00 2001 From: Dftre <3066417822@qq.com> Date: Tue, 11 Jun 2024 03:03:11 +0800 Subject: [PATCH] update --- .../generator/controller/GenController.java | 9 +- .../src/main/resources/vm/java/domain.java.vm | 2 - .../pay/controller/PayInvoiceController.java | 4 +- .../pay/controller/PayOrderController.java | 2 +- .../java/com/ruoyi/pay/domain/PayInvoice.java | 91 ++++++++++++------ .../java/com/ruoyi/pay/domain/PayOrder.java | 49 +++------- .../ruoyi/pay/mapper/PayInvoiceMapper.java | 4 +- .../ruoyi/pay/service/IPayInvoiceService.java | 4 +- .../ruoyi/pay/service/IPayOrderService.java | 7 +- .../service/impl/PayInvoiceServiceImpl.java | 7 +- .../pay/service/impl/PayOrderServiceImpl.java | 6 +- .../resources/mapper/pay/PayInvoiceMapper.xml | 22 ++++- .../resources/mapper/pay/PayOrderMapper.xml | 96 ++++++++++--------- sql/pay.sql | 42 ++++---- 14 files changed, 197 insertions(+), 148 deletions(-) diff --git a/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java index a30b939..99e7de9 100644 --- a/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/ruoyi-models/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java @@ -1,10 +1,11 @@ package com.ruoyi.generator.controller; import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.ArrayList; + import org.apache.commons.io.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -18,23 +19,23 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; + import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; - import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.sql.SqlUtil; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; import com.ruoyi.generator.service.IGenTableColumnService; import com.ruoyi.generator.service.IGenTableService; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.sql.SqlUtil; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/domain.java.vm index 55a9912..d604be9 100644 --- a/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-models/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -13,8 +13,6 @@ import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.TreeEntity; #end -import io.swagger.v3.oas.annotations.media.Schema; - /** * ${functionName}对象 ${tableName} * diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayInvoiceController.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayInvoiceController.java index 5b29656..ba4cb42 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayInvoiceController.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayInvoiceController.java @@ -29,8 +29,8 @@ import jakarta.servlet.http.HttpServletResponse; /** * 发票Controller * - * @author Dftre - * @date 2024-02-15 + * @author ruoyi + * @date 2024-06-11 */ @RestController @RequestMapping("/pay/invoice") diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayOrderController.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayOrderController.java index 161ede3..ea3d33b 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayOrderController.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/controller/PayOrderController.java @@ -88,7 +88,7 @@ public class PayOrderController extends BaseController @PostMapping public AjaxResult add(@RequestBody PayOrder payOrder) { - payOrder.setUserId(getUserId()); + payOrder.setCreateBy(getUsername()); payOrder.setOrderNumber(Seq.getId().toString()); AjaxResult result = toAjax(payOrderService.insertPayOrder(payOrder)); result.put(AjaxResult.DATA_TAG, payOrder); diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayInvoice.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayInvoice.java index 7ed6f95..128acf2 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayInvoice.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayInvoice.java @@ -11,13 +11,15 @@ import io.swagger.v3.oas.annotations.media.Schema; /** * 发票对象 pay_invoice * - * @author Dftre - * @date 2024-02-15 + * @author ruoyi + * @date 2024-06-11 */ @Schema(description = "发票对象") -public class PayInvoice extends BaseEntity { +public class PayInvoice extends BaseEntity +{ private static final long serialVersionUID = 1L; + /** 发票id */ @Schema(title = "发票id") private Long invoiceId; @@ -56,82 +58,111 @@ public class PayInvoice extends BaseEntity { @Schema(title = "发票备注") @Excel(name = "发票备注") private String invoiceRemark; - - public void setInvoiceId(Long invoiceId) { + public void setInvoiceId(Long invoiceId) + { this.invoiceId = invoiceId; } - public Long getInvoiceId() { + public Long getInvoiceId() + { return invoiceId; } - public void setOrderNumber(String orderNumber) { + + public void setOrderNumber(String orderNumber) + { this.orderNumber = orderNumber; } - public String getOrderNumber() { + public String getOrderNumber() + { return orderNumber; } - public void setInvoiceType(String invoiceType) { + + public void setInvoiceType(String invoiceType) + { this.invoiceType = invoiceType; } - public String getInvoiceType() { + public String getInvoiceType() + { return invoiceType; } - public void setInvoiceHeader(String invoiceHeader) { + + public void setInvoiceHeader(String invoiceHeader) + { this.invoiceHeader = invoiceHeader; } - public String getInvoiceHeader() { + public String getInvoiceHeader() + { return invoiceHeader; } - public void setInvoiceNumber(String invoiceNumber) { + + public void setInvoiceNumber(String invoiceNumber) + { this.invoiceNumber = invoiceNumber; } - public String getInvoiceNumber() { + public String getInvoiceNumber() + { return invoiceNumber; } - public void setInvoicePhone(String invoicePhone) { + + public void setInvoicePhone(String invoicePhone) + { this.invoicePhone = invoicePhone; } - public String getInvoicePhone() { + public String getInvoicePhone() + { return invoicePhone; } - public void setInvoiceEmail(String invoiceEmail) { + + public void setInvoiceEmail(String invoiceEmail) + { this.invoiceEmail = invoiceEmail; } - public String getInvoiceEmail() { + public String getInvoiceEmail() + { return invoiceEmail; } - public void setInvoiceRemark(String invoiceRemark) { + + public void setInvoiceRemark(String invoiceRemark) + { this.invoiceRemark = invoiceRemark; } - public String getInvoiceRemark() { + public String getInvoiceRemark() + { return invoiceRemark; } + + @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("invoiceId", getInvoiceId()) - .append("orderNumber", getOrderNumber()) - .append("invoiceType", getInvoiceType()) - .append("invoiceHeader", getInvoiceHeader()) - .append("invoiceNumber", getInvoiceNumber()) - .append("invoicePhone", getInvoicePhone()) - .append("invoiceEmail", getInvoiceEmail()) - .append("invoiceRemark", getInvoiceRemark()) - .toString(); + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("invoiceId", getInvoiceId()) + .append("orderNumber", getOrderNumber()) + .append("invoiceType", getInvoiceType()) + .append("invoiceHeader", getInvoiceHeader()) + .append("invoiceNumber", getInvoiceNumber()) + .append("invoicePhone", getInvoicePhone()) + .append("invoiceEmail", getInvoiceEmail()) + .append("invoiceRemark", getInvoiceRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayOrder.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayOrder.java index 585d876..24f80bb 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayOrder.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayOrder.java @@ -11,10 +11,10 @@ import io.swagger.v3.oas.annotations.media.Schema; /** * 订单对象 pay_order * - * @author Dftre - * @date 2024-02-15 + * @author ruoyi + * @date 2024-06-11 */ -@Schema(title = "订单对象") +@Schema(description = "订单对象") public class PayOrder extends BaseEntity { private static final long serialVersionUID = 1L; @@ -22,11 +22,6 @@ public class PayOrder extends BaseEntity { @Schema(title = "订单ID") private Long orderId; - /** 用户id */ - @Schema(title = "用户id") - @Excel(name = "用户id") - private Long userId; - /** 订单号 */ @Schema(title = "订单号") @Excel(name = "订单号") @@ -42,7 +37,7 @@ public class PayOrder extends BaseEntity { @Excel(name = "订单总金额") private String totalAmount; - /** 订单总金额 */ + /** 实际支付金额 */ @Schema(title = "实际支付金额") @Excel(name = "实际支付金额") private String actualAmount; @@ -52,11 +47,6 @@ public class PayOrder extends BaseEntity { @Excel(name = "订单内容") private String orderContent; - /** 订单备注 */ - @Schema(title = "订单备注") - @Excel(name = "订单备注") - private String orderRemark; - /** 负载信息 */ @Schema(title = "负载信息") @Excel(name = "负载信息") @@ -70,14 +60,6 @@ public class PayOrder extends BaseEntity { return orderId; } - public void setUserId(Long userId) { - this.userId = userId; - } - - public Long getUserId() { - return userId; - } - public void setOrderNumber(String orderNumber) { this.orderNumber = orderNumber; } @@ -102,14 +84,14 @@ public class PayOrder extends BaseEntity { return totalAmount; } - public String getActualAmount() { - return actualAmount; - } - public void setActualAmount(String actualAmount) { this.actualAmount = actualAmount; } + public String getActualAmount() { + return actualAmount; + } + public void setOrderContent(String orderContent) { this.orderContent = orderContent; } @@ -118,14 +100,6 @@ public class PayOrder extends BaseEntity { return orderContent; } - public void setOrderRemark(String orderRemark) { - this.orderRemark = orderRemark; - } - - public String getOrderRemark() { - return orderRemark; - } - public void setOrderMessage(String orderMessage) { this.orderMessage = orderMessage; } @@ -138,14 +112,17 @@ public class PayOrder extends BaseEntity { public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) .append("orderId", getOrderId()) - .append("userId", getUserId()) .append("orderNumber", getOrderNumber()) .append("orderStatus", getOrderStatus()) .append("totalAmount", getTotalAmount()) .append("actualAmount", getActualAmount()) .append("orderContent", getOrderContent()) - .append("orderRemark", getOrderRemark()) .append("orderMessage", getOrderMessage()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) .toString(); } } diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/mapper/PayInvoiceMapper.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/mapper/PayInvoiceMapper.java index 1c690d8..8d47aaf 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/mapper/PayInvoiceMapper.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/mapper/PayInvoiceMapper.java @@ -7,8 +7,8 @@ import com.ruoyi.pay.domain.PayInvoice; /** * 发票Mapper接口 * - * @author Dftre - * @date 2024-02-15 + * @author ruoyi + * @date 2024-06-11 */ public interface PayInvoiceMapper { diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayInvoiceService.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayInvoiceService.java index 294eeef..24d42a0 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayInvoiceService.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayInvoiceService.java @@ -7,8 +7,8 @@ import com.ruoyi.pay.domain.PayInvoice; /** * 发票Service接口 * - * @author Dftre - * @date 2024-02-15 + * @author ruoyi + * @date 2024-06-11 */ public interface IPayInvoiceService { diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayOrderService.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayOrderService.java index 96ee3ef..d5d2d52 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayOrderService.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/IPayOrderService.java @@ -7,10 +7,11 @@ import com.ruoyi.pay.domain.PayOrder; /** * 订单Service接口 * - * @author Dftre - * @date 2024-02-15 + * @author ruoyi + * @date 2024-06-11 */ -public interface IPayOrderService { +public interface IPayOrderService +{ /** * 查询订单 * diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayInvoiceServiceImpl.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayInvoiceServiceImpl.java index d5b1885..7d3465a 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayInvoiceServiceImpl.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayInvoiceServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.pay.domain.PayInvoice; import com.ruoyi.pay.mapper.PayInvoiceMapper; import com.ruoyi.pay.service.IPayInvoiceService; @@ -12,8 +13,8 @@ import com.ruoyi.pay.service.IPayInvoiceService; /** * 发票Service业务层处理 * - * @author Dftre - * @date 2024-02-15 + * @author ruoyi + * @date 2024-06-11 */ @Service public class PayInvoiceServiceImpl implements IPayInvoiceService @@ -54,6 +55,7 @@ public class PayInvoiceServiceImpl implements IPayInvoiceService @Override public int insertPayInvoice(PayInvoice payInvoice) { + payInvoice.setCreateTime(DateUtils.getNowDate()); return payInvoiceMapper.insertPayInvoice(payInvoice); } @@ -66,6 +68,7 @@ public class PayInvoiceServiceImpl implements IPayInvoiceService @Override public int updatePayInvoice(PayInvoice payInvoice) { + payInvoice.setUpdateTime(DateUtils.getNowDate()); return payInvoiceMapper.updatePayInvoice(payInvoice); } diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayOrderServiceImpl.java b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayOrderServiceImpl.java index 7fb88ab..ca11fb3 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayOrderServiceImpl.java +++ b/ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/service/impl/PayOrderServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.pay.domain.PayOrder; import com.ruoyi.pay.mapper.PayOrderMapper; import com.ruoyi.pay.service.IPayOrderService; @@ -12,8 +13,8 @@ import com.ruoyi.pay.service.IPayOrderService; /** * 订单Service业务层处理 * - * @author Dftre - * @date 2024-02-15 + * @author ruoyi + * @date 2024-06-11 */ @Service public class PayOrderServiceImpl implements IPayOrderService { @@ -72,6 +73,7 @@ public class PayOrderServiceImpl implements IPayOrderService { */ @Override public int updatePayOrder(PayOrder payOrder) { + payOrder.setUpdateTime(DateUtils.getNowDate()); return payOrderMapper.updatePayOrder(payOrder); } diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayInvoiceMapper.xml b/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayInvoiceMapper.xml index c9325bf..e661abd 100644 --- a/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayInvoiceMapper.xml +++ b/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayInvoiceMapper.xml @@ -13,10 +13,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + - select invoice_id, order_number, invoice_type, invoice_header, invoice_number, invoice_phone, invoice_email, invoice_remark from pay_invoice + select invoice_id, order_number, invoice_type, invoice_header, invoice_number, invoice_phone, invoice_email, invoice_remark, create_by, create_time, update_by, update_time, remark from pay_invoice - - - and user_id = #{userId} + + and order_number = #{orderNumber} and order_status = #{orderStatus} and total_amount = #{totalAmount} and actual_amount = #{actualAmount} and order_content = #{orderContent} - and order_remark = #{orderRemark} and order_message = #{orderMessage} - + - - - - insert into pay_order + + + insert into pay_order - order_id, - user_id, order_number, order_status, total_amount, actual_amount, order_content, - - order_remark, order_message, - + create_by, + create_time, + update_by, + update_time, + remark, + - #{orderId}, - #{userId}, #{orderNumber}, #{orderStatus}, #{totalAmount}, #{actualAmount}, #{orderContent}, - #{orderRemark}, #{orderMessage}, - + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + - update pay_order + + update pay_order - user_id = #{userId}, order_number = #{orderNumber}, order_status = #{orderStatus}, total_amount = #{totalAmount}, actual_amount = #{actualAmount}, order_content = #{orderContent}, - order_remark = #{orderRemark}, order_message = #{orderMessage}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, - where pay_order.order_id = #{orderId} + where pay_order.order_id = #{orderId} + - - delete from pay_order where order_id = #{orderId} + + delete from pay_order where order_id = #{orderId} delete from pay_order where order_number= #{orderNumber} - + delete from pay_order where order_id in #{orderId} diff --git a/sql/pay.sql b/sql/pay.sql index 62aab66..146ab7c 100644 --- a/sql/pay.sql +++ b/sql/pay.sql @@ -3,15 +3,18 @@ -- ---------------------------- DROP TABLE IF EXISTS `pay_order`; CREATE TABLE `pay_order` ( - `order_id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单ID', - `user_id` bigint NULL DEFAULT NULL COMMENT '用户id', - `order_number` varchar(255) NULL DEFAULT NULL COMMENT '订单号', - `order_status` varchar(255) NULL DEFAULT NULL COMMENT '订单状态', - `total_amount` varchar(255) NULL DEFAULT NULL COMMENT '订单总金额', - `actual_amount` varchar(255) NULL DEFAULT NULL COMMENT '实际支付金额', - `order_content` varchar(255) NULL DEFAULT NULL COMMENT '订单内容', - `order_remark` varchar(255) NULL DEFAULT NULL COMMENT '订单备注', - `order_message` varchar(255) NULL DEFAULT NULL COMMENT '负载信息', + order_id bigint NOT NULL AUTO_INCREMENT COMMENT '订单id', + order_number varchar(255) NULL DEFAULT NULL COMMENT '订单号', + order_status varchar(255) NULL DEFAULT NULL COMMENT '订单状态', + total_amount varchar(255) NULL DEFAULT NULL COMMENT '订单总金额', + actual_amount varchar(255) NULL DEFAULT NULL COMMENT '实际支付金额', + order_content varchar(255) NULL DEFAULT NULL COMMENT '订单内容', + order_message varchar(255) NULL DEFAULT NULL COMMENT '负载信息', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', PRIMARY KEY (`order_id`) ) ENGINE = InnoDB COMMENT = '订单'; @@ -20,14 +23,19 @@ CREATE TABLE `pay_order` ( -- ---------------------------- DROP TABLE IF EXISTS `pay_invoice`; CREATE TABLE `pay_invoice` ( - `invoice_id` bigint NOT NULL COMMENT '发票id', - `order_number` varchar(255) NULL DEFAULT NULL COMMENT '订单号', - `invoice_type` varchar(255) NULL DEFAULT NULL COMMENT '发票类型', - `invoice_header` varchar(255) NULL DEFAULT NULL COMMENT '发票抬头', - `invoice_number` varchar(255) NULL DEFAULT NULL COMMENT '纳税人识别号', - `invoice_phone` varchar(255) NULL DEFAULT NULL COMMENT '收票人手机号', - `invoice_email` varchar(255) NULL DEFAULT NULL COMMENT '收票人邮箱', - `invoice_remark` varchar(255) NULL DEFAULT NULL COMMENT '发票备注', + invoice_id bigint NOT NULL AUTO_INCREMENT COMMENT '发票id', + order_number varchar(255) NULL DEFAULT NULL COMMENT '订单号', + invoice_type varchar(255) NULL DEFAULT NULL COMMENT '发票类型', + invoice_header varchar(255) NULL DEFAULT NULL COMMENT '发票抬头', + invoice_number varchar(255) NULL DEFAULT NULL COMMENT '纳税人识别号', + invoice_phone varchar(255) NULL DEFAULT NULL COMMENT '收票人手机号', + invoice_email varchar(255) NULL DEFAULT NULL COMMENT '收票人邮箱', + invoice_remark varchar(255) NULL DEFAULT NULL COMMENT '发票备注', + create_by varchar(64) default '' comment '创建者', + create_time datetime comment '创建时间', + update_by varchar(64) default '' comment '更新者', + update_time datetime comment '更新时间', + remark varchar(500) default null comment '备注', PRIMARY KEY (`invoice_id`) ) ENGINE = InnoDB COMMENT = '发票';