bug修改

mitao

2025-03-14 392b42c4891cf2e6beda57ab32c51598f290f4b7

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/OrderVO.java

@@ -1,76 +1,93 @@
package com.ruoyi.system.api.domain.vo;

import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.core.annotation.Order;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import lombok.Data;
@Data
public class OrderVO {
    @ApiModelProperty(value = "订单id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long id;

    @ApiModelProperty(value = "商品id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long goodsSkuId;

    @ApiModelProperty(value = "订单编号")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String orderNo;

    @ApiModelProperty(value = "下单时间")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime orderTime;

    @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单")
    @ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=拍卖订单 5=心愿求购")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private OrderFromEnum orderFrom;

    @ApiModelProperty(value = "拍卖订单类型 1=普通拍品 2=拍卖会拍品")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private AuctionOrderTypeEnum auctionType;

    @ApiModelProperty(value = "会员id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long memberId;

    @ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private PaymentMethodEnum paymentMethod;

    @ApiModelProperty(value = "支付合计")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal totalAmount;

    @ApiModelProperty(value = "订单状态 1=待支付 2=待发货 3=待收货 4=已完成 5=已取消")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private OrderStatusEnum orderStatus;

    @ApiModelProperty(value = "支付时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime payTime;

    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime cancelTime;

    @ApiModelProperty(value = "订单备注")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String orderRemark;

    @ApiModelProperty(value = "发货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime deliveryTime;

    @ApiModelProperty(value = "确认收货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime receiveTime;

    @ApiModelProperty(value = "优惠金额")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal discountMoney;

    @ApiModelProperty(value = "商品数量")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer goodsQuantity;

    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime createTime;


@@ -80,26 +97,110 @@


    @ApiModelProperty(value = "快递单号")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String courierNumber;

    @ApiModelProperty(value = "收货人姓名")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String receiverName;

    @ApiModelProperty(value = "收货人电话")
    private String receiverphone;
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String receiverPhone;

    @ApiModelProperty(value = "城市")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String receiverCity;


    @ApiModelProperty(value = "详细地址")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String receiverDetailAddress;


    @ApiModelProperty(value = "保证金")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal bound;

    @ApiModelProperty(value = "开票状态 开票状态 1 待开票，2待审核，3 已开票，4 拒绝")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer invoiceStatus;

    @ApiModelProperty(value = "商品名称")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String skuName;

    @ApiModelProperty(value = "封面图")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String coverPic;

    @ApiModelProperty(value = "商品价格")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal price;


    @ApiModelProperty(value = "积分")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer points;

    @ApiModelProperty(value = "实际商品价格")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private BigDecimal sjPrice;

    @ApiModelProperty(value = "成团时间")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime purchase;

    @ApiModelProperty(value = "是否售后 1否，2 是")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isRequest;

    @ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private ReturnRequestStatusEnum status;

    @ApiModelProperty(value = "成团时间")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private LocalDateTime groupTime;

    @ApiModelProperty(value = "是否退保证金 1没有退，2 已退")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer isAuctionBond;

    @ApiModelProperty(value = "售后订单")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long requestId;

    @ApiModelProperty("发货快递")
    private String logisticsNum;


    @ApiModelProperty(value = "订单说明")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private String orderShuoMin;

    @ApiModelProperty(value = "订单退货周期")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Integer orderZq;


    @ApiModelProperty(value = "团购的普通商品id")
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long SkuId;

    @ApiModelProperty(value = "优惠券id")
    private Long couponId;

    @ApiModelProperty(value = "单位")
    private String unit;
    
    @ApiModelProperty(value = "规格")
    private String spec;

    @ApiModelProperty(value = "规格单位")
    private String specUnit;

    @ApiModelProperty("普通商品id")
    private Long goodsId;

}