add credit quota

controllers/funds.go

@@ -68,7 +68,13 @@ func (server *FundsController) Recharge() {
 
 	//mysql.GetMysqlInstace().Ormer.Insert(&charge)
 
-	balance := int64((float64(checkUser.Balance/1000000) + chargeRequest.Amount) * 1000000)
+	balance, err := odysseus.GetUserBalance(int64(checkUser.Id))
+	if err != nil {
+		server.respond(models.BusinessFailed, "failed")
+		return
+	}
+
+	balance = int64((float64(balance/1000000) + chargeRequest.Amount) * 1000000)
 
 	//sql := "SELECT Max(id) AS count FROM funds;"
 	max, _ := snowflake.NextId()
@@ -96,6 +102,8 @@ func (server *FundsController) Recharge() {
 	//	OrderId:       "",
 	//}
 	//flag, err := postgres.InsertFunds(&fundsData)
+
+	//todo 如果是三方支付，待支付成功，再更新余额
 	sql := fmt.Sprintf("INSERT INTO funds ("+
 		"channel_serial,"+
 		"order_id,"+

controllers/task.go

@@ -2151,7 +2151,7 @@ func (server *TaskController) Examples() {
 		return
 	}
 
-	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)
+	sql = fmt.Sprintf("SELECT id, `name` AS tit,type,`desc` AS content, tags ,price,unit,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 {
@@ -2198,6 +2198,7 @@ func (server *TaskController) Examples() {
 			AccessStatus:      data.AccessStatus,
 			PublishStatus:     data.PublishStatus,
 			Price:             float64(data.Price / 1000000),
+			Uint:              data.Uint,
 		}
 		remodels = append(remodels, &remodel)
 	}
@@ -2212,14 +2213,14 @@ func (server *TaskController) Examples() {
 }
 
 func (server *TaskController) RunCount() {
-	//_, err := server.Check()
-	//if err != nil {
-	//	server.respond(http.StatusUnauthorized, err.Error())
-	//	return
-	//}
+	_, 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中数据
+	err = json.Unmarshal(body, &appRequest) //解析body中数据
 	logs.Debug("appRequest", appRequest)
 	if err != nil {
 		server.respond(models.NoRequestBody, err.Error())

models/task.go

@@ -88,6 +88,7 @@ type TaskType struct {
 	ResultFileExpires int       `json:"result_file_expires";orm:"column(result_file_expires)"`
 	AccessStatus      int       `json:"access_status,omitempty"`
 	PublishStatus     int       `json:"publish_status,omitempty"`
+	Uint              string    `json:"unit";orm:"column(unit)"`
 	CreatedTime       time.Time `json:"created_time";orm:"column(created_time);type(datetime)"`
 	UpdatedTime       time.Time `json:"updated_time";orm:"column(updated_time);type(datetime)"`
 	Deleted           int       `json:"deleted";orm:"column(deleted);size(1)"`
@@ -128,6 +129,7 @@ type NewTaskType struct {
 	ResultFileExpires int         `json:"result_file_expires";orm:"column(result_file_expires)"`
 	AccessStatus      int         `json:"access_status,omitempty"`
 	PublishStatus     int         `json:"publish_status,omitempty"`
+	Uint              string      `json:"unit";orm:"column(unit)"`
 	CreatedTime       time.Time   `json:"created_time";orm:"column(created_time);type(datetime)"`
 	UpdatedTime       time.Time   `json:"updated_time";orm:"column(updated_time);type(datetime)"`
 	Deleted           int         `json:"deleted";orm:"column(deleted);size(1)"`
@@ -153,6 +155,7 @@ type Model struct {
 	AccessStatus      int    `json:"access_status,omitempty"`
 	PublishStatus     int    `json:"publish_status,omitempty"`
 	Price             int64  `json:"price";orm:"column(price)"`
+	Uint              string `json:"unit";orm:"column(unit)"`
 }
 
 type ResonseModel struct {
@@ -175,6 +178,7 @@ type ResonseModel struct {
 	AccessStatus      int         `json:"access_status,omitempty"`
 	PublishStatus     int         `json:"publish_status,omitempty"`
 	Price             float64     `json:"price";orm:"column(price)"`
+	Uint              string      `json:"unit";orm:"column(unit)"`
 }
 
 type Bills struct {