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

apis/shanghu/merchant.card.go

@@ -412,6 +412,7 @@ func GetMerchantCanvasCard(c *gin.Context) {
 func MerchantCardList(c *gin.Context) {
 	var inData models.MerchantCardListRequest
 	var sqlData shanghu.MerchantCard
+	var outData []models.MerchantCardListReply
 
 	err := c.ShouldBindJSON(&inData)
 	if err != nil {
@@ -428,7 +429,7 @@ func MerchantCardList(c *gin.Context) {
 	if inData.PageIndex != 0 {
 		pageIndex = inData.PageIndex
 	}
-	fmt.Println(inData.OpenId)
+
 	sqlData.MerchantOpenID = inData.OpenId
 
 	merchantCard, count, err := sqlData.GetOpenIdList(pageSize, pageIndex, inData.TypeList)
@@ -436,7 +437,23 @@ func MerchantCardList(c *gin.Context) {
 		app.Error(c, 500, err, err.Error())
 		return
 	}
-	app.PageOK(c, merchantCard, count, pageIndex, pageSize, app.Success)
+	for _, v := range merchantCard {
+		var merchant models.MerchantCardListReply
+		var payNumber shanghu.ClientPayTrans
+		merchant.ID = v.ID
+		merchant.MerchantCardName = v.MerchantCardName
+		merchant.ActivityEnd = tools.TimeToStr(v.ActivityEndTime)
+		merchant.ActivityStart = tools.TimeToStr(v.ActivityStartTime)
+		merchant.CardPrice = v.CardPrice
+		payNumber.MerchantCardID = v.ID
+		merchant.SaleCardNumber = payNumber.GetNumByCardID()
+
+		outData = append(outData, merchant)
+	}
+	app.PageOK(c, outData, count, pageIndex, pageSize, app.Success)
+	return
+
+	//app.PageOK(c, merchantCard, count, pageIndex, pageSize, app.Success)
 
 }
 

apis/shanghu/models/card.go

@@ -120,8 +120,11 @@ type MerchantCardListReply struct {
 	UpdateBy          int64     `json:"update_by"`           // 更新者
 	CreatedAt         time.Time `json:"created_at"`          // 创建时间
 	UpdatedAt         time.Time `json:"updated_at"`          // 最后更新时间
-	DeletedAt         time.Time `json:"deleted_at"`
-	RebateAmount      string    `json:"rebate_amount"` // 佣金
+	DeletedAt         time.Time `json:"deleted_at"`          //
+	RebateAmount      string    `json:"rebate_amount"`       // 佣金
+	SaleCardNumber    int       `json:"sale_card_number"`    // 售卡数量
+	ActivityEnd       string    `json:"activity_end"`        //
+	ActivityStart     string    `json:"activity_start"`      // 开始时间
 
 }
 

models/shanghu/pay.go

@@ -39,6 +39,15 @@ func (m *ClientPayTrans) GetRequestNum() int {
 
 }
 
+func (m *ClientPayTrans) GetNumByCardID() int {
+	var count int
+
+	tableCount := orm.ShMysql.Table(m.TableName()).Where("merchant_card_id = ? and status =2 ", m.MerchantCardID)
+	tableCount.Count(&count)
+
+	return count
+}
+
 func (m *ClientPayTrans) GetPayTransByOpenid() (ClientPayTrans, error) {
 	var doc ClientPayTrans