2023.2.15

app/api/youngee_talent_api/talent_auth_post_api.go

@@ -20,6 +20,16 @@ func (*talentAuthPostApi) TalentInfo(r *ghttp.Request) {
 	}
 }
 
+// TalentInfo 提交达人个人资料
+func (*talentAuthPostApi) UpdateTalentInfo(r *ghttp.Request) {
+	res := youngee_talent_service.OnUpdateTalentInfo(r)
+
+	err := r.Response.WriteJson(res)
+	if err != nil {
+		panic("write response error")
+	}
+}
+
 // AddTalentAddress 添加达人收货地址
 // youngee_talent_delivery_address
 func (*talentAuthPostApi) AddTalentAddress(r *ghttp.Request) {

app/dao/internal/youngee_talent_info.go

@@ -21,6 +21,7 @@ type YoungeeTalentInfoDao struct {
 type YoungeeTalentInfoColumns struct {
 	Id                string // 达人id
 	TalentWxOpenid    string // 达人的微信openid
+	Avatar            string //
 	TalentWxNickname  string // 达人的微信昵称
 	Income            string // 收益总数
 	Withdrawing       string // 提现中金额
@@ -48,6 +49,7 @@ type YoungeeTalentInfoColumns struct {
 var youngeeTalentInfoColumns = YoungeeTalentInfoColumns{
 	Id:                "id",
 	TalentWxOpenid:    "talent_wx_openid",
+	Avatar:            "avatar",
 	TalentWxNickname:  "talent_wx_nickname",
 	Income:            "income",
 	Withdrawing:       "withdrawing",

app/dao/internal/younggee_talent_bank.go

@@ -23,7 +23,7 @@ type YounggeeTalentBankColumns struct {
 	TalentId        string // 达人id，取younggee_talent_info表中的id字段值
 	Name            string // 户主姓名
 	Phone           string // 手机号
-	BankId          string // 银行id，取info_bank表中的bank_id字段值
+	Bank            string // 银行id，取info_bank表中的bank_id字段值
 	BankCardNumber  string // 银行卡号
 	BankOpenAddress string // 开户地址区域码，取info_region表中的self_code字段值
 	AlipayNumber    string // 支付宝账号
@@ -40,7 +40,7 @@ var younggeeTalentBankColumns = YounggeeTalentBankColumns{
 	TalentId:        "talent_id",
 	Name:            "name",
 	Phone:           "phone",
-	BankId:          "bank_id",
+	Bank:            "bank",
 	BankCardNumber:  "bank_card_number",
 	BankOpenAddress: "bank_open_address",
 	AlipayNumber:    "alipay_number",

app/model/model.go

@@ -943,6 +943,7 @@ type YoungeeTalentDeliveryAddress struct {
 type YoungeeTalentInfo struct {
 	Id                string      `orm:"id,primary"          json:"id"`                  // 达人id
 	TalentWxOpenid    string      `orm:"talent_wx_openid"    json:"talent_wx_openid"`    // 达人的微信openid
+	Avatar            string      `orm:"avatar"              json:"avatar"`              //
 	TalentWxNickname  string      `orm:"talent_wx_nickname"  json:"talent_wx_nickname"`  // 达人的微信昵称
 	Income            float64     `orm:"income"              json:"income"`              // 收益总数
 	Withdrawing       float64     `orm:"withdrawing"         json:"withdrawing"`         // 提现中金额
@@ -952,11 +953,11 @@ type YoungeeTalentInfo struct {
 	TalentAgeBracket  int         `orm:"talent_age_bracket"  json:"talent_age_bracket"`  // 年龄段，取tallent_age_bracket表id
 	TalentNationality int         `orm:"talent_nationality"  json:"talent_nationality"`  // 国籍，取tallent_nationality表id
 	VisitStoreRegion  int         `orm:"visit_store_region"  json:"visit_store_region"`  // 探店区域，取region_info表中的self_code
-	IsBindInfo        uint        `orm:"is_bind_info"        json:"is_bind_info"`        // 是否填写个人资料
+	IsBindInfo        int         `orm:"is_bind_info"        json:"is_bind_info"`        // 是否填写个人资料
 	IsBindAccount     int         `orm:"is_bind_account"     json:"is_bind_account"`     // 是否绑定账号，1是0否
-	IsBindLocation    uint        `orm:"is_bind_location"    json:"is_bind_location"`    // 是否绑定收货地址
-	IsBindBank        uint        `orm:"is_bind_bank"        json:"is_bind_bank"`        // 是否绑定银行账户信息
-	InBlacklist       uint        `orm:"in_blacklist"        json:"in_blacklist"`        // 是否加入黑名单 0否 1是
+	IsBindLocation    int         `orm:"is_bind_location"    json:"is_bind_location"`    // 是否绑定收货地址
+	IsBindBank        int         `orm:"is_bind_bank"        json:"is_bind_bank"`        // 是否绑定银行账户信息
+	InBlacklist       int         `orm:"in_blacklist"        json:"in_blacklist"`        // 是否加入黑名单 0否 1是
 	TaskAll           int         `orm:"task_all"            json:"task_all"`            // 任务总数
 	TaskApply         int         `orm:"task_apply"          json:"task_apply"`          // 报名任务数量
 	TaskExecute       int         `orm:"task_execute"        json:"task_execute"`        // 执行中任务数量
@@ -1212,7 +1213,7 @@ type YounggeeTalentBank struct {
 	TalentId        string      `orm:"talent_id,unique"  json:"talent_id"`         // 达人id，取younggee_talent_info表中的id字段值
 	Name            string      `orm:"name"              json:"name"`              // 户主姓名
 	Phone           string      `orm:"phone"             json:"phone"`             // 手机号
-	BankId          string      `orm:"bank_id"           json:"bank_id"`           // 银行id，取info_bank表中的bank_id字段值
+	Bank            string      `orm:"bank"              json:"bank"`              // 银行id，取info_bank表中的bank_id字段值
 	BankCardNumber  string      `orm:"bank_card_number"  json:"bank_card_number"`  // 银行卡号
 	BankOpenAddress int         `orm:"bank_open_address" json:"bank_open_address"` // 开户地址区域码，取info_region表中的self_code字段值
 	AlipayNumber    string      `orm:"alipay_number"     json:"alipay_number"`     // 支付宝账号

app/model/youngee_talent_model/talent_bank.go

@@ -9,7 +9,7 @@ type TalentBankInfo struct {
 	TalentId        string `json:"talent_id"`         // 达人id(youngee_talent_info表中的id)
 	Name            string `json:"name"`              // 户主姓名
 	Phone           string `json:"phone"`             // 手机号
-	BankId          string `json:"bank_id"`           // 银行id，取info_bank表中的bank_id字段值
+	Bank            string `json:"bank"`              // 银行
 	BankCardNumber  string `json:"bank_card_number"`  // 银行卡号
 	BankOpenAddress int    `json:"bank_open_address"` // 开户地址区域码，取info_region表中的self_code字段值
 	AlipayNumber    string `json:"alipay_number"`     // 支付宝账号

app/model/youngee_talent_model/talent_info.go

@@ -6,6 +6,8 @@ import (
 
 // TalentSelfInputInfo 达人端用户输入的属性
 type TalentSelfInputInfo struct {
+	Avatar            string `json:"avatar"`
+	TalentWxNickname  string `json:"talent_wx_nickname"`  // 昵称
 	TalentPhoneNumber string `json:"talent_phone_number"` // 电话号码
 	TalentAgeBracket  int    `json:"talent_age_bracket"`  // 年龄段，取tallent_age_bracket表id
 	TalentNationality int    `json:"talent_nationality"`  // 国籍，取tallent_nationality表id

app/model/youngee_talent_model/task_info.go

@@ -64,6 +64,9 @@ type TaskInfoBriefList struct {
 }
 type EXETaskInfoBriefList struct {
 	List1 []*TaskInfoBrief `json:"list1"`
+	List2 []*TaskInfoBrief `json:"list2"`
+	List3 []*TaskInfoBrief `json:"list3"`
+	List4 []*TaskInfoBrief `json:"list4"`
 }
 
 type TaskNum struct {

app/model/youngee_talent_model/wx_login_info.go

@@ -4,10 +4,13 @@ package youngee_talent_model
 type WxLoginInfo struct {
 	Code     string `json:"code" v:"required#code must not be null"`
 	Nickname string `json:"nickname" v:"required#nickname must not be null"`
+	Avatar   string `json:"avatar" v:"required#avatar must not be null"`
 	Gender   int    `json:"gender" v:"required#gender must not be null"`
 }
 
 // LoginResultData 服务端处理完达人登录流程后返回给达人端的信息
 type LoginResultData struct {
-	Token string `json:"token"`
+	Token    string `json:"token"`
+	Nickname string `json:"nickname"`
+	Avatar   string `json:"avatar"`
 }

app/service/youngee_talent_service/talent_info.go

@@ -28,6 +28,24 @@ func OnPostTalentInfo(r *ghttp.Request) *TalentHttpResult {
 	return &TalentHttpResult{Code: 0, Msg: "success"}
 }
 
+func OnUpdateTalentInfo(r *ghttp.Request) *TalentHttpResult {
+	tid, err := utils.SessionTalentInfo.GetTalentIdFromSession(r)
+	if err != nil {
+		return &TalentHttpResult{Code: -1, Msg: "Get talent info failed"}
+	}
+	var infos *youngee_talent_model.TalentSelfInputInfo
+	err = r.ParseForm(&infos)
+	if err != nil {
+		return &TalentHttpResult{Code: -2, Msg: err.Error()}
+	}
+	_, err = g.DB().Model(dao.YoungeeTalentInfo.Table).Data(g.Map{"talent_wx_nickname": infos.TalentWxNickname, "avatar": infos.Avatar}).Where("id = ?", tid).Update()
+	if err != nil {
+		return &TalentHttpResult{Code: -4, Msg: "update failed"}
+	}
+
+	return &TalentHttpResult{Code: 0, Msg: "success"}
+}
+
 func GetTalentInfo(r *ghttp.Request) *TalentHttpResult {
 	tid, err := utils.SessionTalentInfo.GetTalentIdFromSession(r)
 	if err != nil {

app/service/youngee_talent_service/task_data.go

@@ -154,7 +154,7 @@ func GetTaskData(r *ghttp.Request) *TalentHttpResult {
 func GetUnSubmitTaskData(r *ghttp.Request) *TalentHttpResult {
 	taskId := r.Get("task_id")
 
-	res, err := g.DB().Model(dao.YounggeeDataInfo.Table).Where("is_submit = 0 and task_id = ?", taskId).One()
+	res, err := g.DB().Model(dao.YounggeeDataInfo.Table).Where("is_review = 0 and task_id = ?", taskId).One()
 	if err != nil {
 		return &TalentHttpResult{Code: -1, Msg: err.Error()}
 	}

app/service/youngee_talent_service/task_income.go

@@ -150,8 +150,14 @@ func Withdraw(r *ghttp.Request) *TalentHttpResult {
 			return err1
 		}
 		for _, taskId := range taskIdListStr {
+			taskInfo := model.YoungeeTaskInfo{}
+			err1 = tx.Ctx(ctx).Model(dao.YoungeeTaskInfo.Table).Where("task_id = ?", taskId).Scan(&taskInfo)
+			if err1 != nil {
+				fmt.Printf("[Withdraw Transaction] Error:%+v\n", err1)
+				return err1
+			}
 			projectInfo := model.ProjectInfo{}
-			err1 = tx.Ctx(ctx).Model(model.ProjectInfo{}).Where("project_id = ?", taskId).Scan(&projectInfo)
+			err1 = tx.Ctx(ctx).Model(model.ProjectInfo{}).Where("project_id = ?", taskInfo.ProjectId).Scan(&projectInfo)
 			if err1 != nil {
 				fmt.Printf("[Withdraw Transaction] Error:%+v\n", err1)
 				return err1

app/service/youngee_talent_service/task_info.go

@@ -87,8 +87,10 @@ func SignUpTask(r *ghttp.Request) *TalentHttpResult {
 		// 2.1 查询所有对应定价策略
 		whereStr1 := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", strategy.FeeForm, projectDetail.ProjectPlatform, strategy.FollowersLow, strategy.FollowersLow)
 		orStr1 := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", strategy.FeeForm, projectDetail.ProjectPlatform, strategy.FollowersUp, strategy.FollowersUp)
+		orStr2 := fmt.Sprintf("fee_form = %d and platform = %d and fans_low >= %d and fans_up <= %d", strategy.FeeForm, projectDetail.ProjectPlatform, strategy.FollowersLow, strategy.FollowersUp)
+		orStr3 := fmt.Sprintf("fee_form = %d and platform = %d and fans_low <= %d and fans_up >= %d", strategy.FeeForm, projectDetail.ProjectPlatform, strategy.FollowersLow, strategy.FollowersUp)
 		var pricings []*model.InfoPricingStrategy
-		err = g.DB().Model("info_pricing_strategy").WithAll().Where(whereStr1).Or(orStr1).Scan(&pricings)
+		err = g.DB().Model("info_pricing_strategy").WithAll().Where(whereStr1).Or(orStr1).Or(orStr2).Or(orStr3).Scan(&pricings)
 		if err != nil {
 			return &TalentHttpResult{Code: -11, Msg: err.Error()}
 		} else if pricings == nil {
@@ -299,25 +301,25 @@ func GetExeTaskBriefList(r *ghttp.Request) *TalentHttpResult {
 	if err != nil {
 		return &TalentHttpResult{Code: -1, Msg: "Get talent info failed"}
 	}
-	var taskStageList = [5]int{0, 7, 9, 11, 13}
-	taskStageKey := r.GetQueryInt("taskStage", 0)
-	if taskStageKey == 0 {
-		return &TalentHttpResult{Code: -2, Msg: "parse param error"}
-	}
-	taskStage := taskStageList[taskStageKey]
+	// var taskStageList = [5]int{0, 7, 9, 11, 13}
+	// taskStageKey := r.GetQueryInt("taskStage", 0)
+	// if taskStageKey == 0 {
+	// 	return &TalentHttpResult{Code: -2, Msg: "parse param error"}
+	// }
+	// taskStage := taskStageList[taskStageKey]
 
-	// 获取任务列表
-	var taskList []*model.YoungeeTaskInfo
-	err = g.Model(dao.YoungeeTaskInfo.Table).Where("talent_id = ?", tid).And("task_stage = ?", taskStage).Scan(&taskList)
-	if err != nil {
-		return &TalentHttpResult{Code: -1, Msg: "Get task list failed"}
-	}
 	// // 获取任务列表
 	// var taskList []*model.YoungeeTaskInfo
-	// err = g.Model(dao.YoungeeTaskInfo.Table).Where("talent_id = ?", tid).And("task_stage IN(?)", g.Slice{7, 9, 11, 13}).Scan(&taskList)
+	// err = g.Model(dao.YoungeeTaskInfo.Table).Where("talent_id = ?", tid).And("task_stage = ?", taskStage).Scan(&taskList)
 	// if err != nil {
 	// 	return &TalentHttpResult{Code: -1, Msg: "Get task list failed"}
 	// }
+	// 获取任务列表
+	var taskList []*model.YoungeeTaskInfo
+	err = g.Model(dao.YoungeeTaskInfo.Table).Where("talent_id = ?", tid).And("task_stage IN(?)", g.Slice{7, 9, 11, 13}).Scan(&taskList)
+	if err != nil {
+		return &TalentHttpResult{Code: -1, Msg: "Get task list failed"}
+	}
 
 	// 为每个任务根据项目id查询项目名称和主图
 	taskBriefList := youngee_talent_model.EXETaskInfoBriefList{}
@@ -348,16 +350,16 @@ func GetExeTaskBriefList(r *ghttp.Request) *TalentHttpResult {
 			ScriptStatus:     v.ScriptStatus,
 			SketchStatus:     v.SketchStatus,
 		}
-		taskBriefList.List1 = append(taskBriefList.List1, taskInfoBrief)
-		// if v.TaskStage == 7 {
-		// 	taskBriefList.List1 = append(taskBriefList.List1, taskInfoBrief)
-		// } else if v.TaskStage == 9 {
-		// 	taskBriefList.List2 = append(taskBriefList.List2, taskInfoBrief)
-		// } else if v.TaskStage == 11 {
-		// 	taskBriefList.List3 = append(taskBriefList.List3, taskInfoBrief)
-		// } else if v.TaskStage == 13 {
-		// 	taskBriefList.List4 = append(taskBriefList.List4, taskInfoBrief)
-		// }
+		// taskBriefList.List1 = append(taskBriefList.List1, taskInfoBrief)
+		if v.TaskStage == 7 {
+			taskBriefList.List1 = append(taskBriefList.List1, taskInfoBrief)
+		} else if v.TaskStage == 9 {
+			taskBriefList.List2 = append(taskBriefList.List2, taskInfoBrief)
+		} else if v.TaskStage == 11 {
+			taskBriefList.List3 = append(taskBriefList.List3, taskInfoBrief)
+		} else if v.TaskStage == 13 {
+			taskBriefList.List4 = append(taskBriefList.List4, taskInfoBrief)
+		}
 	}
 
 	return &TalentHttpResult{Code: 0, Msg: "success", Data: taskBriefList}

app/service/youngee_talent_service/task_link.go

@@ -151,7 +151,7 @@ func GetTaskLink(r *ghttp.Request) *TalentHttpResult {
 func GetUnSubmitTaskLink(r *ghttp.Request) *TalentHttpResult {
 	taskId := r.Get("task_id")
 
-	res, err := g.DB().Model(dao.YounggeeLinkInfo.Table).Where("is_submit = 0 and task_id = ?", taskId).One()
+	res, err := g.DB().Model(dao.YounggeeLinkInfo.Table).Where("is_review = 0 and task_id = ?", taskId).One()
 	if err != nil {
 		return &TalentHttpResult{Code: -1, Msg: err.Error()}
 	}

app/service/youngee_talent_service/task_script.go

@@ -150,7 +150,7 @@ func GetTaskScript(r *ghttp.Request) *TalentHttpResult {
 func GetUnSubmitTaskScript(r *ghttp.Request) *TalentHttpResult {
 	taskId := r.Get("task_id")
 
-	res, err := g.DB().Model(dao.YounggeeScriptInfo.Table).Where("is_submit = 0 and task_id = ?", taskId).OrderAsc("submit_at").One()
+	res, err := g.DB().Model(dao.YounggeeScriptInfo.Table).Where("is_review = 0 and task_id = ?", taskId).OrderAsc("submit_at").One()
 	if err != nil {
 		return &TalentHttpResult{Code: -1, Msg: err.Error()}
 	}

app/service/youngee_talent_service/task_sketch.go

@@ -176,7 +176,7 @@ func GetUnSubmitTaskSketch(r *ghttp.Request) *TalentHttpResult {
 	taskId := r.Get("task_id")
 
 	var unSubmitSketch *youngee_talent_model.TaskSketchInfo
-	err := g.DB().Model(dao.YounggeeSketchInfo.Table).Where("is_submit = 0 and task_id = ?", taskId).OrderAsc("submit_at").Scan(&unSubmitSketch)
+	err := g.DB().Model(dao.YounggeeSketchInfo.Table).Where("is_review = 0 and task_id = ?", taskId).OrderAsc("submit_at").Scan(&unSubmitSketch)
 	if err != nil {
 		return &TalentHttpResult{Code: -1, Msg: err.Error()}
 	}

app/service/youngee_talent_service/wxlogin.go

@@ -65,7 +65,7 @@ func WxLogin(r *ghttp.Request) *TalentHttpResult {
 	if rec != nil && rec[dao.YoungeeTalentInfo.Columns.InBlacklist].Int() > 0 {
 		return &TalentHttpResult{Code: -6, Msg: "in black list"}
 	}
-
+	res := youngee_talent_model.LoginResultData{}
 	var newTalentId string
 	if rec == nil {
 		// 如果数据库中不存在此达人，则插入新的达人信息
@@ -74,6 +74,7 @@ func WxLogin(r *ghttp.Request) *TalentHttpResult {
 		talentInfo := model.YoungeeTalentInfo{
 			Id:               newTalentId,
 			TalentWxOpenid:   wxResp.OpenId,
+			Avatar:           l.Avatar,
 			TalentWxNickname: l.Nickname,
 			Canwithdraw:      0,
 			Income:           0,
@@ -82,6 +83,8 @@ func WxLogin(r *ghttp.Request) *TalentHttpResult {
 			LastLoginDate:    gtime.Now(),
 			CreateDate:       gtime.Now(),
 		}
+		res.Avatar = l.Avatar
+		res.Nickname = l.Nickname
 		_, err = g.DB().Model(dao.YoungeeTalentInfo.Table).Data(talentInfo).Insert()
 		if err != nil {
 			return &TalentHttpResult{Code: -7, Msg: "get talentId failed"}
@@ -89,7 +92,8 @@ func WxLogin(r *ghttp.Request) *TalentHttpResult {
 	} else {
 		// 如果已存在达人，则读取达人id
 		newTalentId = rec["id"].String()
-
+		res.Avatar = rec["avatar"].String()
+		res.Nickname = rec["talent_wx_nickname"].String()
 		// 更新达人最近登录时间
 		_, err = g.DB().Model(dao.YoungeeTalentInfo.Table).Data(
 			g.Map{
@@ -105,6 +109,7 @@ func WxLogin(r *ghttp.Request) *TalentHttpResult {
 	if err != nil {
 		return &TalentHttpResult{Code: -9, Msg: "generate key failed"}
 	}
+	res.Token = token
 
 	// 以token为键保存session
 	err = r.Session.Set(token, g.Map{
@@ -118,7 +123,7 @@ func WxLogin(r *ghttp.Request) *TalentHttpResult {
 	}
 
 	// 生成自己的session_key返回给小程序
-	return &TalentHttpResult{Code: 0, Msg: "success", Data: youngee_talent_model.LoginResultData{Token: token}}
+	return &TalentHttpResult{Code: 0, Msg: "success", Data: res}
 }
 
 func IsLogin(r *ghttp.Request) *TalentHttpResult {

config/config.toml

@@ -19,7 +19,7 @@ name = "youngmini_server"
 output = "./bin"
 pack = ""
 system = "linux,windows"
-version = "v6.0.5"
+version = "v7.0.2"
 [gfcli.gen.dao]
 jsonCase = "Snake"
 link = "mysql:talent:talentDB_123@tcp(139.9.53.143:3306)/youngmini"