ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码整理

Browse Source
This commit is contained in:
D 2024-03-04 21:10:15 +08:00
parent 794ebf59ce
commit ea65f19b60
3 changed files with 56 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View File

@ -32,7 +32,6 @@ public class ${ClassName} extends ${Entity}
private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField))
/** $column.columnComment */
@Schema(defaultValue = "$column.columnComment")
@ -59,13 +58,10 @@ public class ${ClassName} extends ${Entity}
#end
#end
private $column.javaType $column.javaField;
#if($column.subColumnTableName && $table.haveSubColumn == '1')
/** $column.javaField 到 $column.subColumnTableName 映射 */
private $column.subColumnJavaType $column.subColumnJavaField;
#end
#end
#end
#if($table.sub)

106
ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayInvoice.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.pay.domain;
import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@ -15,173 +15,123 @@ import io.swagger.v3.oas.annotations.media.Schema;
* @date 2024-02-15
*/
@Schema(description = "发票对象")
public class PayInvoice extends BaseEntity
{
public class PayInvoice extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 发票id */
@Schema(defaultValue = "发票id")
private Long invoiceId;
/** 订单号 */
@Schema(defaultValue = "订单号")
@Excel(name = "订单号")
private String orderNumber;
/** 发票类型 */
@Schema(defaultValue = "发票类型")
@Excel(name = "发票类型")
private String invoiceType;
/** 发票抬头 */
@Schema(defaultValue = "发票抬头")
@Excel(name = "发票抬头")
private String invoiceHeader;
/** 纳税人识别号 */
@Schema(defaultValue = "纳税人识别号")
@Excel(name = "纳税人识别号")
private String invoiceNumber;
/** 收票人手机号 */
@Schema(defaultValue = "收票人手机号")
@Excel(name = "收票人手机号")
private String invoicePhone;
/** 收票人邮箱 */
@Schema(defaultValue = "收票人邮箱")
@Excel(name = "收票人邮箱")
private String invoiceEmail;
/** 发票备注 */
@Schema(defaultValue = "发票备注")
@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())
.toString();
}
}

106
ruoyi-pay/ruoyi-pay-common/src/main/java/com/ruoyi/pay/domain/PayOrder.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.pay.domain;
import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@ -15,173 +15,123 @@ import io.swagger.v3.oas.annotations.media.Schema;
* @date 2024-02-15
*/
@Schema(description = "订单对象")
public class PayOrder extends BaseEntity
{
public class PayOrder extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 订单ID */
@Schema(defaultValue = "订单ID")
private Long orderId;
/** 用户id */
@Schema(defaultValue = "用户id")
@Excel(name = "用户id")
private Long userId;
/** 订单号 */
@Schema(defaultValue = "订单号")
@Excel(name = "订单号")
private String orderNumber;
/** 订单状态 */
@Schema(defaultValue = "订单状态")
@Excel(name = "订单状态")
private String orderStatus;
/** 订单总金额 */
@Schema(defaultValue = "订单总金额")
@Excel(name = "订单总金额")
private String totalAmount;
/** 订单内容 */
@Schema(defaultValue = "订单内容")
@Excel(name = "订单内容")
private String orderContent;
/** 订单备注 */
@Schema(defaultValue = "订单备注")
@Excel(name = "订单备注")
private String orderRemark;
/** 负载信息 */
@Schema(defaultValue = "负载信息")
@Excel(name = "负载信息")
private String orderMessage;
public void setOrderId(Long orderId)
{
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public Long getOrderId()
{
public Long getOrderId() {
return orderId;
}
public void setUserId(Long userId)
{
public void setUserId(Long userId) {
this.userId = userId;
}
public Long getUserId()
{
public Long getUserId() {
return userId;
}
public void setOrderNumber(String orderNumber)
{
public void setOrderNumber(String orderNumber) {
this.orderNumber = orderNumber;
}
public String getOrderNumber()
{
public String getOrderNumber() {
return orderNumber;
}
public void setOrderStatus(String orderStatus)
{
public void setOrderStatus(String orderStatus) {
this.orderStatus = orderStatus;
}
public String getOrderStatus()
{
public String getOrderStatus() {
return orderStatus;
}
public void setTotalAmount(String totalAmount)
{
public void setTotalAmount(String totalAmount) {
this.totalAmount = totalAmount;
}
public String getTotalAmount()
{
public String getTotalAmount() {
return totalAmount;
}
public void setOrderContent(String orderContent)
{
public void setOrderContent(String orderContent) {
this.orderContent = orderContent;
}
public String getOrderContent()
{
public String getOrderContent() {
return orderContent;
}
public void setOrderRemark(String orderRemark)
{
public void setOrderRemark(String orderRemark) {
this.orderRemark = orderRemark;
}
public String getOrderRemark()
{
public String getOrderRemark() {
return orderRemark;
}
public void setOrderMessage(String orderMessage)
{
public void setOrderMessage(String orderMessage) {
this.orderMessage = orderMessage;
}
public String getOrderMessage()
{
public String getOrderMessage() {
return orderMessage;
}
@Override
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("orderContent", getOrderContent())
.append("orderRemark", getOrderRemark())
.append("orderMessage", getOrderMessage())
.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("orderContent", getOrderContent())
.append("orderRemark", getOrderRemark())
.append("orderMessage", getOrderMessage())
.toString();
}
}