bug修改

mitao

2025-01-17 afa0dbb4f54e7244835dd67ec33c3e545f122f71

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java

@@ -1,7 +1,8 @@
package com.ruoyi.order.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -32,21 +33,37 @@
    private Integer orderFrom;

    @ApiModelProperty(value = "商品总价")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value="应收金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="应收订金")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal receivableDeposit;


    @ApiModelProperty(value="待支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal unpaidMoney;



    @ApiModelProperty(value="订单商品列表")
    private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;

    @ApiModelProperty(value = "支付方式1.全款2.订金")
    private Integer payType;


    @ApiModelProperty(value="订单支付金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal payMoney;

    @ApiModelProperty(value="商户id")
@@ -79,4 +96,8 @@

    @ApiModelProperty(value = "核销码")
    private String verifyCode;

    @ApiModelProperty(value="结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date endTime;
}