jd
/
back
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug

Browse Source
master
KK 3 years ago
parent 26a2f7f79c b87d7dc584
commit 5542f19dcc
9 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File

5
go.mod
Unescape View File

@ -53,3 +53,8 @@ require (
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
gorm.io/gorm v1.21.9
)
replace (
github.com/golangkit/filetag v0.0.0-20191028080317-a753584d7fad => git.oa00.com/go/filetag v1.0.0
github.com/golangkit/formatime v0.0.0-20191104073810-5264c15ae8ec => git.oa00.com/go/formatime v1.0.0
)

8
go.sum
Unescape View File

@ -4,6 +4,10 @@ cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSR
contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
git.oa00.com/go/alipay v1.0.0 h1:/qVT7lKc1FbVnCzpXwsHOZODamsiZzhhCFxjgez1+2o=
git.oa00.com/go/alipay v1.0.0/go.mod h1:GCFXgnZofi69vtV8fMOsHGWZqp958lyXlKfCwvhVBL8=
git.oa00.com/go/filetag v1.0.0 h1:1AD9g6Rz5pW8J5XzvCw0hGNUQsWc3jRKHqRNeXcHdGM=
git.oa00.com/go/filetag v1.0.0/go.mod h1:ENODTSQhpjHIbhNdrE/Id8c97PiwnE93yHLAdyobOeU=
git.oa00.com/go/formatime v1.0.0 h1:DYyHRA58N7MH70oe0wJKboV61Sq+QwoZDCajUP/T14A=
git.oa00.com/go/formatime v1.0.0/go.mod h1:E48/rexcow7/YAIu5O5X/D+NVzFf39jEuENyhRKNlP0=
git.oa00.com/go/mysql v1.0.0 h1:E9H6MF0eYgFovLmVYgyCiwjIestp/wRPWjwKyayg3LI=
git.oa00.com/go/mysql v1.0.0/go.mod h1:pQm9xCn8iFew9egnEPvzAlggGykmAlwV1nqTX5KIXiQ=
github.com/360EntSecGroup-Skylar/excelize/v2 v2.3.0 h1:tDWYNCJrpNnlNg8mVdlzAzPjlPaRbsA/kS8H9LczleQ=
@ -256,10 +260,6 @@ github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golangkit/filetag v0.0.0-20191028080317-a753584d7fad h1:VGThdAYoYITmVANHEXY09ZaTi2QGZR7115+rssto1Wo=
github.com/golangkit/filetag v0.0.0-20191028080317-a753584d7fad/go.mod h1:HFkaR1TkorhpW+j/5cxawyysQuMoiH2Xkq+dVfV6Wc8=
github.com/golangkit/formatime v0.0.0-20191104073810-5264c15ae8ec h1:8TelrfI4V2uNNXvfz9QHh/XDdFJtAlYj3ysgoXgLBUs=
github.com/golangkit/formatime v0.0.0-20191104073810-5264c15ae8ec/go.mod h1:+QKvIP5zPMgGauZzgKIQQ7K0KOhhl/8yu3TVqz35h14=
github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=

2
internal/cron/task.go
Unescape View File

@ -63,7 +63,7 @@ func Task(c *cron.Cron) {
}
if configs.IsProductionEnv() {
go ShaMaMq()
//go ShaMaMq()
}
}

2
internal/v2/controller/wxapp/copartner/company.go
Unescape View File

@ -10,7 +10,7 @@ import (
type Company struct {
}
type argsCompanyAdd struct {
InviteNo string `binding:"required" label:"邀请码"` // 邀请码
InviteNo string // 邀请码
copartner.CompanyInfo
}

2
internal/v2/controller/wxapp/copartner/copartner.go
Unescape View File

@ -10,7 +10,7 @@ import (
type Copartner struct {
}
type argsCopartnerCode struct {
InviteNo string `binding:"required" label:"邀请码"` // 邀请码
InviteNo string // 邀请码
}
// Very @Title 验证邀请码

6
internal/v2/controller/wxapp/copartner/personal.go
Unescape View File

@ -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 添加合伙人

2
internal/v2/logic/company/company.go
Unescape View File

@ -287,7 +287,7 @@ func (o logic) Sure(args CompanySureApply) error {
type CompanyRejectApply struct {
CompanySureApply
Reason string `json:"reason" validate:"required,maxLen=20"`
Reason string `json:"reason" validate:"required"`
}
func (o logic) Reject(args CompanyRejectApply) error {

27
internal/v2/logic/manage/jyy/app.go
Unescape View File

@ -28,12 +28,13 @@ 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"`
TaxType string `json:"tax_type"`
Mobile string `json:"mobile"`
Nickname string `json:"nickname"`
Level uint `json:"level"`
IsOffline bool `json:"is_offline"`
CreatedAt formatime.Second `json:"created_at"`
TaxType string `json:"tax_type"`
IsEnterprise bool `json:"is_enterprise"`
}
func (o logic) AppUser(args AppUserReq) (res []AppUserInfo, total int64, err error) {
@ -42,6 +43,7 @@ func (o logic) AppUser(args AppUserReq) (res []AppUserInfo, total int64, err err
if args.Mobile != "" {
query = query.Where("mobile = ?", args.Mobile)
}
if args.Nickname != "" {
query = query.Where("nickname = ?", args.Nickname)
}
@ -81,12 +83,13 @@ func (o logic) AppUser(args AppUserReq) (res []AppUserInfo, total int64, err err
query.Preload("CompanyInfo").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,
TaxType: v.CompanyInfo.TaxType,
Mobile: v.Mobile,
Nickname: v.Nickname,
Level: uint(v.Level),
IsOffline: v.IsOffline,
CreatedAt: v.CreatedAt,
TaxType: v.CompanyInfo.TaxType,
IsEnterprise: v.IsEnterprise,
})
}
return

24
internal/v2/logic/wxapp/copartner/company.go
Unescape View File

@ -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 添加合伙人

Write Preview
Loading…
Cancel
Save