代码上传

models/card/card.go

@@ -296,19 +296,45 @@ func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
 	return card, nil
 }
 
+// CustomerCardWithShare 我的卡券关联分享信息
+type CustomerCardWithShare struct {
+	model.TaCouponCard `xorm:"extends"`
+	Share              *model.TaExperienceCardShare
+}
+
 // GetCardByCustomer 获取我的体验卡
-func (m *CardDAO) GetCardByCustomer(orgid, customerid string) ([]model.TaCustomerCard, error) {
-	var cards []model.TaCustomerCard
-	err := m.db.Where("status>?", models.STATUS_DEL).And("customer_id=?", customerid).And("org_id=?", orgid).Find(&cards)
+func (m *CardDAO) GetCardByCustomer(orgid, customerid string) ([]CustomerCardWithShare, error) {
+	var cards []CustomerCardWithShare
+	sql := `select * from ta_customer_card where status>? and customer_id=? and org_id=?`
+	err := m.db.Sql(sql, models.STATUS_DEL, customerid, orgid).Find(&cards)
+	if err != nil {
+		return nil, err
+	}
+	for inx, card := range cards {
+		share, err := m.GetCardShareByCardID(card.CardId)
+		if err != nil {
+			utils.LogError("获取体验卡失败: " + err.Error())
+			return nil, errors.New("获取体验卡失败")
+		}
+		cards[inx].Share = share
+	}
 	return cards, err
 }
 
 // GetCustomerCardByID 获取我的体验卡详情
-func (m *CardDAO) GetCustomerCardByID(id string) (*model.TaCustomerCard, error) {
+func (m *CardDAO) GetCustomerCardByID(id string) (*CustomerCardWithShare, error) {
 	if id == "" {
 		return nil, errors.New("无优惠券信息")
 	}
-	var customerCard = new(model.TaCustomerCard)
-	_, err := m.db.Where("customer_card_id=?", id).Get(customerCard)
+	var customerCard = new(CustomerCardWithShare)
+	sql := `select * from ta_customer_card where status>? and customer_card_id=?`
+	_, err := m.db.Sql(sql, models.STATUS_DEL, id).Get(customerCard)
+
+	share, err := m.GetCardShareByCardID(customerCard.CardId)
+	if err != nil {
+		utils.LogError("获取体验卡失败: " + err.Error())
+		return nil, errors.New("获取体验卡失败")
+	}
+	customerCard.Share = share
 	return customerCard, err
 }

models/coupon/coupon.go

@@ -382,13 +382,28 @@ func (m *CouponDAO) GetCouponByCustomer(orgid, customerid string) ([]CustomerCou
 	return coupons, err
 }
 
+// CustomerCouponWithShare 我的卡券关联分享信息
+type CustomerCouponWithShare struct {
+	model.TaCustomerCoupon `xorm:"extends"`
+	Share                  *model.TaCouponShare
+}
+
 // GetCustomerCouponByID 获取我的优惠券详情
-func (m *CouponDAO) GetCustomerCouponByID(id string) (*model.TaCustomerCoupon, error) {
+func (m *CouponDAO) GetCustomerCouponByID(id string) (*CustomerCouponWithShare, error) {
 	if id == "" {
 		return nil, errors.New("无优惠券信息")
 	}
-	var customerCoupon = new(model.TaCustomerCoupon)
-	_, err := m.db.Where("customer_coupon_id=?", id).Get(customerCoupon)
+	var customerCoupon = new(CustomerCouponWithShare)
+	sql := `select * from ta_customer_coupon where customer_coupon_id=?`
+	_, err := m.db.Sql(sql, id).Get(customerCoupon)
+	if err != nil {
+		return nil, err
+	}
+	share := new(model.TaCouponShare)
+	if _, err := m.db.Where("coupon_id=?", id).And("status=?", models.STATUS_NORMAL).Get(share); err != nil {
+		return nil, err
+	}
+	customerCoupon.Share = share
 	return customerCoupon, err
 }
 

models/gymcard/gymcard.go

@@ -369,7 +369,7 @@ WHERE
 }
 
 // GetCustomerGymById 根据id获取用户健身卡详情
-func (m *GymcardDAO) GetCustomerGymById(customerCardId string) (CustomerGym, error) {
+func (m *GymcardDAO) GetCustomerGymById(customerCardId string) (*CustomerGym, error) {
 	var customerGym []CustomerGym
 	sql := `SELECT
 	a.*,
@@ -386,7 +386,13 @@ INNER JOIN ta_gym_card d ON a.gym_card_id = d.gym_card_id
 WHERE
 	a.customer_gym_id = '` + customerCardId + `' and a.status >` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Find(&customerGym)
-	return customerGym[0], err
+	if err != nil {
+		return nil, err
+	}
+	if len(customerGym) > 0 {
+		return &customerGym[0], nil
+	}
+	return nil, err
 }
 
 // AddGiveRecord 新增赠送记录

service/card/card.go

@@ -289,7 +289,7 @@ func (s *CardServ) GetCardWithCustomer(cardid string) (*card.CaseUsableCard, err
 }
 
 // GetCardByCustomer 获取我的体验卡
-func (s *CardServ) GetCardByCustomer() ([]model.TaCustomerCard, error) {
+func (s *CardServ) GetCardByCustomer() ([]card.CustomerCardWithShare, error) {
 	org := s.ctx.Get("org").(model.SysOrg)
 	customer := s.ctx.Get("customer").(model.TaCustomer)
 	cards, err := s.dao.GetCardByCustomer(org.OrgId, customer.CustomerId)
@@ -301,7 +301,7 @@ func (s *CardServ) GetCardByCustomer() ([]model.TaCustomerCard, error) {
 }
 
 // GetCustomerCardByID 获取我的体验卡详情
-func (s *CardServ) GetCustomerCardByID(id string) (*model.TaCustomerCard, error) {
+func (s *CardServ) GetCustomerCardByID(id string) (*card.CustomerCardWithShare, error) {
 	card, err := s.dao.GetCustomerCardByID(id)
 	if err != nil {
 		utils.LogError("获取体验卡失败: " + err.Error())

service/coupon/coupon.go

@@ -395,7 +395,7 @@ func (s *CouponServ) GetCouponByCustomer() ([]coupon.CustomerCoupon, error) {
 }
 
 // GetCustomerCouponByID 获取我的优惠券详情
-func (s *CouponServ) GetCustomerCouponByID(id string) (*model.TaCustomerCoupon, error) {
+func (s *CouponServ) GetCustomerCouponByID(id string) (*coupon.CustomerCouponWithShare, error) {
 	coupon, err := s.dao.GetCustomerCouponByID(id)
 	if err != nil {
 		utils.LogError("获取优惠券失败: " + err.Error())
@@ -403,3 +403,5 @@ func (s *CouponServ) GetCustomerCouponByID(id string) (*model.TaCustomerCoupon,
 	}
 	return coupon, nil
 }
+
+//

service/gymcard/gymcard.go

@@ -117,7 +117,7 @@ func (s *GymcardServ) GetCustomerGymDetailById(customerGymId string) (*gymcard.C
 		utils.LogError("获取健身卡详情失败" + err.Error())
 		return nil, errors.New("获取健身卡详情失败")
 	}
-	return &customerGym, err
+	return customerGym, err
 }
 
 // SaveGymcard 保存游泳健身卡