gymcard

service/gymcard/gymcard.go

@@ -196,7 +196,6 @@ func (s *GymcardServ) SendGymCardToUser(gymcardId, sysuserId string) (*model.TaC
 	return customerGym, nil
 }
 
-<<<<<<< HEAD
 // // SendGymCardToUser 后台给客户发卡
 // func (s *GymcardServ) BackSendGymCardToUser(gymcardId, sysuserId, customerId string) (*model.TaCustomerGym, error) {
 // 	var customerGym *model.TaCustomerGym
@@ -220,28 +219,6 @@ func (s *GymcardServ) SendGymCardToUser(gymcardId, sysuserId string) (*model.TaC
 // 		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
 // 		return nil, errors.New("发送游泳健身卡给客户失败")
 // 	}
-=======
-// SendGymCardToUser 后台给客户发卡
-func (s *GymcardServ) BackSendGymCardToUser(gymcardId, sysuserId, customerId string) (*model.TaCustomerGym, error) {
-	var customerGym *model.TaCustomerGym
-	var sysuser *model.SysUser
-	gymCard, err := s.dao.GetGymcardById(gymcardId)
-	if err != nil {
-		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
-		return nil, errors.New("发送游泳健身卡给客户失败")
-	}
-	sysuser, err = s.cdao.GetUserByID(sysuserId)
-	if err != nil {
-		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
-		return nil, errors.New("发送游泳健身卡给客户失败")
-	}
-	gymCard.SentCount = gymCard.SentCount + 1
-	customerGym, err = s.dao.SendGymcardToCustomer(&gymCard.TaGymCard, customerId, sysuserId, sysuser.RealName, models.RECEIVEING_TYPE_GIVE)
-	if err != nil {
-		utils.LogError("发送游泳健身卡给客户失败" + err.Error())
-		return nil, errors.New("发送游泳健身卡给客户失败")
-	}
->>>>>>> d177ac04b0531069ae9e6b77160766bdfa94b51f
 
 // 	err = s.dao.EditGymcard(&gymCard.TaGymCard)
 // 	if err != nil {