bug修改

mitao

2025-03-14 392b42c4891cf2e6beda57ab32c51598f290f4b7

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

@@ -1,15 +1,17 @@
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.*;
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")
@@ -28,7 +30,7 @@
    @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;

@@ -173,5 +175,32 @@
    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;

}