Merge branch 'mfyx_2.0' of http://8.136.199.33:3000/cxzhang/hongze_mfyx into debug

controllers/order.go

@@ -279,7 +279,7 @@ func (this *OrderController) UserOrderList() {
 		br.ErrMsg = "获取失败, Err:" + err.Error()
 		return
 	}
-
+	condition += ` ORDER BY order_id  DESC `
 	list, err := order.GetCygxOrderList(condition, pars, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -366,6 +366,8 @@ func (this *OrderController) OrderDetail() {
 	resp.OrderCode = orderDetail.OrderCode
 	resp.OrderType = orderDetail.OrderType
 	resp.OrderStatus = orderDetail.OrderStatus
+	resp.Source = orderDetail.Source
+	resp.SourceId = orderDetail.SourceId
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

models/order/order.go

@@ -146,6 +146,8 @@ type PayEdOrderDetailResp struct {
 	OrderType   int    `comment:"订单类型，1:畅读卡订单，2：单场付费订单"`
 	EndDate     string `comment:"结束日期"`
 	OrderStatus int    `comment:"订单状态,0:已取消、1:待支付、2:已支付、3:已退款"`
+	SourceId    int    `comment:"来源ID"`
+	Source      string `comment:"来源\n报告 ：article\n活动 ：activity"`
 }
 
 // 添加