modify userInfo

controllers/task.go

@@ -2135,7 +2135,7 @@ func (server *TaskController) Examples() {
 
 	var types []*models.Model
 
-	sql := fmt.Sprintf("SELECT count(*) FROM task_type WHERE deleted = 0 and access_status = 1 %s;", where)
+	sql := fmt.Sprintf("SELECT count(*) FROM task_type WHERE deleted = 0 %s;", where)
 	var total int64
 	mysql.GetMysqlInstace().Ormer.Raw(sql).QueryRow(&total)
 	logs.Debug("total = %d", total)
@@ -2151,7 +2151,7 @@ func (server *TaskController) Examples() {
 		return
 	}
 
-	sql = fmt.Sprintf("SELECT id, `name` AS tit,type,`desc` AS content, tags ,examples,codes,base_model,model,api_path,version,category,form,access_status,publish_status FROM task_type WHERE deleted = 0 and access_status = 1 %s order by codes desc LIMIT %d,%d;", where, offset, size)
+	sql = fmt.Sprintf("SELECT id, `name` AS tit,type,`desc` AS content, tags ,price,examples,codes,base_model,model,api_path,version,category,form,access_status,publish_status FROM task_type WHERE deleted = 0 %s order by codes desc LIMIT %d,%d;", where, offset, size)
 	mysql.GetMysqlInstace().Ormer.Raw(sql).QueryRows(&types)
 	var remodels []*models.ResonseModel
 	for _, data := range types {
@@ -2197,6 +2197,7 @@ func (server *TaskController) Examples() {
 			ResultFileExpires: data.ResultFileExpires,
 			AccessStatus:      data.AccessStatus,
 			PublishStatus:     data.PublishStatus,
+			Price:             float64(data.Price / 1000000),
 		}
 		remodels = append(remodels, &remodel)
 	}
@@ -2210,6 +2211,39 @@ func (server *TaskController) Examples() {
 	server.respond(http.StatusOK, "", responseData)
 }
 
+func (server *TaskController) RunCount() {
+	//_, err := server.Check()
+	//if err != nil {
+	//	server.respond(http.StatusUnauthorized, err.Error())
+	//	return
+	//}
+	body := server.Ctx.Input.RequestBody
+	appRequest := models.AppRequest{}
+	err := json.Unmarshal(body, &appRequest) //解析body中数据
+	logs.Debug("appRequest", appRequest)
+	if err != nil {
+		server.respond(models.NoRequestBody, err.Error())
+		return
+	}
+	if appRequest.Id == 0 {
+		server.respond(models.MissingParameter, "Missing id parameter")
+		return
+	}
+
+	sql := fmt.Sprintf("SELECT type,count(type) FROM bills WHERE type = '%d';", appRequest.Id)
+	datas, err := postgres.CountTasks(sql)
+	if err != nil {
+		server.respond(http.StatusOK, err.Error())
+		return
+	}
+
+	var data models.TaskCount
+	if len(datas) > 0 {
+		data = datas[0]
+	}
+	server.respond(http.StatusOK, "", data)
+}
+
 func (server *TaskController) GetLevelsByTypeId() {
 	_, err := server.Check()
 	if err != nil {

controllers/user.go

@@ -189,12 +189,42 @@ func (server *UserController) UserInfo() {
 		server.respond(models.BusinessFailed, err.Error())
 		return
 	}
+	userBalance := checkUser.Balance
 	balance, err := odysseus.GetUserBalance(int64(checkUser.Id))
-	if err == nil && balance > 0 {
-		checkUser.Balance = balance
+	if err == nil {
+		userBalance = balance
+		if balance < 0 {
+			userBalance = 0
+		}
 	}
-	checkUser.Balance = checkUser.Balance / 1000000
-	server.respond(http.StatusOK, "", checkUser)
+
+	checkUserLevel := &models.UserLevel{Level: checkUser.Level}
+	err = mysql.GetMysqlInstace().Ormer.Read(checkUserLevel, "level")
+	creditQuota := int64(0)
+	if err == nil {
+		creditQuota = checkUserLevel.CreditQuota
+		if balance < 0 {
+			creditQuota = checkUserLevel.CreditQuota + balance
+		}
+	}
+
+	userInfo := models.UserInfo{
+		Id:           checkUser.Id,
+		Name:         checkUser.Name,
+		Username:     checkUser.Username,
+		Mail:         checkUser.Mail,
+		Phone:        checkUser.Phone,
+		CustomId:     checkUser.CustomId,
+		ChainAccount: checkUser.ChainAccount,
+		Type:         checkUser.Type,
+		IsAuthed:     checkUser.IsAuthed,
+		Balance:      float64(userBalance / 1000000),
+		Level:        checkUser.Level,
+		ProfileImage: checkUser.ProfileImage,
+		Role:         checkUser.Role,
+		CreditQuota:  float64(creditQuota / 1000000),
+	}
+	server.respond(http.StatusOK, "", userInfo)
 }
 
 func regisgerUser(user models.User) (*models.User, error) {

libs/odysseus/odysseus.go

@@ -58,6 +58,12 @@ func GetUserBalance(id int64) (int64, error) {
 	return user.Balance, err
 }
 
+//func GetUserBalance(id int64) (int64, error) {
+//	user, err := syncinfo.GetUserInfo(id)
+//	logs.Debug("GetUserInfo = ", user, err)
+//	return user.Balance, err
+//}
+
 func SetTaskDataToRedis(task *model.TaskType) error {
 	return syncinfo.SetTaskDataToRedis(task)
 }

models/task.go

@@ -152,6 +152,7 @@ type Model struct {
 	ResultFileExpires int    `json:"result_file_expires";orm:"column(result_file_expires)"`
 	AccessStatus      int    `json:"access_status,omitempty"`
 	PublishStatus     int    `json:"publish_status,omitempty"`
+	Price             int64  `json:"price";orm:"column(price)"`
 }
 
 type ResonseModel struct {
@@ -173,6 +174,7 @@ type ResonseModel struct {
 	ResultFileExpires int         `json:"result_file_expires";orm:"column(result_file_expires)"`
 	AccessStatus      int         `json:"access_status,omitempty"`
 	PublishStatus     int         `json:"publish_status,omitempty"`
+	Price             float64     `json:"price";orm:"column(price)"`
 }
 
 type Bills struct {

models/user.go

@@ -11,7 +11,7 @@ import "time"
 //}
 
 type User struct {
-	Id                int       `orm:"column(id);auto"`
+	Id                int       `json:"id";orm:"column(id);auto"`
 	Name              string    `json:"name";orm:"column(name);size(20)"`
 	Username          string    `json:"user_name";orm:"column(user_name);size(20)"`
 	Mail              string    `json:"mail";orm:"column(mail);size(120)"`
@@ -33,6 +33,23 @@ type User struct {
 	Deleted           int       `json:"deleted";orm:"column(deleted);size(1)"`
 }
 
+type UserInfo struct {
+	Id           int     `json:"id"`
+	Name         string  `json:"name"`
+	Username     string  `json:"user_name"`
+	Mail         string  `json:"mail"`
+	Phone        string  `json:"phone"`
+	CustomId     string  `json:"custom_id"`
+	ChainAccount string  `json:"chain_account"`
+	Type         int     `json:"type"`
+	IsAuthed     int     `json:"is_authed"`
+	Balance      float64 `json:"balance"`
+	Level        int     `json:"level"`
+	ProfileImage string  `json:"profile_image"`
+	Role         int     `json:"role"`
+	CreditQuota  float64 `json:"credit_quota"`
+}
+
 type LoginRequest struct {
 	RequstUser        User   `json:"user"`
 	IdToken           string `json:"id_token"`