Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

log/common.log

 2018/09/19 17:42:09 [E] 用户没有设置默认案场
 2018/09/19 17:42:09 [E] 用户没有设置默认案场
 2018/09/19 17:51:33 [E] 获取用户基本信息失败: 没有查询到 ID (OPENID) 对应的用户
+2018/09/19 18:58:01 [E] 获取发送卡信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
+2018/09/19 18:58:01 [E] 获取人员信息失败: 获取人员信息失败
+2018/09/19 19:00:04 [E] 获取发送卡信息失败: Error 1054: Unknown column 'price' in 'field list'
+2018/09/19 19:00:04 [E] 获取人员信息失败: 获取人员信息失败
+2018/09/19 19:00:37 [E] 获取发送券信息失败: Error 1054: Unknown column 'serial_code' in 'field list'
+2018/09/19 19:00:37 [E] 获取人员信息失败: 获取人员信息失败
+2018/09/19 19:06:05 [E] 获取发送券信息失败: Error 1054: Unknown column 'price' in 'field list'
+2018/09/19 19:06:05 [E] 获取人员信息失败: 获取人员信息失败

models/card/card.go

 	Images             []model.TaExperienceCardImage
 	Targets            []model.TaCouponCardTarget
 	Share              *model.TaExperienceCardShare
+	ChannelId          string
 }
 
 // GetCardList 获取卡列表
 		return nil, err
 	}
 	card[0].Share = share
+	channel, err := m.GetCardChannel(cardid)
+	if err != nil {
+		return nil, err
+	}
+	if channel != nil {
+		card[0].ChannelId = channel.ChannelId
+	}
 	return &card[0], err
 }
 
 	}
 	return cards, nil
 }
+
+// GetCardChannel 获取卡对应渠道
+func (m *CardDAO) GetCardChannel(cardid string) (*model.TaCardCouponChannel, error) {
+	var channels []model.TaCardCouponChannel
+	err := m.db.Where("card_coupon_type=?", models.COURSE_COUPON_CARD).And("card_coupon_id=?", cardid).And("status=?", models.STATUS_NORMAL).Find(&channels)
+	if err != nil {
+		return nil, err
+	}
+	if len(channels) > 0 {
+		return &channels[0], nil
+	}
+	return nil, nil
+}
+
+// DelCardChannel 删除卡对应渠道
+func (m *CardDAO) DelCardChannel(cardid string) error {
+	sql := `delete from ta_card_coupon_channel where card_coupon_id=? and card_coupon_type=?`
+	_, err := m.db.Exec(sql, cardid, models.COURSE_COUPON_CARD)
+	return err
+}
+
+// SaveCardChannel 保存卡对应渠道
+func (m *CardDAO) SaveCardChannel(channelid, cardid string) error {
+	var cardChannel = model.TaCardCouponChannel{
+		CardCouponChannelId: utils.GetGUID(),
+		CardCouponId:        cardid,
+		ChannelId:           channelid,
+		CardCouponType:      models.COURSE_COUPON_CARD,
+		Status:              models.STATUS_NORMAL,
+	}
+	_, err := m.db.Insert(&cardChannel)
+	return err
+}

models/coupon/coupon.go

 	cp.Rules = rules
 	cp.Share = share
 
+	channel, err := m.GetCouponChannel(id)
+	if err != nil {
+		return nil, err
+	}
+	if channel != nil {
+		cp.ChannelId = channel.ChannelId
+	}
+
 	return cp, nil
 }
 
 	err := m.db.Sql(sql, models.STATUS_DEL, customerid, orgid).Find(&coupons)
 	return coupons, err
 }
