java/HongRuiTang.git

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

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -25,6 +24,9 @@
			@ApiModelProperty(value = "用户姓名")
			private String userName;

			@ApiModelProperty(value = "用户昵称")
			private String nickName;

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

			@@ -36,6 +38,9 @@

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

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

			@ApiModelProperty(value = "商品总价")
			private BigDecimal orderGoodsMoney;
			@@ -52,6 +57,9 @@
			@ApiModelProperty(value="订单实际支付金额")
			private BigDecimal payMoney;

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

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

			@@ -68,6 +76,9 @@
			@ApiModelProperty(value="订单来源")
			private String orderFromDesc;

			@ApiModelProperty(value="活动名字")
			private String activityName;

			@ApiModelProperty(value="订单商品列表")
			private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
			}