java/qijisheng.git

			@@ -56,9 +56,46 @@
			@TableField("order_number")
			private String orderNumber;

			@ApiModelProperty(value = "商品数量")
			@TableField("num")
			private Integer num;

			@ApiModelProperty(value = "商品封面（多张逗号隔开，最多三张））")
			@TableField("good_pics")
			private String goodPics;

			@ApiModelProperty(value = "商品名称（多个名称逗号隔开））")
			@TableField("good_name")
			private String goodName;

			@ApiModelProperty(value = "订单总金额")
			@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")
			@@ -66,7 +103,7 @@

			@ApiModelProperty(value = "使用积分")
			@TableField("point")
			private BigDecimal point;
			private Integer point;

			@ApiModelProperty(value = "1wx2积分")
			@TableField("pay_method")
			@@ -75,6 +112,10 @@
			@ApiModelProperty(value = "使用的优惠劵json")
			@TableField("coupon_json")
			private String couponJson;

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

			@ApiModelProperty(value = "运费")
			@TableField("express_amount")
			@@ -94,7 +135,7 @@

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

			@ApiModelProperty(value = "微信支付号")
			@TableField("serial_number")