修改订单字段备注
This commit is contained in:
parent
05d3c17acd
commit
c0484c2c71
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.wzj.soopin.order.domain.entity.Order;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.persistence.PrePersist;
|
||||
import lombok.Data;
|
||||
import org.dromara.common.excel.annotation.Excel;
|
||||
@ -19,103 +20,103 @@ import java.util.Random;
|
||||
@ApiModel(description="订单表 查询 对象")
|
||||
public class OrderBo {
|
||||
|
||||
@ApiModelProperty("MEMBER_ID 精确匹配")
|
||||
@Schema(description ="MEMBER_ID 精确匹配")
|
||||
private Long memberId;
|
||||
|
||||
@ApiModelProperty("订单编号")
|
||||
@Schema(description ="订单编号 精确匹配")
|
||||
private String orderSn;
|
||||
|
||||
@ApiModelProperty("租户id")
|
||||
@Schema(description ="租户id 精确匹配")
|
||||
private String tenantId;
|
||||
|
||||
@ApiModelProperty("用户帐号 精确匹配")
|
||||
@Schema(description ="用户帐号 精确匹配")
|
||||
private String memberUsernameLike;
|
||||
|
||||
@ApiModelProperty("订单总金额 精确匹配")
|
||||
@Schema(description ="订单总金额 精确匹配")
|
||||
private BigDecimal totalAmount;
|
||||
|
||||
@ApiModelProperty("采购价 精确匹配")
|
||||
@Schema(description ="采购价 精确匹配")
|
||||
private BigDecimal purchasePrice;
|
||||
|
||||
@ApiModelProperty("应付金额（实际支付金额） 精确匹配")
|
||||
@Schema(description ="应付金额（实际支付金额） 精确匹配")
|
||||
private BigDecimal payAmount;
|
||||
|
||||
@ApiModelProperty("运费金额 精确匹配")
|
||||
@Schema(description ="运费金额 精确匹配")
|
||||
private BigDecimal freightAmount;
|
||||
|
||||
@ApiModelProperty("支付方式：0->未支付；1->支付宝；2->微信 精确匹配")
|
||||
@Schema(description ="支付方式：0->未支付；1->支付宝；2->微信 精确匹配")
|
||||
private Integer payType;
|
||||
|
||||
@ApiModelProperty("订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配")
|
||||
@Schema(description ="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 精确匹配")
|
||||
private Integer status;
|
||||
|
||||
@ApiModelProperty("退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 精确匹配")
|
||||
@Schema(description ="退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 精确匹配")
|
||||
private Integer aftersaleStatus;
|
||||
|
||||
@ApiModelProperty("物流公司 精确匹配")
|
||||
@Schema(description ="物流公司 精确匹配")
|
||||
private String deliveryCompany;
|
||||
|
||||
@ApiModelProperty("物流单号 精确匹配")
|
||||
@Schema(description ="物流单号 精确匹配")
|
||||
private String deliverySn;
|
||||
|
||||
@ApiModelProperty("自动确认时间（天） 精确匹配")
|
||||
@Schema(description ="自动确认时间（天） 精确匹配")
|
||||
private Integer autoConfirmDay;
|
||||
|
||||
@ApiModelProperty("收货人姓名 精确匹配")
|
||||
@Schema(description ="收货人姓名 精确匹配")
|
||||
private String receiverNameLike;
|
||||
|
||||
@ApiModelProperty("收货人电话 精确匹配")
|
||||
@Schema(description ="收货人电话 精确匹配")
|
||||
private String receiverPhone;
|
||||
|
||||
@ApiModelProperty("收货人邮编 精确匹配")
|
||||
@Schema(description ="收货人邮编 精确匹配")
|
||||
private String receiverPostCode;
|
||||
|
||||
@ApiModelProperty("省份/直辖市 精确匹配")
|
||||
@Schema(description ="省份/直辖市 精确匹配")
|
||||
private String receiverProvince;
|
||||
|
||||
@ApiModelProperty("城市 精确匹配")
|
||||
@Schema(description ="城市 精确匹配")
|
||||
private String receiverCity;
|
||||
|
||||
@ApiModelProperty("区 精确匹配")
|
||||
@Schema(description ="区 精确匹配")
|
||||
private String receiverDistrict;
|
||||
|
||||
@ApiModelProperty("省份/直辖市id 精确匹配")
|
||||
@Schema(description ="省份/直辖市id 精确匹配")
|
||||
private Long receiverProvinceId;
|
||||
|
||||
@ApiModelProperty("城市id 精确匹配")
|
||||
@Schema(description ="城市id 精确匹配")
|
||||
private Long receiverCityId;
|
||||
|
||||
@ApiModelProperty("区id 精确匹配")
|
||||
@Schema(description ="区id 精确匹配")
|
||||
private Long receiverDistrictId;
|
||||
|
||||
@ApiModelProperty("详细地址 精确匹配")
|
||||
@Schema(description ="详细地址 精确匹配")
|
||||
private String receiverDetailAddress;
|
||||
|
||||
@ApiModelProperty("订单备注 精确匹配")
|
||||
@Schema(description ="订单备注 精确匹配")
|
||||
private String note;
|
||||
|
||||
@ApiModelProperty("商家备注")
|
||||
private String merchantNote;
|
||||
@Schema(description ="商家备注 精确匹配")
|
||||
private String MEMBER_ID;
|
||||
|
||||
@ApiModelProperty("确认收货状态：0->未确认；1->已确认 精确匹配")
|
||||
@Schema(description ="确认收货状态：0->未确认；1->已确认 精确匹配")
|
||||
private Integer confirmStatus;
|
||||
|
||||
@ApiModelProperty("删除状态：0->未删除；1->已删除 精确匹配")
|
||||
@Schema(description ="删除状态：0->未删除；1->已删除 精确匹配")
|
||||
private Integer deleteStatus;
|
||||
|
||||
@ApiModelProperty("支付时间 精确匹配")
|
||||
@Schema(description ="支付时间 精确匹配")
|
||||
private LocalDateTime paymentTime;
|
||||
|
||||
@ApiModelProperty("发货时间 精确匹配")
|
||||
@Schema(description ="发货时间 精确匹配")
|
||||
private LocalDateTime deliveryTime;
|
||||
|
||||
@ApiModelProperty("确认收货时间 精确匹配")
|
||||
@Schema(description ="确认收货时间 精确匹配")
|
||||
private LocalDateTime receiveTime;
|
||||
|
||||
@ApiModelProperty("创建订单开始时间")
|
||||
@Schema(description ="创建订单开始时间 精确匹配")
|
||||
private LocalDateTime startTime;
|
||||
|
||||
@ApiModelProperty("创建订单结束时间")
|
||||
@Schema(description ="创建订单结束时间 精确匹配")
|
||||
private LocalDateTime endTime;
|
||||
|
||||
public Wrapper<Order> toWrapper() {
|
||||
|
||||
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.wzj.soopin.order.domain.entity.OrderItem;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import org.dromara.common.core.domain.model.BaseAudit;
|
||||
import org.dromara.common.excel.annotation.Excel;
|
||||
@ -19,126 +20,171 @@ import java.util.List;
|
||||
*/
|
||||
@Data
|
||||
public class OrderVO extends BaseAudit {
|
||||
/** 订单id */
|
||||
|
||||
@Schema(description ="订单id")
|
||||
private Long id;
|
||||
/** 支付id */
|
||||
|
||||
@Schema(description ="支付id")
|
||||
private Long payId;
|
||||
/** 订单编号 */
|
||||
|
||||
@Schema(description ="订单编号")
|
||||
private String orderSn;
|
||||
/** MEMBER_ID */
|
||||
|
||||
@Schema(description ="MEMBER_ID 精确匹配")
|
||||
@Excel(name = "MEMBER_ID")
|
||||
private Long memberId;
|
||||
/** 租户id */
|
||||
|
||||
@Schema(description ="租户id")
|
||||
private String tenantId;
|
||||
/** 用户帐号 */
|
||||
|
||||
@Schema(description ="用户帐号")
|
||||
@Excel(name = "用户帐号")
|
||||
private String memberUsername;
|
||||
|
||||
/** 商家备注 */
|
||||
@Schema(description ="商家备注")
|
||||
@Excel(name = "商家备注")
|
||||
private String merchantNote;
|
||||
|
||||
/** 订单总金额 */
|
||||
@Schema(description ="订单总金额")
|
||||
@Excel(name = "订单总金额")
|
||||
private BigDecimal totalAmount;
|
||||
/** 采购价 */
|
||||
|
||||
@Schema(description ="采购价")
|
||||
@Excel(name = "采购价")
|
||||
private BigDecimal purchasePrice;
|
||||
/** 应付金额（实际支付金额） */
|
||||
|
||||
@Schema(description ="应付金额")
|
||||
@Excel(name = "应付金额", readConverterExp = "实=际支付金额")
|
||||
private BigDecimal payAmount;
|
||||
/** 运费金额 */
|
||||
|
||||
@Schema(description ="运费金额")
|
||||
@Excel(name = "运费金额")
|
||||
private BigDecimal freightAmount;
|
||||
/** 支付方式：0->未支付；1->支付宝；2->微信 */
|
||||
|
||||
@Schema(description ="支付方式：0->未支付；1->支付宝；2->微信")
|
||||
@Excel(name = "支付方式：0->未支付；1->支付宝；2->微信")
|
||||
private Integer payType;
|
||||
/** 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 */
|
||||
|
||||
@Schema(description ="订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
|
||||
@Excel(name = "订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单")
|
||||
private Integer status;
|
||||
/** 退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功 */
|
||||
|
||||
@Schema(description ="退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功")
|
||||
@Excel(name = "退款状态，枚举值：1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功")
|
||||
private Integer aftersaleStatus;
|
||||
/** 物流公司(配送方式) */
|
||||
@Excel(name = "物流公司(配送方式)")
|
||||
|
||||
@Schema(description ="物流公司(配送方式)")
|
||||
private String deliveryCompany;
|
||||
/** 物流单号 */
|
||||
|
||||
@Schema(description ="物流单号")
|
||||
@Excel(name = "物流单号")
|
||||
private String deliverySn;
|
||||
/** 自动确认时间（天） */
|
||||
|
||||
@Schema(description ="自动确认时间")
|
||||
@Excel(name = "自动确认时间", readConverterExp = "天=")
|
||||
private Integer autoConfirmDay;
|
||||
/** 收货人姓名 */
|
||||
|
||||
@Schema(description ="收货人姓名")
|
||||
@Excel(name = "收货人姓名")
|
||||
private String receiverName;
|
||||
/** 收货人电话 */
|
||||
|
||||
@Schema(description ="收货人电话")
|
||||
@Excel(name = "收货人电话")
|
||||
private String receiverPhone;
|
||||
/** 收货人邮编 */
|
||||
|
||||
@Schema(description ="收货人邮编")
|
||||
@Excel(name = "收货人邮编")
|
||||
private String receiverPostCode;
|
||||
/** 省份/直辖市 */
|
||||
|
||||
@Schema(description ="省份/直辖市")
|
||||
@Excel(name = "省份/直辖市")
|
||||
private String receiverProvince;
|
||||
/** 城市 */
|
||||
|
||||
@Schema(description ="城市")
|
||||
@Excel(name = "城市")
|
||||
private String receiverCity;
|
||||
/** 区 */
|
||||
|
||||
@Schema(description ="区")
|
||||
@Excel(name = "区")
|
||||
private String receiverDistrict;
|
||||
/** 省份/直辖市id */
|
||||
|
||||
@Schema(description ="省份/直辖市id")
|
||||
@Excel(name = "省份/直辖市id")
|
||||
private Long receiverProvinceId;
|
||||
/** 城市id */
|
||||
|
||||
@Schema(description ="城市id")
|
||||
@Excel(name = "城市id")
|
||||
private Long receiverCityId;
|
||||
/** 区id */
|
||||
|
||||
@Schema(description ="区idvv")
|
||||
@Excel(name = "区id")
|
||||
private Long receiverDistrictId;
|
||||
/** 详细地址 */
|
||||
|
||||
@Schema(description ="详细地址")
|
||||
@Excel(name = "详细地址")
|
||||
private String receiverDetailAddress;
|
||||
/** 订单备注 */
|
||||
|
||||
@Schema(description ="订单备注")
|
||||
@Excel(name = "订单备注")
|
||||
private String note;
|
||||
/** 确认收货状态：0->未确认；1->已确认 */
|
||||
|
||||
@Schema(description ="确认收货状态：0->未确认；1->已确认")
|
||||
@Excel(name = "确认收货状态：0->未确认；1->已确认")
|
||||
private Integer confirmStatus;
|
||||
/** 删除状态：0->未删除；1->已删除 */
|
||||
|
||||
@Schema(description ="发删除状态：0->未删除；1->已删除")
|
||||
@Excel(name = "删除状态：0->未删除；1->已删除")
|
||||
private Integer deleteStatus;
|
||||
/** 支付时间 */
|
||||
|
||||
@Schema(description ="支付时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime paymentTime;
|
||||
/** 发货时间 */
|
||||
|
||||
@Schema(description ="发货时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime deliveryTime;
|
||||
/** 确认收货时间 */
|
||||
|
||||
@Schema(description ="确认收货时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "确认收货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime receiveTime;
|
||||
|
||||
private List<OrderItem> items;
|
||||
|
||||
@Excel(name = "用户昵称")
|
||||
@Schema(description ="用户昵称")
|
||||
private String memberNickname;
|
||||
@Excel(name = "用户手机号")
|
||||
@Schema(description ="用户手机号")
|
||||
private String memberPhoneEncrypted;
|
||||
|
||||
@Excel(name = "卖家昵称")
|
||||
@Schema(description ="卖家昵称")
|
||||
private String tenantContactName;
|
||||
|
||||
@Excel(name = "卖家手机号")
|
||||
@Schema(description ="卖家手机号")
|
||||
private String tenantContactPhone;
|
||||
|
||||
@Excel(name = "item ID")
|
||||
@Excel(name = "itemID")
|
||||
@Schema(description ="itemID")
|
||||
private Long itemId;
|
||||
|
||||
@Excel(name = "商品id")
|
||||
@Schema(description ="商品id")
|
||||
private Long productId;
|
||||
|
||||
@Excel(name = "商品品牌")
|
||||
@Schema(description ="商品品牌id")
|
||||
private Long productBrandId;
|
||||
|
||||
@Schema(description ="商品名称")
|
||||
@Excel(name = "商品名称")
|
||||
private String productName;
|
||||
|
||||
@Schema(description ="商品价格")
|
||||
@Excel(name = "商品价格")
|
||||
private BigDecimal productPrice;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user