diff --git a/internal/v2/controller/wxapp/copartner/company.go b/internal/v2/controller/wxapp/copartner/company.go index 207f4b0..908c71d 100644 --- a/internal/v2/controller/wxapp/copartner/company.go +++ b/internal/v2/controller/wxapp/copartner/company.go @@ -10,7 +10,7 @@ import ( type Company struct { } type argsCompanyAdd struct { - InviteNo string `binding:"required" label:"邀请码"` // 邀请码 + InviteNo string // 邀请码 copartner.CompanyInfo } diff --git a/internal/v2/controller/wxapp/copartner/copartner.go b/internal/v2/controller/wxapp/copartner/copartner.go index a9e78b6..e3d3c68 100644 --- a/internal/v2/controller/wxapp/copartner/copartner.go +++ b/internal/v2/controller/wxapp/copartner/copartner.go @@ -10,7 +10,7 @@ import ( type Copartner struct { } type argsCopartnerCode struct { - InviteNo string `binding:"required" label:"邀请码"` // 邀请码 + InviteNo string // 邀请码 } // Very @Title 验证邀请码 diff --git a/internal/v2/controller/wxapp/copartner/personal.go b/internal/v2/controller/wxapp/copartner/personal.go index aaee92c..ee38c81 100644 --- a/internal/v2/controller/wxapp/copartner/personal.go +++ b/internal/v2/controller/wxapp/copartner/personal.go @@ -14,9 +14,9 @@ import ( type Personal struct { } type argsPersonalAdd struct { - Phone string `binding:"required,len=11,startswith=1" label:"手机号"` - Nickname string `binding:"required" label:"昵称"` - InviteNo string `binding:"required" label:"邀请码"` + Phone string + Nickname string + InviteNo string } // Add @Title 添加合伙人 diff --git a/internal/v2/logic/manage/jyy/app.go b/internal/v2/logic/manage/jyy/app.go index 58791b1..111333e 100644 --- a/internal/v2/logic/manage/jyy/app.go +++ b/internal/v2/logic/manage/jyy/app.go @@ -25,11 +25,12 @@ type AppUserReq struct { } type AppUserInfo struct { - Mobile string `json:"mobile"` - Nickname string `json:"nickname"` - Level uint `json:"level"` - IsOffline bool `json:"is_offline"` - CreatedAt formatime.Second `json:"created_at"` + Mobile string `json:"mobile"` + Nickname string `json:"nickname"` + Level uint `json:"level"` + IsOffline bool `json:"is_offline"` + CreatedAt formatime.Second `json:"created_at"` + IsEnterprise bool `json:"is_enterprise"` } func (o logic) AppUser(args AppUserReq) (res []AppUserInfo, total int64, err error) { @@ -68,11 +69,12 @@ func (o logic) AppUser(args AppUserReq) (res []AppUserInfo, total int64, err err query.Offset(args.GetStart()).Limit(args.GetLimit()).Find(&temp) for _, v := range temp { res = append(res, AppUserInfo{ - Mobile: v.Mobile, - Nickname: v.Nickname, - Level: uint(v.Level), - IsOffline: v.IsOffline, - CreatedAt: v.CreatedAt, + Mobile: v.Mobile, + Nickname: v.Nickname, + Level: uint(v.Level), + IsOffline: v.IsOffline, + IsEnterprise: v.IsEnterprise, + CreatedAt: v.CreatedAt, }) } return diff --git a/internal/v2/logic/wxapp/copartner/company.go b/internal/v2/logic/wxapp/copartner/company.go index 8858bc3..31076f3 100644 --- a/internal/v2/logic/wxapp/copartner/company.go +++ b/internal/v2/logic/wxapp/copartner/company.go @@ -16,18 +16,18 @@ var CompanyLogic = &companyLogic{} type companyLogic struct { } type CompanyInfo struct { - Phone string `binding:"required,len=11,startswith=1" label:"手机号"` //手机号 - NikeName string `binding:"required" label:"昵称"` //昵称 - BusinessLicense string `binding:"required" label:"印业执照"` //营业执照 - TaxPhoto string `label:"一般纳税人传的照片"` //一般纳税人传的照片 - CorporationName string `binding:"required" label:"企业名"` //企业名 - TaxBillType string `binding:"required" label:"纳税类型"` //纳税类型 - Taxpayer string `binding:"required" label:"纳税识别号"` //纳税识别号 - OpeningBank string `binding:"required" label:"开户行"` //开户行 - BankAccount string `binding:"required" label:"银行账户"` //银行账户 - MakeTax decimal.Decimal `binding:"required" label:"开票税率"` //开票税率 - Linkman string `binding:"required" label:"联系人"` //联系人 - ContractMobile string `binding:"required" label:"联系人手机号"` //联系人手机号 + Phone string //手机号 + NikeName string //昵称 + BusinessLicense string //营业执照 + TaxPhoto string //一般纳税人传的照片 + CorporationName string //企业名 + TaxBillType string //纳税类型 + Taxpayer string //纳税识别号 + OpeningBank string //开户行 + BankAccount string //银行账户 + MakeTax decimal.Decimal //开票税率 + Linkman string //联系人 + ContractMobile string //联系人手机号 } // Add @Title 添加合伙人