fiee/fonchain-fiee
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加邮箱和境外手机号

Browse Source
This commit is contained in:
JNG 2026-01-04 15:13:45 +08:00
parent 09dc29b966
commit 4e9720e14d
8 changed files with 3528 additions and 7823 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
api/accountFiee/accountFiee.pb.go
View File

@ -745,6 +745,9 @@ type UserListInfo struct {
IdNumber string `protobuf:"bytes,21,opt,name=idNumber,proto3" json:"idNumber"`
DateOfBirth string `protobuf:"bytes,22,opt,name=dateOfBirth,proto3" json:"dateOfBirth"`
Age string `protobuf:"bytes,23,opt,name=age,proto3" json:"age"`
Email string `protobuf:"bytes,24,opt,name=email,proto3" json:"email"`
AbroadTelAreaCode string `protobuf:"bytes,25,opt,name=AbroadTelAreaCode,proto3" json:"AbroadTelAreaCode"`
AbroadTel string `protobuf:"bytes,26,opt,name=AbroadTel,proto3" json:"AbroadTel"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -940,6 +943,27 @@ func (x *UserListInfo) GetAge() string {
return ""
}
func (x *UserListInfo) GetEmail() string {
if x != nil {
return x.Email
}
return ""
}
func (x *UserListInfo) GetAbroadTelAreaCode() string {
if x != nil {
return x.AbroadTelAreaCode
}
return ""
}
func (x *UserListInfo) GetAbroadTel() string {
if x != nil {
return x.AbroadTel
}
return ""
}
type UserListRequest struct {
state protoimpl.MessageState `protogen:"open.v1"`
Domain string `protobuf:"bytes,1,opt,name=domain,proto3" json:"domain"`
@ -1103,6 +1127,9 @@ type UserInfoResponse struct {
TelAreaCode string `protobuf:"bytes,19,opt,name=telAreaCode,proto3" json:"telAreaCode"`
IdNumber string `protobuf:"bytes,20,opt,name=idNumber,proto3" json:"idNumber"`
DateOfBirth string `protobuf:"bytes,21,opt,name=dateOfBirth,proto3" json:"dateOfBirth"`
Email string `protobuf:"bytes,22,opt,name=email,proto3" json:"email"`
AbroadTelAreaCode string `protobuf:"bytes,23,opt,name=AbroadTelAreaCode,proto3" json:"AbroadTelAreaCode"`
AbroadTel string `protobuf:"bytes,24,opt,name=AbroadTel,proto3" json:"AbroadTel"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -1284,6 +1311,27 @@ func (x *UserInfoResponse) GetDateOfBirth() string {
return ""
}
func (x *UserInfoResponse) GetEmail() string {
if x != nil {
return x.Email
}
return ""
}
func (x *UserInfoResponse) GetAbroadTelAreaCode() string {
if x != nil {
return x.AbroadTelAreaCode
}
return ""
}
func (x *UserInfoResponse) GetAbroadTel() string {
if x != nil {
return x.AbroadTel
}
return ""
}
type RealNameResponse struct {
state protoimpl.MessageState `protogen:"open.v1"`
Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id"`
@ -4396,6 +4444,9 @@ type UpdateRequest struct {
Domain string `protobuf:"bytes,2,opt,name=Domain,json=domain,proto3" json:"Domain"`
Language string `protobuf:"bytes,3,opt,name=Language,json=language,proto3" json:"Language"`
NickName string `protobuf:"bytes,4,opt,name=NickName,json=nickName,proto3" json:"NickName"`
Email string `protobuf:"bytes,5,opt,name=Email,json=email,proto3" json:"Email"`
AbroadTel string `protobuf:"bytes,6,opt,name=AbroadTel,json=abroadTel,proto3" json:"AbroadTel"`
AbroadTelAreaCode string `protobuf:"bytes,7,opt,name=AbroadTelAreaCode,json=abroadTelAreaCode,proto3" json:"AbroadTelAreaCode"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -4458,6 +4509,27 @@ func (x *UpdateRequest) GetNickName() string {
return ""
}
func (x *UpdateRequest) GetEmail() string {
if x != nil {
return x.Email
}
return ""
}
func (x *UpdateRequest) GetAbroadTel() string {
if x != nil {
return x.AbroadTel
}
return ""
}
func (x *UpdateRequest) GetAbroadTelAreaCode() string {
if x != nil {
return x.AbroadTelAreaCode
}
return ""
}
type Operator struct {
state protoimpl.MessageState `protogen:"open.v1"`
ID uint32 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID"`
@ -10124,7 +10196,7 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\x05count\x18\x01 \x01(\x04R\x05count\x12\x12\n" +
"\x04page\x18\x02 \x01(\x04R\x04page\x12\x1a\n" +
"\bpageSize\x18\x03 \x01(\x04R\bpageSize\x125\n" +
"\buserList\x18\x04 \x03(\v2\x19.accountFiee.UserListInfoR\buserList\"\xd2\x05\n" +
"\buserList\x18\x04 \x03(\v2\x19.accountFiee.UserListInfoR\buserList\"\xb4\x06\n" +
"\fUserListInfo\x12\x0e\n" +
"\x02id\x18\x01 \x01(\x04R\x02id\x12\x16\n" +
"\x06status\x18\x02 \x01(\x05R\x06status\x12\x12\n" +
@ -10153,7 +10225,10 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\bnickName\x18\x14 \x01(\tR\bnickName\x12\x1a\n" +
"\bidNumber\x18\x15 \x01(\tR\bidNumber\x12 \n" +
"\vdateOfBirth\x18\x16 \x01(\tR\vdateOfBirth\x12\x10\n" +
"\x03age\x18\x17 \x01(\tR\x03age\"\xff\x02\n" +
"\x03age\x18\x17 \x01(\tR\x03age\x12\x14\n" +
"\x05email\x18\x18 \x01(\tR\x05email\x12,\n" +
"\x11AbroadTelAreaCode\x18\x19 \x01(\tR\x11AbroadTelAreaCode\x12\x1c\n" +
"\tAbroadTel\x18\x1a \x01(\tR\tAbroadTel\"\xff\x02\n" +
"\x0fUserListRequest\x12\x16\n" +
"\x06domain\x18\x01 \x01(\tR\x06domain\x12\x16\n" +
"\x06subNum\x18\x02 \x01(\tR\x06subNum\x12$\n" +
@ -10168,7 +10243,7 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
" \x01(\tR\vblurNameTel\x12\x10\n" +
"\x03ids\x18\v \x03(\x03R\x03ids\x12 \n" +
"\vnationality\x18\f \x01(\tR\vnationality\x12$\n" +
"\rnameAndNumber\x18\r \x01(\tR\rnameAndNumber\"\x92\x05\n" +
"\rnameAndNumber\x18\r \x01(\tR\rnameAndNumber\"\xf4\x05\n" +
"\x10UserInfoResponse\x12\x0e\n" +
"\x02id\x18\x01 \x01(\x04R\x02id\x12\x16\n" +
"\x06status\x18\x02 \x01(\x05R\x06status\x12\x12\n" +
@ -10195,7 +10270,10 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\x06telNum\x18\x12 \x01(\tR\x06telNum\x12 \n" +
"\vtelAreaCode\x18\x13 \x01(\tR\vtelAreaCode\x12\x1a\n" +
"\bidNumber\x18\x14 \x01(\tR\bidNumber\x12 \n" +
"\vdateOfBirth\x18\x15 \x01(\tR\vdateOfBirth\":\n" +
"\vdateOfBirth\x18\x15 \x01(\tR\vdateOfBirth\x12\x14\n" +
"\x05email\x18\x16 \x01(\tR\x05email\x12,\n" +
"\x11AbroadTelAreaCode\x18\x17 \x01(\tR\x11AbroadTelAreaCode\x12\x1c\n" +
"\tAbroadTel\x18\x18 \x01(\tR\tAbroadTel\":\n" +
"\x10RealNameResponse\x12\x0e\n" +
"\x02id\x18\x01 \x01(\x04R\x02id\x12\x16\n" +
"\x06status\x18\x02 \x01(\tR\x06status\"\x83\x03\n" +
@ -10461,12 +10539,15 @@ const file_api_accountFiee_accountFiee_proto_rawDesc = "" +
"\x14WriteOffListResponse\x12\x14\n" +
"\x05total\x18\x01 \x01(\x03R\x05total\x12@\n" +
"\fwriteOffList\x18\x02 \x03(\v2\x1c.accountFiee.WriteOffRequestR\fwriteOffList\"\x10\n" +
"\x0eRemoveResponse\"o\n" +
"\x0eRemoveResponse\"\xd1\x01\n" +
"\rUpdateRequest\x12\x0e\n" +
"\x02ID\x18\x01 \x01(\x04R\x02ID\x12\x16\n" +
"\x06Domain\x18\x02 \x01(\tR\x06domain\x12\x1a\n" +
"\bLanguage\x18\x03 \x01(\tR\blanguage\x12\x1a\n" +
"\bNickName\x18\x04 \x01(\tR\bnickName\".\n" +
"\bNickName\x18\x04 \x01(\tR\bnickName\x12\x14\n" +
"\x05Email\x18\x05 \x01(\tR\x05email\x12\x1c\n" +
"\tAbroadTel\x18\x06 \x01(\tR\tabroadTel\x12,\n" +
"\x11AbroadTelAreaCode\x18\a \x01(\tR\x11abroadTelAreaCode\".\n" +
"\bOperator\x12\x0e\n" +
"\x02ID\x18\x01 \x01(\rR\x02ID\x12\x12\n" +
"\x04Name\x18\x02 \x01(\tR\x04Name\"\x82\x01\n" +

10
api/accountFiee/accountFiee.proto
View File

@ -183,6 +183,9 @@ message UserListInfo{
string idNumber = 21;
string dateOfBirth = 22;
string age = 23;
string email = 24;
string AbroadTelAreaCode = 25;
string AbroadTel = 26;
}
message UserListRequest{
string domain = 1;
@ -221,6 +224,10 @@ message UserInfoResponse{
string telAreaCode = 19;
string idNumber = 20;
string dateOfBirth = 21;
string email = 22;
string AbroadTelAreaCode = 23;
string AbroadTel = 24;
}
message RealNameResponse{
uint64 id = 1;
@ -541,6 +548,9 @@ message UpdateRequest {
string Domain = 2 [json_name = "domain"];
string Language = 3 [json_name = "language"];
string NickName = 4 [json_name = "nickName"];
string Email = 5 [json_name = "email"];
string AbroadTel = 6 [json_name = "abroadTel"];
string AbroadTelAreaCode = 7 [json_name = "abroadTelAreaCode"];
}
message Operator {

8915
api/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

4
api/bundle/bundle_triple.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-triple. DO NOT EDIT.
// versions:
// - protoc-gen-go-triple v1.0.8
// - protoc v3.21.1
// - protoc-gen-go-triple v1.0.5
// - protoc v6.32.0
// source: pb/bundle.proto
package bundle

1
pkg/router/router.go
View File

@ -83,6 +83,7 @@ func NewRouter() *gin.Engine {
{
webAcRouter.POST("list", account.UserList) //用户列表
webAcRouter.POST("approval", account.UserApproval) //实名审核
webAcRouter.POST("admin-update", account.AdminUpdate) //更新用户信息
webAcRouter.POST("excel/download", account.UserExcelDownload) //excel下载
}
}

31
pkg/service/account/account.go
View File

@ -130,6 +130,37 @@ func UserUpdate(c *gin.Context) {
Domain: req.Domain,
Language: req.Language,
NickName: req.NickName,
Email: req.Email,
AbroadTel: req.AbroadTel,
AbroadTelAreaCode: req.AbroadTelAreaCode,
})
if err != nil {
service.Error(c, err)
return
}
service.Success(c, res)
return
}
func AdminUpdate(c *gin.Context) {
var req account.UpdateRequest
if err := c.ShouldBindBodyWith(&req, binding.JSON); err != nil {
service.Error(c, err)
return
}
if req.ID == 0 {
service.Error(c, errors.New("用户ID不能为空"))
return
}
req.Domain = "app"
res, err := service.AccountFieeProvider.Update(c, &account.UpdateRequest{
ID: req.ID,
Domain: req.Domain,
//Language: req.Language,
//NickName: req.NickName,
Email: req.Email,
AbroadTel: req.AbroadTel,
AbroadTelAreaCode: req.AbroadTelAreaCode,
})
if err != nil {
service.Error(c, err)

4
pkg/service/bundle/bundleOrder.go
View File

@ -250,6 +250,10 @@ func CreateBundleOrderSignature(c *gin.Context) {
// 组装订单信息
req = logic.BuildOrderRequest(req, userInfo, bundleDetail, addRecords, addTotalPrice, lastContractNo, signContract)
// 校验发布平台
if len(req.PlatformIds) == 0 {
req.PlatformIds = []uint32{1, 4, 5}
}
// 创建订单
res, err := service.BundleProvider.CreateOrderRecord(context.Background(), &req)
if err != nil {

1
pkg/service/bundle/reconciliation.go
View File

@ -416,6 +416,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
orderReq.OrderNo = unfinishInfo.OrderNo
//expirationTime := t.AddDate(10, 0, 0).Format("2006-01-02 15:04:05")
//orderReq.ExpirationTime = expirationTime
orderReq.PlatformIds = []uint32{1, 4, 5}
_, err = service.BundleProvider.CreateOrderRecord(context.Background(), &orderReq)
if err != nil {
service.Error(c, err)