Merge branch 'develop' of k.zhang/duoduo into master

apis/shanghu/base.go

@@ -26,5 +26,6 @@ func InitShangHuRouter(engine *gin.RouterGroup) {
 		v1.POST("/client/qr/get", GetClientCardQR)                          //获取二维码
 		v1.POST("/client/unified/order", UnifiedOrder)                      //生成订单
 		v1.POST("/client/pay/callback", PayCallBack)                        //支付回调
+		v1.POST("/client/merchant/card/list", MerchantClientCardList)       //c端商户卡列表
 	}
 }

apis/shanghu/merchant.card.go

@@ -161,6 +161,36 @@ func MerchantCardList(c *gin.Context) {
 
 }
 
+// c端获取卡信息
+func MerchantClientCardList(c *gin.Context) {
+	var inData models.MerchantCardListRequest
+	var sqlData shanghu.MerchantCard
+
+	err := c.ShouldBindJSON(&inData)
+	if err != nil {
+		app.Error(c, 400, err, err.Error())
+		return
+	}
+
+	var pageSize = 10
+	var pageIndex = 1
+
+	if inData.PageSize != 0 {
+		pageSize = inData.PageSize
+	}
+	if inData.PageIndex != 0 {
+		pageIndex = inData.PageIndex
+	}
+
+	merchantCard, count, err := sqlData.ClientGetOpenIdList(pageSize, pageIndex, inData.TypeList)
+	if err != nil {
+		app.Error(c, 500, err, err.Error())
+		return
+	}
+	app.PageOK(c, merchantCard, count, pageIndex, pageSize, app.Success)
+
+}
+
 func UpdateMerchantCard(c *gin.Context) {
 	var inData models.UpdateMerchantCardRequest
 	var sqlData shanghu.MerchantCard

models/shanghu/merchant_card.go

@@ -82,6 +82,29 @@ func (m *MerchantCard) GetOpenIdList(pageSize int, pageIndex int, listType int)
 	return doc, count, nil
 }
 
+// list 接口使用
+func (m *MerchantCard) ClientGetOpenIdList(pageSize int, pageIndex int, listType int) ([]MerchantCard, int, error) {
+	var doc []MerchantCard
+	timeNow := time.Now().Unix()
+
+	table := orm.ShMysql.Table(m.TableName())
+	if listType == 1 { //待开始
+		table = table.Where("activity_start_time > ?", timeNow)
+	} else if listType == 2 { //进行中
+		table = table.Where("activity_start_time < ? and activity_end_time > ?", timeNow, timeNow)
+	} else if listType == 3 { //已结束
+		table = table.Where("activity_end_time < ?", timeNow)
+	}
+	//if m.ActivityStartTime != 0
+
+	var count int
+	if err := table.Select("*").Order("id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil {
+		return nil, 0, err
+	}
+	table.Count(&count)
+	return doc, count, nil
+}
+
 func (m *MerchantCard) UpdateMerchantCard() error {
 
 	if err := orm.ShMysql.Table(m.TableName()).Model(&m).Where("id = ? ", m.ID).Updates(