diff --git a/api/v1/couponusers/couponUsers.go b/api/v1/couponusers/couponUsers.go
index 720f00c..92f7f0e 100644
--- a/api/v1/couponusers/couponUsers.go
+++ b/api/v1/couponusers/couponUsers.go
@@ -15,6 +15,7 @@ type GetCouponUsersRes struct {
 	Jwcode   int    `json:"jwcode" dc:"精网号"`
 	DeptName string `json:"deptName" dc:"部门"`
 	ShopName string `json:"shopName" dc:"门店"`
+	Total    int    `json:"total" dc:"总数"`
 }
 
 // DelCouponUserByJwcodeReq 删除卡券用户
diff --git a/internal/logic/couponusers/couponUsers.go b/internal/logic/couponusers/couponUsers.go
index e24b2bd..db6d8ec 100644
--- a/internal/logic/couponusers/couponUsers.go
+++ b/internal/logic/couponusers/couponUsers.go
@@ -26,74 +26,41 @@ func init() {
 
 // 根据优惠券id查看拥有优惠券的用户
 func (s *sCouponUsers) GetCouponUsersByCondition(ctx context.Context, couponId, jwcode int, name string, pageNo, pageSize int) (users []couponusers.GetCouponUsersRes, err error) {
-	//没有条件查询时,分页
-	if jwcode == 0 && name == "" {
-		/*查询所有数据*/
-		//在coupon_users中查询出对应的jwcode
-		err = dao.CouponUsers.Ctx(ctx).Fields("jwcode").
-			Where("coupon_id = ", couponId).Page(pageNo, pageSize).Scan(&users)
-		if err != nil {
-			return nil, errors.New("根据卡券id搜索jwcode失败")
-		}
-		//根据jwcode查询用户信息
-		for i, userInfo := range users {
-			err = dao.MemberInfo.Ctx(ctx).Fields("jwcode", "name", "deptName", "shopName").
-				Where("jwcode = ?", userInfo.Jwcode).Scan(&users[i])
-			if err != nil {
-				return nil, errors.New("根据jwcode搜索用户信息失败")
-			}
-		}
-		/*查询所有数据*/
+	db := dao.CouponUsers.Ctx(ctx)
 
-		return users, err
-	} else { //有条件查询时,不在分页,全查后筛选
+	//基于量表JOIN查询
+	db = db.As("cu").InnerJoin("member_info mi", "cu.jwcode = mi.jwcode").
+		Where("cu.coupon_id = ?", couponId)
 
-		/*查询所有数据*/
-		//在coupon_users中查询出对应的jwcode
-		err = dao.CouponUsers.Ctx(ctx).Fields("jwcode").
-			Where("coupon_id = ", couponId).Scan(&users)
-		if err != nil {
-			return nil, errors.New("根据卡券id搜索jwcode失败")
-		}
-		//根据jwcode查询用户信息
-		for i, userInfo := range users {
-			err = dao.MemberInfo.Ctx(ctx).Fields("jwcode", "name", "deptName", "shopName").
-				Where("jwcode = ?", userInfo.Jwcode).Scan(&users[i])
-			if err != nil {
-				return nil, errors.New("根据jwcode搜索用户信息失败")
-			}
-		}
-		/*查询所有数据*/
-
-		//条件查询
-		if jwcode != 0 && name == "" {
-			var result []couponusers.GetCouponUsersRes
-			for _, user := range users {
-				if user.Jwcode == jwcode {
-					result = append(result, user)
-				}
-			}
-			return result, err
-		} else if jwcode == 0 && name != "" {
-			var result []couponusers.GetCouponUsersRes
-			for _, user := range users {
-				if strings.Contains(user.Name, name) {
-					result = append(result, user)
-				}
-			}
-			return result, err
-		} else if jwcode != 0 && name != "" {
-			var result []couponusers.GetCouponUsersRes
-			for _, user := range users {
-				if user.Jwcode == jwcode && strings.Contains(user.Name, name) {
-					result = append(result, user)
-				}
-			}
-			return result, err
-		}
+	//如果jwcode条件存在
+	if jwcode != 0 {
+		db = db.Where("cu.jwcode = ?", jwcode)
+	}
 
-		return users, err
+	//如果name条件存在
+	if name != "" {
+		db = db.Where("mi.name like ?", "%"+name+"%")
+	}
+
+	//查询总数
+	total, err := db.Count()
+	if err != nil {
+		return nil, errors.New("查询总数失败")
 	}
+
+	//查询数据(分页)
+	err = db.Fields("mi.jwcode, mi.name, mi.deptName, mi.shopName").
+		Page(pageNo, pageSize).Scan(&users)
+	if err != nil {
+		return nil, errors.New("查询数据失败")
+	}
+
+	//设置总数
+	for i := range users {
+		users[i].Total = total
+	}
+
+	return users, err
 }
 
 // 根据jwcode,优惠券id删除用户