bug

jiangqs

2023-08-10 a8e56f03a22c722ccf3f67a408919e6c8f256de3

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

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

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;

@@ -27,27 +29,37 @@
    private Integer orderStatus;

    @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 receiveMoney;

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

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

    @ApiModelProperty(value="创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    @ApiModelProperty(value = "支付方式1微信2现金3支付宝")
    private String thisReceiveType;
}