java/qijisheng.git

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

			import com.ruoyi.common.core.annotation.Excel;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -16,20 +17,26 @@
			@ApiModelProperty("订单id")
			private String id;
			@ApiModelProperty("订单编号")
			@Excel(name = "订单编号")
			private String code;
			@ApiModelProperty("下单时间")
			@Excel(name = "下单时间")
			private String createTime;
			@ApiModelProperty("售后截止时间")
			private String afterSaleTime;
			@ApiModelProperty("下单用户")
			@Excel(name = "下单用户")
			private String userName;
			@ApiModelProperty("联系电话")
			@Excel(name = "联系方式")
			private String phone;
			@ApiModelProperty("商品类型（1=服务，2=单品）")
			@Excel(name = "订单类型", readConverterExp = "1=服务,2=单品")
			private Integer goodsType;
			@ApiModelProperty("支付方式（1=微信，2=余额，3=积分）")
			private Integer paymentType;
			@ApiModelProperty("订单金额")
			@Excel(name = "支付金额")
			private BigDecimal orderMoney;
			@ApiModelProperty("订单积分")
			private BigDecimal point;
			@@ -39,6 +46,25 @@
			private Integer distributionMode;
			@ApiModelProperty("获得分佣")
			private BigDecimal getCommission;

			// 快递单号
			@Excel(name = "快递单号")
			private String expressNum;
			// 快递公司
			@Excel(name = "快递公司")
			private String expressCompany;
			// 省
			@Excel(name = "省")
			private String deliverProvince;
			// 市
			@Excel(name = "市")
			private String deliverProvinceCode;
			// 省区划代码
			@Excel(name = "省区划代码")
			private String deliverCity;
			// 市区划代码
			@Excel(name = "市区划代码")
			private String deliverCityCode;
			/**
			* 用户id
			*/
			@@ -48,6 +74,8 @@

			private Integer shopId;

			private String expressJson;

			public BigDecimal getGetPoint(){
			return point;
			}