修改bug

Pu Zhibing

昨天 cead7b98d5cebc0825b919799e23732877361de0

 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;

@@ -29,30 +27,30 @@
    @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
    private Integer orderStatus;

    @ApiModelProperty(value="订单来源1.商城2.秒杀活动3.线下创建")
    @ApiModelProperty(value = "订单来源1.商城2.秒杀活动3.线下创建4.抽奖5.美团6.抖音7.快手")
    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="创建时间")
@@ -75,25 +73,28 @@

    @ApiModelProperty(value = "用户姓名")
    private String userName;

    
    @ApiModelProperty(value = "用户电话")
    private String userMobile;

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

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

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

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

    @ApiModelProperty(value="结清标记0否1是")
    
    @ApiModelProperty(value = "结清标记0否1是")
    private Integer closeFlag;
    
    @ApiModelProperty(value = "剩余可核销次数")
    private Integer laveTime;
}