java/qijisheng.git

			@@ -72,6 +72,31 @@
			@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("activity_amount")
			private BigDecimal activityAmount;

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


			@ApiModelProperty(value = "实际支付价格")
			@TableField("payment_amount")
			private BigDecimal paymentAmount;
			@@ -88,6 +113,10 @@
			@TableField("coupon_json")
			private String couponJson;

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

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