java/gy_jifenshangcheng.git

			@@ -35,21 +35,16 @@
			@TableField("app_user_id")
			private Long appUserId;

			@ApiModelProperty(value = "订单类型1服务单2商品")
			@TableField("order_type")
			private Integer orderType;

			@ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")

			@ApiModelProperty(value = "3待使用4已完成5已取消8已评价")
			@TableField("order_status")
			private Integer orderStatus;

			@ApiModelProperty(value = "1待发货2待收货3待使用4已完成5已取消6已退款7售后中8已评价")
			@ApiModelProperty(value = "3待使用4已完成5已取消8已评价")
			@TableField("old_order_status")
			private Integer oldOrderStatus;

			@ApiModelProperty(value = "是否已分佣: 0-否 1-普通已拥，2-门店已分佣")
			@TableField("is_commission")
			private Integer isCommission;

			@ApiModelProperty(value = "核销时间")
			@TableField("end_time")
			@@ -63,9 +58,6 @@
			@TableField("after_sale_time")
			private LocalDateTime afterSaleTime;

			@ApiModelProperty(value = "技师id")
			@TableField("technician_id")
			private Integer technicianId;

			@ApiModelProperty(value = "订单编号")
			@TableField("order_number")
			@@ -74,7 +66,7 @@
			@ApiModelProperty(value = "商品数量")
			@TableField("num")
			private Integer num;


			@ApiModelProperty(value = "商品封面（多张逗号隔开，最多三张））")
			@TableField("good_pics")
			private String goodPics;
			@@ -87,33 +79,13 @@
			@TableField("total_amount")
			private BigDecimal totalAmount;

			@ApiModelProperty(value = "满减金额")
			@TableField("full_reduction_amount")
			private BigDecimal fullReductionAmount;

			@ApiModelProperty(value = "代金券抵扣金额")
			@TableField("money_amount")
			private BigDecimal moneyAmount;

			@ApiModelProperty(value = "折扣券抵扣金额")
			@TableField("discount_amount")
			private BigDecimal discountAmount;

			@ApiModelProperty(value = "商品券抵扣总金额")
			@TableField("good_amount")
			private BigDecimal goodAmount;
			@ApiModelProperty(value = "积分抵扣金额")
			@TableField("point_deduction_amount")
			private BigDecimal pointDeductionAmount;

			@ApiModelProperty(value = "用户优惠券id")
			@TableField("user_coupon_id")
			private Long userCouponId;

			@ApiModelProperty(value = "活动优惠金额")
			@TableField("activity_amount")
			private BigDecimal activityAmount;

			@ApiModelProperty(value = "优惠总金额")
			@TableField("discount_total_amount")
			private BigDecimal discountTotalAmount;

			@ApiModelProperty(value = "实际支付价格")
			@TableField("payment_amount")
			@@ -123,73 +95,21 @@
			@TableField("point")
			private Integer point;

			@ApiModelProperty(value = "1微信，2账户余额，3积分")
			@ApiModelProperty(value = "1微信，3积分")
			@TableField("pay_method")
			private Integer payMethod;

			@ApiModelProperty(value = "使用的优惠劵json")
			@TableField("coupon_json")
			private String couponJson;

			@ApiModelProperty(value = "订单优惠活动的json快照")
			@TableField("activity_json")
			private String activityJson;

			@ApiModelProperty(value = "运费")
			@TableField("express_amount")
			private BigDecimal expressAmount;



			@ApiModelProperty(value = "1微信，2账户余额")
			@TableField("express_pay_method")
			private Integer expressPayMethod;

			@ApiModelProperty(value = "配送方式（1=自提，2=快递）")
			@TableField("distribution_mode")
			private Integer distributionMode;

			@ApiModelProperty(value = "第三方快递信息")
			@TableField("express_json")
			private String expressJson;

			@ApiModelProperty(value = "第三方快递结果")
			@TableField("express_result")
			private String expressResult;

			@ApiModelProperty(value = "发货省")
			@TableField("deliver_province")
			private String deliverProvince;

			@ApiModelProperty(value = "发货省编号")
			@TableField("deliver_province_code")
			private String deliverProvinceCode;

			@ApiModelProperty(value = "发货市")
			@TableField("deliver_city")
			private String deliverCity;

			@ApiModelProperty(value = "发货市编号")
			@TableField("deliver_city_code")
			private String deliverCityCode;

			@ApiModelProperty(value = "发货区")
			@TableField("deliver_district")
			private String deliverDistrict;

			@ApiModelProperty(value = "发货区编号")
			@TableField("deliver_district_code")
			private String deliverDistrictCode;

			@ApiModelProperty(value = "收货地址信息")
			@TableField("address_json")
			private String addressJson;

			@ApiModelProperty(value = "平台分佣")
			@TableField("share_amount")
			private BigDecimal shareAmount;

			@ApiModelProperty(value = "本单获取的积分")
			@TableField("get_point")
			private Integer getPoint;

			@ApiModelProperty(value = "微信支付号")
			@TableField("serial_number")
			@@ -210,7 +130,7 @@
			@ApiModelProperty(value = "添加时间")
			@TableField("create_time")
			private LocalDateTime createTime;


			@ApiModelProperty(value = "预计提货时间")
			@TableField("expected_delivery_time")
			private String expectedDeliveryTime;
			@@ -226,6 +146,6 @@
			@ApiModelProperty("退款时间")
			@TableField("refund_time")
			private LocalDateTime refundTime;



			}