Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.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;

@@ -33,26 +31,26 @@
    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="订单商品列表")
    private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;

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

    @ApiModelProperty(value="创建时间")
@@ -80,15 +78,15 @@
    private String userMobile;

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

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

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

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