完善

db/talent.go

@@ -74,7 +74,43 @@ func AccountIncome(ctx context.Context, talentId string) (*http_model.TalentInfo
 		data.ReceiverName = deliveryInfo.ReceiverName
 		data.PhoneNumber = deliveryInfo.PhoneNumber
 		data.DetailAddr = deliveryInfo.DetailAddr
+	} else {
+		data.ReceiverName = "暂未绑定物流地址"
+		data.PhoneNumber = "暂未绑定物流地址"
+		data.DetailAddr = "暂未绑定物流地址"
 	}
+	db2 := GetReadDB(ctx)
+	var talentBankInfo *gorm_model.YounggeeTalentBank
+	err = db2.Debug().Model(gorm_model.YounggeeTalentBank{}).Where("talent_id = ?", talentId).
+		First(&talentBankInfo).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	db3 := GetReadDB(ctx)
+	var infoBank *gorm_model.InfoBank
+	db3.Debug().Model(gorm_model.InfoBank{}).Where("id = ?", talentBankInfo.BankID).First(&infoBank)
+	db4 := GetReadDB(ctx)
+	var infoRegion *gorm_model.InfoRegion
+	db4.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", talentBankInfo.BankOpenAddress).First(&infoRegion)
+
+	provinceCode := conv.MustString(talentBankInfo.BankOpenAddress, "")[0:2] + "0000"
+	var province *gorm_model.InfoRegion
+	db4.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", conv.MustInt(provinceCode, 0)).First(&province)
+
+	cityCode := conv.MustString(talentBankInfo.BankOpenAddress, "")[0:4] + "00"
+	var city *gorm_model.InfoRegion
+	db4.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", conv.MustInt(cityCode, 0)).First(&city)
+
+	data.Bank = infoBank.Name
+	data.BankOpenAddress = province.RegionName + city.RegionName + infoRegion.RegionName
+	data.BankCardNumber = talentBankInfo.BankCardNumber
+	data.Name = talentBankInfo.Name
+	data.AliPayNumber = talentBankInfo.AlipayNumber
+	data.AliPayRealName = talentBankInfo.AlipayRealName
 	return data, err
 }
 

model/gorm_model/info_bank.go

@@ -0,0 +1,11 @@
+// Package gorm_model Code generated by sql2gorm. DO NOT EDIT.
+package gorm_model
+
+type InfoBank struct {
+	ID   int    `gorm:"column:id;primary_key;AUTO_INCREMENT"` // 银行id
+	Name string `gorm:"column:name;NOT NULL"`                 // 银行名称
+}
+
+func (m *InfoBank) TableName() string {
+	return "info_bank"
+}

model/gorm_model/info_region.go

@@ -0,0 +1,14 @@
+// Package gorm_model Code generated by sql2gorm. DO NOT EDIT.
+package gorm_model
+
+type InfoRegion struct {
+	RegionID    uint   `gorm:"column:region_id;primary_key;AUTO_INCREMENT"`
+	SelfCode    uint   `gorm:"column:self_code;NOT NULL"`
+	RegionLevel int    `gorm:"column:region_level;NOT NULL"`
+	ParentCode  uint   `gorm:"column:parent_code"`
+	RegionName  string `gorm:"column:region_name;NOT NULL"`
+}
+
+func (m *InfoRegion) TableName() string {
+	return "info_region"
+}

model/gorm_model/talent_bank_info.go

@@ -0,0 +1,24 @@
+// Package gorm_model Code generated by sql2gorm. DO NOT EDIT.
+package gorm_model
+
+import (
+	"time"
+)
+
+type YounggeeTalentBank struct {
+	ID              int       `gorm:"column:id;primary_key;AUTO_INCREMENT"` // id
+	TalentID        string    `gorm:"column:talent_id;NOT NULL"`            // 达人id，取younggee_talent_info表中的id字段值
+	Name            string    `gorm:"column:name"`                          // 户主姓名
+	Phone           string    `gorm:"column:phone"`                         // 手机号
+	BankID          string    `gorm:"column:bank_id;default:0"`             // 银行id，取info_bank表中的bank_id字段值
+	BankCardNumber  string    `gorm:"column:bank_card_number"`              // 银行卡号
+	BankOpenAddress int       `gorm:"column:bank_open_address"`             // 开户地址区域码，取info_region表中的self_code字段值
+	AlipayNumber    string    `gorm:"column:alipay_number"`                 // 支付宝账号
+	AlipayRealName  string    `gorm:"column:alipay_real_name;default:0"`    // 支付宝真实姓名
+	CreateAt        time.Time `gorm:"column:create_at"`
+	UpdateAt        time.Time `gorm:"column:update_at"`
+}
+
+func (m *YounggeeTalentBank) TableName() string {
+	return "younggee_talent_bank"
+}

model/http_model/account_income.go

@@ -5,13 +5,19 @@ type TalentInfoRequest struct {
 }
 
 type TalentInfoResponse struct {
-	Income       int64  `json:"income"`        // 收益总数
-	Withdrawing  int64  `json:"withdrawing"`   // 提现中金额
-	Canwithdraw  int64  `json:"canwithdraw"`   // 可提现金额
-	Withdrawed   int64  `json:"withdrawed"`    // 已提现金额
-	DetailAddr   string `json:"detail_addr"`   // 详细地址
-	PhoneNumber  string `json:"phone_number"`  // 联系电话
-	ReceiverName string `json:"receiver_name"` // 收货人名字
+	Income          int64  `json:"income"`            // 收益总数
+	Withdrawing     int64  `json:"withdrawing"`       // 提现中金额
+	Canwithdraw     int64  `json:"canwithdraw"`       // 可提现金额
+	Withdrawed      int64  `json:"withdrawed"`        // 已提现金额
+	DetailAddr      string `json:"detail_addr"`       // 详细地址
+	PhoneNumber     string `json:"phone_number"`      // 联系电话
+	ReceiverName    string `json:"receiver_name"`     // 收货人名字
+	Bank            string `json:"bank"`              // 银行
+	Name            string `json:"name"`              // 户主姓名
+	BankOpenAddress string `json:"bank_open_address"` // 开户地址区域编码
+	BankCardNumber  string `json:"bank_card_number"`  // 银行卡号
+	AliPayNumber    string `json:"ali_pay_number"`    // 支付宝账号
+	AliPayRealName  string `json:"ali_pay_real_name"` // 支付宝真实姓名
 }
 
 func NewTalentInfoRequest() *TalentInfoRequest {