0915PM

models/gymcard/gymcard.go

@@ -263,7 +263,7 @@ func (m *GymcardDAO) EditGymcardShare(gymcardId, cardShareInfo, cardUseRule, car
 }
 
 // SendGymcardToCustomer 新增用户健身卡
-func (m *GymcardDAO) SendGymcardToCustomer(gymcard *model.TaGymCard, customerId, salesId, salesName string) (*model.TaCustomerGym, error) {
+func (m *GymcardDAO) SendGymcardToCustomer(gymcard *model.TaGymCard, customerId, salesId, salesName, receivingtype string) (*model.TaCustomerGym, error) {
 	var customerGym model.TaCustomerGym
 	customerGym.CustomerGymId = utils.GetGUID()
 	customerGym.CaseId = gymcard.CaseId
@@ -279,6 +279,7 @@ func (m *GymcardDAO) SendGymcardToCustomer(gymcard *model.TaGymCard, customerId,
 	customerGym.SalesId = salesId
 	customerGym.SalesName = salesName
 	customerGym.CardStatus = models.CARD_COUPON_RECEIVED
+	customerGym.ReceivingType = receivingtype
 	_, err := m.db.Insert(customerGym)
 	return &customerGym, err
 }

models/model/ta_customer_course_detail.go

@@ -16,4 +16,7 @@ type TaCustomerCourseDetail struct {
 	VerifyUser       string    `xorm:"VARCHAR(64)"`
 	CaseId           string    `xorm:"VARCHAR(64)"`
 	Status           int       `xorm:"SMALLINT(6)"`
+	CustomerId       string    `xorm:"VARCHAR(64)"`
+	OrgId            string    `xorm:"VARCHAR(64)"`
+	CourseName       string    `xorm:"VARCHAR(255)"`
 }

service/coupon/coupon.go

@@ -291,6 +291,7 @@ func (s *CouponServ) GiveCouponTo(from *model.SysUser, to *model.TaCustomer, cp
 		ReceiveDate:        now,
 		CaseId:             cp.CaseId,
 		OrgId:              cp.OrgId,
+		ReceivingType:      models.RECEIVEING_TYPE_GIVE,
 	}
 
 	// 放入赠送记录
@@ -526,6 +527,7 @@ func (s *CouponServ) ReceiveCoupon(id, saleid, serialcode string) error {
 		CaseId:             coupon.CaseId,
 		OrgId:              coupon.OrgId,
 		SerialCode:         serialcode,
+		ReceivingType:      models.RECEIVEING_TYPE_SALES,
 	}
 
 	err = s.dao.SaveCustomerCoupon(&customerCoupon)
@@ -588,6 +590,7 @@ func (s *CouponServ) ChannelReceiveCoupon(id string) error {
 		EndDate:            coupon.EndDate,
 		CaseId:             coupon.CaseId,
 		OrgId:              coupon.OrgId,
+		ReceivingType:      models.RECEIVEING_TYPE_CHANNEL,
 	}
 
 	err = s.dao.SaveCustomerCoupon(&customerCoupon)

service/gymcard/gymcard.go

@@ -181,7 +181,8 @@ func (s *GymcardServ) SendGymCardToUser(gymcardId, sysuserId string) (*model.TaC
 		return nil, errors.New("发送游泳健身卡给客户失败")
 	}
 	gymCard.SentCount = gymCard.SentCount + 1
-	customerGym, err = s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, customer.CustomerId, sysuserId, sysuser.RealName)
+
+	customerGym, err = s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, customer.CustomerId, sysuserId, sysuser.RealName, models.RECEIVEING_TYPE_SALES)
 	if err != nil {
 		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
 		return nil, errors.New("发送游泳健身卡给客户失败")
@@ -296,7 +297,7 @@ func (s *GymcardServ) GiveCardToCustomer(gymcardId, uids string) error {
 	}
 
 	for _, uid := range arrUID {
-		_, err := s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, uid, "", "")
+		_, err := s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, uid, "", "", models.RECEIVEING_TYPE_GIVE)
 		if err != nil {
 			utils.LogError("发送游泳健身卡给客户失败" + err.Error())
 			return errors.New("发送游泳健身卡给客户失败")