no message

controllers/cygx/order.go

@@ -29,6 +29,7 @@ type OrderController struct {
 // @Param   OrderType   query   int  false       "订单类型 1：畅读卡订单，2：单场付费订单"
 // @Param   OrderStatus   query   int  false       "订单状态,0:已取消、1:待支付、2:已支付、3:退款成功、4：退款处理中、5：退款异常、6：退款关闭"
 // @Param   PaymentProject   query   string  false       "付款项目"
+// @Param   UserCardType   query   string  false       "会员卡类型 ，日卡、月卡"
 // @Param   OrderCode   query   string  false       "订单编号"
 // @Param   KeyWord   query   string  false       "搜索关键词"
 // @Success Ret=200 {object} cygx.GetCygxTacticsTimeLineResp
@@ -59,6 +60,7 @@ func (this *OrderController) OrderList() {
 	orderCode := this.GetString("OrderCode")
 	keyWord := this.GetString("KeyWord")
 	paymentProject := this.GetString("PaymentProject")
+	userCardType := this.GetString("UserCardType")
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -117,6 +119,11 @@ func (this *OrderController) OrderList() {
 		pars = append(pars, paymentProject)
 	}
 
+	if userCardType != "" { //日卡月卡， 前端不好区分这里用了两个字段
+		condition += ` 	AND goods_name =  ? `
+		pars = append(pars, userCardType)
+	}
+
 	if keyWord != "" { //用户姓名，手机号
 		keyWord = "%" + keyWord + "%"
 		condition += ` 	AND (mobile LIKE ?  OR  real_name LIKE ? ) `
@@ -199,7 +206,6 @@ func (this *OrderController) OrderList() {
 			item.InviteName = inviteNameMap[v.Mobile]
 		}
 		item.PaymentProject = v.GoodsName
-
 		if v.OrderStatus != 0 && v.OrderStatus != 1 {
 			item.PayTime = v.PayTime.Format(utils.FormatDateTime)
 		}
@@ -310,6 +316,7 @@ func (this *UserController) OrderRefund() {
 // @Param   OrderType   query   int  false       "订单类型 1：畅读卡订单，2：单场付费订单"
 // @Param   OrderStatus   query   int  false       "订单状态,0:已取消、1:待支付、2:已支付、3:退款成功、4：退款处理中、5：退款异常、6：退款关闭"
 // @Param   PaymentProject   query   string  false       "付款项目"
+// @Param   UserCardType   query   string  false       "会员卡类型 ，日卡、月卡"
 // @Param   OrderCode   query   string  false       "订单编号"
 // @Param   KeyWord   query   string  false       "搜索关键词"
 // @Success Ret=200 {object} cygx.GetCygxTacticsTimeLineResp
@@ -340,6 +347,7 @@ func (this *OrderController) OrderRefundList() {
 	orderCode := this.GetString("OrderCode")
 	keyWord := this.GetString("KeyWord")
 	paymentProject := this.GetString("PaymentProject")
+	userCardType := this.GetString("UserCardType")
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -399,6 +407,11 @@ func (this *OrderController) OrderRefundList() {
 		pars = append(pars, paymentProject)
 	}
 
+	if userCardType != "" { //日卡月卡， 前端不好区分这里用了两个字段
+		condition += ` 	AND goods_name =  ? `
+		pars = append(pars, userCardType)
+	}
+
 	if keyWord != "" { //用户姓名，手机号
 		keyWord = "%" + keyWord + "%"
 		condition += ` 	AND (mobile LIKE ?  OR  real_name LIKE ? ) `
@@ -473,7 +486,15 @@ func (this *OrderController) OrderRefundList() {
 		} else {
 			item.InviteName = inviteNameMap[v.Mobile]
 		}
+
 		item.PaymentProject = v.GoodsName
+		switch v.GoodsId {
+		case 1:
+			item.PaymentProject = "日卡"
+		case 2:
+			item.PaymentProject = "月卡"
+		}
+
 		item.RefundTime = v.RefundTime.Format(utils.FormatDateTime)
 		item.RefundRemark = v.RefundRemark