bug修改

models/card/card.go

@@ -275,9 +275,23 @@ func (m *CardDAO) GetCustomerCardByCardAndUser(cardid, userid string) ([]model.T
 	return customerCards, err
 }
 
+// 案场可用卡信息
+type CardDetailWithSales struct {
+	model.TaCouponCard `xorm:"extends"`
+	CustomerCard       []SalesWithCustomerCardNum
+}
+
+// SalesWithCustomerCardNum
+type SalesWithCustomerCardNum struct {
+	RealName   string
+	SalesId    string
+	ReceiveNum int
+	UsedNum    int
+}
+
 // GetCardDetail 获取卡详情
-func (m *CardDAO) GetCardDetail(cardid string) (*CaseUsableCard, error) {
-	var card = new(CaseUsableCard)
+func (m *CardDAO) GetCardDetail(cardid string) (*CardDetailWithSales, error) {
+	var card = new(CardDetailWithSales)
 	sql := `select * from ta_coupon_card where card_id=? and status>?`
 	_, err := m.db.Sql(sql, cardid, models.STATUS_DEL).Get(card)
 	if err != nil {
@@ -286,7 +300,7 @@ func (m *CardDAO) GetCardDetail(cardid string) (*CaseUsableCard, error) {
 	if card == nil || card.CardId == "" {
 		return nil, errors.New("无卡信息")
 	}
-	ccards, err := m.GetCustomerCardByCard(cardid)
+	ccards, err := m.GetCustomerCardByCardWithRealName(cardid)
 	if err != nil {
 		return nil, err
 	}
@@ -294,6 +308,41 @@ func (m *CardDAO) GetCardDetail(cardid string) (*CaseUsableCard, error) {
 	return card, nil
 }
 
+// GetSalesCardByCard 根据卡获取领取的用户信息
+func (m *CardDAO) GetSalesCardByCard(cardid string) ([]model.TaCustomerCard, error) {
+	var customerCards []model.TaCustomerCard
+	err := m.db.Where("card_id=?", cardid).And("status>?", models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}
+
+// GetCustomerCardByCardWithRealName 根据卡获取领取的用户信息
+func (m *CardDAO) GetCustomerCardByCardWithRealName(cardid string) ([]SalesWithCustomerCardNum, error) {
+	var customerCards []SalesWithCustomerCardNum
+	sql := `SELECT
+			b.real_name,
+			a.sales_id,
+			count(1) AS receive_num,
+			sum(
+				CASE
+				WHEN a.verify_status = 'useable' THEN
+					0
+				ELSE
+					1
+				END
+			) AS used_num
+		FROM
+			ta_customer_card a
+		INNER JOIN sys_user b ON a.sales_id = b.user_id
+		WHERE
+			a.card_id = ?
+		AND a. STATUS > ?
+		GROUP BY
+			b.real_name,
+			a.sales_id`
+	err := m.db.Sql(sql, cardid, models.STATUS_DEL).Find(&customerCards)
+	return customerCards, err
+}
+
 // GetCustomerCardByCard 根据卡获取领取的用户信息
 func (m *CardDAO) GetCustomerCardByCard(cardid string) ([]model.TaCustomerCard, error) {
 	var customerCards []model.TaCustomerCard

service/card/card.go

@@ -358,7 +358,7 @@ func (s *CardServ) GetCardByIDWithCheck(cardID string) (*card.CardInfo, error) {
 }
 
 // GetCardWithCustomer 获取体验卡明细
-func (s *CardServ) GetCardWithCustomer(cardid string) (*card.CaseUsableCard, error) {
+func (s *CardServ) GetCardWithCustomer(cardid string) (*card.CardDetailWithSales, error) {
 	if cardid == "" {
 		return nil, errors.New("没有卡信息！")
 	}