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

@@ -31,21 +31,26 @@
    private Integer orderFrom;

    @ApiModelProperty(value = "商品总价")
    
    private BigDecimal orderGoodsMoney;

    @ApiModelProperty(value = "优惠券抵扣")
    
    private BigDecimal couponDiscount;

    @ApiModelProperty(value="应收金额")
    
    private BigDecimal receivableMoney;

    @ApiModelProperty(value="应收订金")
    
    private BigDecimal receivableDeposit;

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

    @ApiModelProperty(value="订单支付金额")
    
    private BigDecimal payMoney;

    @ApiModelProperty(value="创建时间")
@@ -72,6 +77,21 @@
    @ApiModelProperty(value = "用户电话")
    private String userMobile;

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

    @ApiModelProperty(value="已收金额")
    
    private BigDecimal receiveMoney;

    @ApiModelProperty(value="未收金额")
    
    private BigDecimal unReceiveMoney;

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

    @ApiModelProperty(value="结清标记0否1是")
    private Integer closeFlag;
}