bug修改

mitao

2025-01-17 afa0dbb4f54e7244835dd67ec33c3e545f122f71

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

@@ -1,8 +1,6 @@
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;

@@ -25,35 +23,37 @@
    @ApiModelProperty(value="订单编号")
    private String orderNo;

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


    @ApiModelProperty(value="订单状态")
    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)
    @ApiModelProperty(value="应收金额")
    private BigDecimal receiveMoney;

    @ApiModelProperty(value="实收金额")
    private BigDecimal relReceiveMoney;

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

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

    @ApiModelProperty(value="收款时间")
@@ -61,7 +61,6 @@
    private Date receiveMoneyTime;

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

    @ApiModelProperty(value="收款方式")