java/HongRuiTang.git

			@@ -1,13 +1,12 @@
			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;

			import java.math.BigDecimal;
			import java.util.Date;
			import java.util.List;

			/**
			* @author jqs34
			@@ -29,31 +28,30 @@
			private Integer orderStatus;

			@ApiModelProperty(value = "商品总价")
			@JsonSerialize(using = ToStringSerializer.class)
			private BigDecimal orderGoodsMoney;

			@ApiModelProperty(value = "优惠券抵扣")
			@JsonSerialize(using = ToStringSerializer.class)
			private BigDecimal couponDiscount;

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

			@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="已收金额")
			@JsonSerialize(using = ToStringSerializer.class)
			@ApiModelProperty(value = "实收金额")
			private BigDecimal relReceiveMoney;

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

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

			@ApiModelProperty(value="创建时间")
			@@ -62,4 +60,10 @@

			@ApiModelProperty(value = "支付方式1微信2现金3支付宝")
			private String thisReceiveType;

			@ApiModelProperty(value = "结清标记0未结清1已结清")
			private Integer closeFlag;

			@ApiModelProperty("商品明细")
			private List<AppGoodsInfoVo> goodsList;
			}