+
+// GetCouponChannel 获取优惠券对应渠道
+func (m *CouponDAO) GetCouponChannel(couponid string) (*model.TaCardCouponChannel, error) {
+	var channels []model.TaCardCouponChannel
+	err := m.db.Where("card_coupon_type=?", models.COURSE_COUPON_COUPON).And("card_coupon_id=?", couponid).And("status=?", models.STATUS_NORMAL).Find(&channels)
+	if err != nil {
+		return nil, err
+	}
+	if len(channels) > 0 {
+		return &channels[0], nil
+	}
+	return nil, nil
+}
+
+// DelCouponChannel 删除优惠券对应渠道
+func (m *CouponDAO) DelCouponChannel(couponid string) error {
+	sql := `delete from ta_card_coupon_channel where card_coupon_id=? and card_coupon_type=?`
+	_, err := m.db.Exec(sql, couponid, models.COURSE_COUPON_COUPON)
+	return err
+}
+
+// SaveCouponChannel 保存优惠券对应渠道
+func (m *CouponDAO) SaveCouponChannel(channelid, couponid string) error {
+	var couponChannel = model.TaCardCouponChannel{
+		CardCouponChannelId: utils.GetGUID(),
+		CardCouponId:        couponid,
+		ChannelId:           channelid,
+		CardCouponType:      models.COURSE_COUPON_COUPON,
+		Status:              models.STATUS_NORMAL,
+	}
+	_, err := m.db.Insert(&couponChannel)
+	return err
+}

models/coupon/types.go

 	Targets        []model.TaCouponTarget
 	Images         []model.TaCouponImage
 	Rules          []model.TaCouponRule
+	ChannelId      string
 }
 
 // CaseUsableCoupon 案场可用优惠券信息

service/card/card.go

 		return errors.New("保存卡关联内容失败")
 	}
 
+	// 保存渠道
+	if cd.ChannelId != "" {
+		if err := s.dao.SaveCardChannel(cd.ChannelId, cd.CardId); err != nil {
+			utils.LogError("保存对应渠道失败: " + err.Error())
+			return errors.New("保存对应渠道失败")
+		}
+	}
+
 	return nil
 }
 
 		return errors.New("更新卡分享失败")
 	}
 
+	// 删除渠道
+	if err := s.dao.DelCardChannel(cd.CardId); err != nil {
+		utils.LogError("删除对应渠道信息失败: " + err.Error())
+		return errors.New("删除对应渠道信息失败")
+	}
+
+	// 保存渠道
+	if cd.ChannelId != "" {
+		if err := s.dao.SaveCardChannel(cd.ChannelId, cd.CardId); err != nil {
+			utils.LogError("保存对应渠道失败: " + err.Error())
+			return errors.New("保存对应渠道失败")
+		}
+	}
 	// 关联内容 规则 不允许更新
 	return nil
 }

service/coupon/coupon.go

 		return errors.New("保存优惠券规则失败")
 	}
 
+	// 保存渠道
+	if cp.ChannelId != "" {
+		if err := s.dao.SaveCouponChannel(cp.ChannelId, cp.CouponId); err != nil {
+			utils.LogError("保存对应渠道失败: " + err.Error())
+			return errors.New("保存对应渠道失败")
+		}
+	}
+
 	return nil
 }
 
 		return errors.New("保存优惠券规则失败")
 	}
 
+	// 删除渠道
+	if err := s.dao.DelCouponChannel(cp.CouponId); err != nil {
+		utils.LogError("删除对应渠道信息失败: " + err.Error())
+		return errors.New("删除对应渠道信息失败")
+	}
+
+	// 保存渠道
+	if cp.ChannelId != "" {
+		if err := s.dao.SaveCouponChannel(cp.ChannelId, cp.CouponId); err != nil {
+			utils.LogError("保存对应渠道失败: " + err.Error())
+			return errors.New("保存对应渠道失败")
+		}
+	}
 	return nil
 }
 

service/course/course.go

 	if course.BeginDate.IsZero() || course.EndDate.IsZero() {
 		return nil, utils.LogError("课程时间不允许为空！")
 	}
-	if !course.EndDate.After(course.BeginDate) {
+	if !course.EndDate.After(course.BeginDate) && course.EndDate != course.BeginDate {
 		return nil, utils.LogError("截止时间必须大于开始时间！")
 	}
 	if tagids == "" {