bug修改

models/coupon/coupon.go

@@ -344,8 +344,8 @@ func (m *CouponDAO) GetCustomerCouponByCouponAndUser(couponid, userid string) ([
 }
 
 // GetCouponDetail 获取优惠券详情
-func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseCouponDetail, error) {
-	var coupon = new(CaseCouponDetail)
+func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseCouponDetailWithRealName, error) {
+	var coupon = new(CaseCouponDetailWithRealName)
 	sql := `select * from ta_coupon where coupon_id=? and status>?`
 	_, err := m.db.Sql(sql, couponid, models.STATUS_DEL).Get(coupon)
 	if err != nil {
@@ -354,7 +354,7 @@ func (m *CouponDAO) GetCouponDetail(couponid string) (*CaseCouponDetail, error)
 	if coupon == nil || coupon.CouponId == "" {
 		return nil, errors.New("无优惠券信息")
 	}
-	cCoupons, err := m.GetCustomerCouponByCoupon(couponid)
+	cCoupons, err := m.GetCustomerCouponByCouponWithRealName(couponid)
 	if err != nil {
 		return nil, err
 	}
@@ -369,6 +369,14 @@ func (m *CouponDAO) GetCustomerCouponByCoupon(couponid string) ([]model.TaCustom
 	return customerCoupons, err
 }
 
+// GetCustomerCouponByCouponWithRealName 根据优惠券与用户获取领取的用户信息
+func (m *CouponDAO) GetCustomerCouponByCouponWithRealName(couponid string) ([]CustomerCouponWithSales, error) {
+	var customerCoupons []CustomerCouponWithSales
+	sql := `select a.*,b.real_name from ta_customer_coupon a inner join sys_user b on a.sales_id = b.user_id where a.coupon_id=? and a.status>?`
+	err := m.db.Sql(sql, couponid, models.STATUS_DEL).Find(&customerCoupons)
+	return customerCoupons, err
+}
+
 // GetCustomerCouponByUser 根据用户获取领取的用户信息
 func (m *CouponDAO) GetCustomerCouponByUser(caseid, userid string) ([]model.TaCustomerCoupon, error) {
 	var customerCoupons []model.TaCustomerCoupon

models/coupon/types.go

@@ -20,13 +20,26 @@ type CouponInfo struct {
 	ChannelId      string
 }
 
-// CaseUsableCoupon 案场可用优惠券信息
+// CaseCouponDetail 案场可用优惠券信息
 type CaseCouponDetail struct {
 	model.TaCoupon `xorm:"extends"`
 	CustomerCoupon []model.TaCustomerCoupon
 	Share          *model.TaCouponShare
 }
 
+// CaseCouponDetailWithRealName
+type CaseCouponDetailWithRealName struct {
+	model.TaCoupon `xorm:"extends"`
+	CustomerCoupon []CustomerCouponWithSales
+	Share          *model.TaCouponShare
+}
+
+// CustomerCouponWithSalesName
+type CustomerCouponWithSales struct {
+	model.TaCustomerCoupon `xorm:"extends"`
+	RealName               string
+}
+
 // CustomerCoupon 用户优惠券
 type CustomerCoupon struct {
 	model.TaCustomerCoupon `xorm:"extends"`

service/coupon/coupon.go

@@ -402,7 +402,7 @@ func (s *CouponServ) GetCouponBySendType(sendtype string) ([]model.TaCoupon, err
 }
 
 // GetCouponWithCustomer 获取优惠券明细
-func (s *CouponServ) GetCouponWithCustomer(couponid string) (*coupon.CaseCouponDetail, error) {
+func (s *CouponServ) GetCouponWithCustomer(couponid string) (*coupon.CaseCouponDetailWithRealName, error) {
 	if couponid == "" {
 		return nil, errors.New("没有券信息！")
 	}