feat: 企业微信-打卡-新增返回字段 (#827)

* feat: 企业微信-通讯录管理，新增更新成员、更新部门、删除部门方法

* feat: 企业微信-通讯录管理-更新成员接口，支持更新企业邮箱别名

miniprogram/auth/auth.go

@@ -81,7 +81,7 @@ func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHa
 	var (
 		at string
 	)
-	if at, err = auth.GetAccessToken(); err != nil {
+	if at, err = auth.GetAccessTokenContext(ctx); err != nil {
 		return
 	}
 
@@ -120,7 +120,7 @@ func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*Get
 		at  string
 		err error
 	)
-	if at, err = auth.GetAccessToken(); err != nil {
+	if at, err = auth.GetAccessTokenContext(ctx); err != nil {
 		return nil, err
 	}
 	body := map[string]interface{}{

openplatform/context/accessToken.go

@@ -20,6 +20,7 @@ const (
 	getComponentInfoURL     = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s"
 	componentLoginURL       = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=%d&biz_appid=%s"
 	bindComponentURL        = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
+	bindComponentURLV2      = "https://open.weixin.qq.com/wxaopen/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
 	// TODO 获取授权方选项信息
 	// getComponentConfigURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
 	// TODO 获取已授权的账号信息
@@ -137,6 +138,20 @@ func (ctx *Context) GetBindComponentURL(redirectURI string, authType int, bizApp
 	return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
 }
 
+// GetBindComponentURLV2Context 获取新版本第三方公众号授权链接(链接跳转，适用移动端)
+func (ctx *Context) GetBindComponentURLV2Context(stdCtx context.Context, redirectURI string, authType int, bizAppID string) (string, error) {
+	code, err := ctx.GetPreCodeContext(stdCtx)
+	if err != nil {
+		return "", err
+	}
+	return fmt.Sprintf(bindComponentURLV2, authType, ctx.AppID, code, url.QueryEscape(redirectURI), bizAppID), nil
+}
+
+// GetBindComponentURLV2 获取新版本第三方公众号授权链接(链接跳转，适用移动端)
+func (ctx *Context) GetBindComponentURLV2(redirectURI string, authType int, bizAppID string) (string, error) {
+	return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
+}
+
 // ID 微信返回接口中各种类型字段
 type ID struct {
 	ID int `json:"id"`
@@ -225,6 +240,10 @@ func (ctx *Context) RefreshAuthrTokenContext(stdCtx context.Context, appid, refr
 	if err := cache.SetContext(stdCtx, ctx.Cache, authrTokenKey, ret.AccessToken, time.Second*time.Duration(ret.ExpiresIn-30)); err != nil {
 		return nil, err
 	}
+	refreshTokenKey := "authorizer_refresh_token_" + appid
+	if err := cache.SetContext(stdCtx, ctx.Cache, refreshTokenKey, ret.RefreshToken, 10*365*24*60*60*time.Second); err != nil {
+		return nil, err
+	}
 	return ret, nil
 }
 
@@ -238,8 +257,18 @@ func (ctx *Context) GetAuthrAccessTokenContext(stdCtx context.Context, appid str
 	authrTokenKey := "authorizer_access_token_" + appid
 	val := cache.GetContext(stdCtx, ctx.Cache, authrTokenKey)
 	if val == nil {
-		return "", fmt.Errorf("cannot get authorizer %s access token", appid)
+		refreshTokenKey := "authorizer_refresh_token_" + appid
+		val := cache.GetContext(stdCtx, ctx.Cache, refreshTokenKey)
+		if val == nil {
+			return "", fmt.Errorf("cannot get authorizer %s refresh token", appid)
+		}
+		token, err := ctx.RefreshAuthrTokenContext(stdCtx, appid, val.(string))
+		if err != nil {
+			return "", err
+		}
+		return token.AccessToken, nil
 	}
+
 	return val.(string), nil
 }
 

work/addresslist/user.go

@@ -169,6 +169,7 @@ type UserUpdateRequest struct {
 	Gender         int      `json:"gender"`
 	Email          string   `json:"email"`
 	BizMail        string   `json:"biz_mail"`
+	BizMailAlias   string   `json:"biz_mail_alias"`
 	IsLeaderInDept []int    `json:"is_leader_in_dept"`
 	DirectLeader   []string `json:"direct_leader"`
 	Enable         int      `json:"enable"`

work/checkin/checkin.go

@@ -140,6 +140,7 @@ type OptionGroupRule struct {
 	SyncOutCheckin         bool                         `json:"sync_out_checkin,omitempty"`
 	BukaRemind             OptionGroupBukaRemind        `json:"buka_remind,omitempty"`
 	BukaRestriction        int64                        `json:"buka_restriction,omitempty"`
+	CheckinMethodType      int64                        `json:"checkin_method_type,omitempty"`
 	SpanDayTime            int64                        `json:"span_day_time,omitempty"`
 	StandardWorkDuration   int64                        `json:"standard_work_duration,omitempty"`
 }

work/checkin/record.go

@@ -173,9 +173,15 @@ type (
 
 	// OtInfo 加班信息
 	OtInfo struct {
-		OtStatus          int64    `json:"ot_status"`
-		OtDuration        int64    `json:"ot_duration"`
-		ExceptionDuration []uint64 `json:"exception_duration"`
+		OtStatus              int64    `json:"ot_status"`
+		OtDuration            int64    `json:"ot_duration"`
+		ExceptionDuration     []uint64 `json:"exception_duration"`
+		WorkdayOverAsVacation int64    `json:"workday_over_as_vacation"`
+		WorkdayOverAsMoney    int64    `json:"workday_over_as_money"`
+		RestdayOverAsVacation int64    `json:"restday_over_as_vacation"`
+		RestdayOverAsMoney    int64    `json:"restday_over_as_money"`
+		HolidayOverAsVacation int64    `json:"holiday_over_as_vacation"`
+		HolidayOverAsMoney    int64    `json:"holiday_over_as_money"`
 	}
 )
 
@@ -237,13 +243,20 @@ type (
 		RegularDays     int64 `json:"regular_days"`
 		RegularWorkSec  int64 `json:"regular_work_sec"`
 		StandardWorkSec int64 `json:"standard_work_sec"`
+		RestDays        int64 `json:"rest_days"`
 	}
 
 	// OverWorkInfo 加班情况
 	OverWorkInfo struct {
-		WorkdayOverSec int64 `json:"workday_over_sec"`
-		HolidayOverSec int64 `json:"holidays_over_sec"`
-		RestDayOverSec int64 `json:"restdays_over_sec"`
+		WorkdayOverSec         int64 `json:"workday_over_sec"`
+		HolidayOverSec         int64 `json:"holidays_over_sec"`
+		RestDayOverSec         int64 `json:"restdays_over_sec"`
+		WorkdaysOverAsVacation int64 `json:"workdays_over_as_vacation"`
+		WorkdaysOverAsMoney    int64 `json:"workdays_over_as_money"`
+		RestdaysOverAsVacation int64 `json:"restdays_over_as_vacation"`
+		RestdaysOverAsMoney    int64 `json:"restdays_over_as_money"`
+		HolidaysOverAsVacation int64 `json:"holidays_over_as_vacation"`
+		HolidaysOverAsMoney    int64 `json:"holidays_over_as_money"`
 	}
 )
 
@@ -304,6 +317,10 @@ type CorpOptionGroup struct {
 	BukaRestriction        int64              `json:"buka_restriction"`
 	ScheduleList           []ScheduleList     `json:"schedulelist"`
 	OffWorkIntervalTime    int64              `json:"offwork_interval_time"`
+	SpanDayTime            int64              `json:"span_day_time"`
+	StandardWorkDuration   int64              `json:"standard_work_duration"`
+	OpenSpCheckin          bool               `json:"open_sp_checkin"`
+	CheckinMethodType      int64              `json:"checkin_method_type"`
 }
 
 // GroupCheckinDate 打卡时间，当规则类型为排班时没有意义
@@ -505,6 +522,7 @@ type OptionInfo struct {
 type OptionGroup struct {
 	GroupType              int64               `json:"grouptype"`
 	GroupID                int64               `json:"groupid"`
+	OpenSpCheckin          bool                `json:"open_sp_checkin"`
 	GroupName              string              `json:"groupname"`
 	CheckinDate            []OptionCheckinDate `json:"checkindate"`
 	SpeWorkdays            []SpeWorkdays       `json:"spe_workdays"`
@@ -518,6 +536,10 @@ type OptionGroup struct {
 	LocInfos               []LocInfos          `json:"loc_infos"`
 	ScheduleList           []ScheduleList      `json:"schedulelist"`
 	BukaRestriction        int64               `json:"buka_restriction"`
+	SpanDayTime            int64               `json:"span_day_time"`
+	StandardWorkDuration   int64               `json:"standard_work_duration"`
+	OffWorkIntervalTime    int64               `json:"offwork_interval_time"`
+	CheckinMethodType      int64               `json:"checkin_method_type"`
 }
 
 // OptionCheckinDate 打卡时间配置