2023.1.30

app/service/youngee_talent_service/auto_time.go

@@ -200,7 +200,7 @@ func GetAutoTime(r *ghttp.Request) *TalentHttpResult {
 
 		dd, _ := time.ParseDuration(fmt.Sprintf("%d", autoInfo.CaseCloseDefault) + "h")
 		t = linkInfo.AgreeAt.Add(dd)
-		_, err = g.Model(dao.YounggeeLinkInfo.Table).Where("link_id = ?", linkInfo).Update(g.Map{"auto_data_break_at": t})
+		_, err = g.Model(dao.YounggeeLinkInfo.Table).Where("link_id = ?", linkInfo.LinkId).Update(g.Map{"auto_data_break_at": t})
 		if err != nil {
 			log.Println("GetMessage error:", err)
 			return &TalentHttpResult{Code: -2, Msg: "Get task message failed"}

app/service/youngee_talent_service/log_message.go

@@ -32,7 +32,7 @@ func GetMessage(r *ghttp.Request) *TalentHttpResult {
 		return &TalentHttpResult{Code: -1, Msg: "Get talent info failed"}
 	}
 	var taskMessage []*model.YounggeeMessageInfo
-	err = g.Model(dao.YounggeeMessageInfo.Table).Where("talent_id = ? and is_deleted = 0", tid).Order("created_at").Scan(&taskMessage)
+	err = g.Model(dao.YounggeeMessageInfo.Table).Where("talent_id = ? and is_deleted = 0", tid).Order("created_at desc").Scan(&taskMessage)
 	if err != nil {
 		log.Println("GetMessage error:", err)
 		return &TalentHttpResult{Code: -2, Msg: "Get task message failed"}

app/service/youngee_talent_service/task_data.go

@@ -78,14 +78,14 @@ func SubmitTaskData(r *ghttp.Request) *TalentHttpResult {
 		return &TalentHttpResult{Code: -1, Msg: "YoungeeTaskInfo find failed"}
 	}
 	if taskInfo.CurDefaultType == 7 || taskInfo.CurDefaultType == 9 {
-		// 若处于违约状态则解除
-		_, err1 = g.DB().Model(model.YoungeeTaskInfo{}).Data(g.Map{"cur_default_type": "0"}).Where("task_id = ?", taskId).Update()
+		// 若处于违约状态则解除并更新企业应支付金额
+		_, err1 = g.DB().Model(model.YoungeeTaskInfo{}).Data(g.Map{"cur_default_type": "0", "real_payment": taskInfo.AllPayment, "err_break_rate": 0}).Where("task_id = ?", taskId).Update()
 		if err1 != nil {
 			return &TalentHttpResult{Code: -2, Msg: "YoungeeTaskInfo update failed"}
 		}
 
-		// 若处于违约状态则解除
-		_, err1 = g.DB().Model(model.YoungeeContractInfo{}).Where("task_id = ? and default_status in (?)", taskId, g.Slice{1, 3, 4}).Delete()
+		// 更新违约记录表
+		_, err1 = g.DB().Model(model.YoungeeContractInfo{}).Data(g.Map{"default_status": 2}).Where("task_id = ? and default_status in (?)", taskId, g.Slice{1, 3, 4}).Update()
 		if err1 != nil {
 			return &TalentHttpResult{Code: -2, Msg: "YoungeeContractInfo update failed"}
 		}

app/service/youngee_talent_service/task_link.go

@@ -75,14 +75,14 @@ func SubmitTaskLink(r *ghttp.Request) *TalentHttpResult {
 		return &TalentHttpResult{Code: -1, Msg: "YoungeeTaskInfo find failed"}
 	}
 	if taskInfo.CurDefaultType == 5 || taskInfo.CurDefaultType == 9 {
-		// 若处于违约状态则解除
-		_, err1 = g.DB().Model(model.YoungeeTaskInfo{}).Data(g.Map{"cur_default_type": "0"}).Where("task_id = ?", taskId).Update()
+		// 若处于违约状态则解除并更新企业应支付金额
+		_, err1 = g.DB().Model(model.YoungeeTaskInfo{}).Data(g.Map{"cur_default_type": "0", "real_payment": taskInfo.AllPayment, "err_break_rate": 0}).Where("task_id = ?", taskId).Update()
 		if err1 != nil {
 			return &TalentHttpResult{Code: -2, Msg: "YoungeeTaskInfo update failed"}
 		}
 
-		// 若处于违约状态则解除
-		_, err1 = g.DB().Model(model.YoungeeContractInfo{}).Where("task_id = ? and default_status in (?)", taskId, g.Slice{1, 3, 4}).Delete()
+		// 更新违约记录表
+		_, err1 = g.DB().Model(model.YoungeeContractInfo{}).Data(g.Map{"default_status": 2}).Where("task_id = ? and default_status in (?)", taskId, g.Slice{1, 3, 4}).Update()
 		if err1 != nil {
 			return &TalentHttpResult{Code: -2, Msg: "YoungeeContractInfo update failed"}
 		}

app/service/youngee_talent_service/task_script.go

@@ -74,14 +74,14 @@ func SubmitTaskScript(r *ghttp.Request) *TalentHttpResult {
 		return &TalentHttpResult{Code: -1, Msg: "YoungeeTaskInfo find failed"}
 	}
 	if taskInfo.CurDefaultType == 1 || taskInfo.CurDefaultType == 9 {
-		// 若处于违约状态则解除
-		_, err1 = g.DB().Model(model.YoungeeTaskInfo{}).Data(g.Map{"cur_default_type": "0"}).Where("task_id = ?", taskId).Update()
+		// 若处于违约状态则解除并更新企业应支付金额
+		_, err1 = g.DB().Model(model.YoungeeTaskInfo{}).Data(g.Map{"cur_default_type": "0", "real_payment": taskInfo.AllPayment, "err_break_rate": 0}).Where("task_id = ?", taskId).Update()
 		if err1 != nil {
 			return &TalentHttpResult{Code: -2, Msg: "YoungeeTaskInfo update failed"}
 		}
 
-		// 若处于违约状态则解除
-		_, err1 = g.DB().Model(model.YoungeeContractInfo{}).Where("task_id = ? and default_status in (?)", taskId, g.Slice{1, 3, 4}).Delete()
+		// 更新违约记录表
+		_, err1 = g.DB().Model(model.YoungeeContractInfo{}).Data(g.Map{"default_status": 2}).Where("task_id = ? and default_status in (?)", taskId, g.Slice{1, 3, 4}).Update()
 		if err1 != nil {
 			return &TalentHttpResult{Code: -2, Msg: "YoungeeContractInfo update failed"}
 		}

app/service/youngee_talent_service/task_sketch.go

@@ -90,14 +90,14 @@ func SubmitTaskSketch(r *ghttp.Request) *TalentHttpResult {
 		return &TalentHttpResult{Code: -1, Msg: "YoungeeTaskInfo find failed"}
 	}
 	if taskInfo.CurDefaultType == 3 || taskInfo.CurDefaultType == 9 {
-		// 若处于违约状态则解除
-		_, err1 = g.DB().Model(model.YoungeeTaskInfo{}).Data(g.Map{"cur_default_type": "0"}).Where("task_id = ?", taskId).Update()
+		// 若处于违约状态则解除并更新企业应支付金额
+		_, err1 = g.DB().Model(model.YoungeeTaskInfo{}).Data(g.Map{"cur_default_type": "0", "real_payment": taskInfo.AllPayment, "err_break_rate": 0}).Where("task_id = ?", taskId).Update()
 		if err1 != nil {
 			return &TalentHttpResult{Code: -2, Msg: "YoungeeTaskInfo update failed"}
 		}
 
-		// 若处于违约状态则解除
-		_, err1 = g.DB().Model(model.YoungeeContractInfo{}).Where("task_id = ? and default_status in (?)", taskId, g.Slice{1, 3, 4}).Delete()
+		// 更新违约记录表
+		_, err1 = g.DB().Model(model.YoungeeContractInfo{}).Data(g.Map{"default_status": 2}).Where("task_id = ? and default_status in (?)", taskId, g.Slice{1, 3, 4}).Update()
 		if err1 != nil {
 			return &TalentHttpResult{Code: -2, Msg: "YoungeeContractInfo update failed"}
 		}

app/service/youngee_talent_service/wxlogin.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"youngmini_server/app/dao"
+	"youngmini_server/app/model"
 	"youngmini_server/app/model/youngee_talent_model"
 	"youngmini_server/app/utils"
 
@@ -70,9 +71,18 @@ func WxLogin(r *ghttp.Request) *TalentHttpResult {
 		// 如果数据库中不存在此达人，则插入新的达人信息
 		// 首先生成达人唯一id
 		newTalentId = utils.GetUuid.GetTalentId()
-		_, err = g.DB().Model(dao.YoungeeTalentInfo.Table).Data(
-			g.Map{"id": newTalentId, "talent_wx_openid": wxResp.OpenId, "last_login_date": gtime.Now(),
-				"talent_wx_nickname": l.Nickname}).Insert()
+		talentInfo := model.YoungeeTalentInfo{
+			Id:               newTalentId,
+			TalentWxOpenid:   wxResp.OpenId,
+			TalentWxNickname: l.Nickname,
+			Canwithdraw:      0,
+			Income:           0,
+			Withdrawing:      0,
+			Withdrawed:       0,
+			LastLoginDate:    gtime.Now(),
+			CreateDate:       gtime.Now(),
+		}
+		_, err = g.DB().Model(dao.YoungeeTalentInfo.Table).Data(talentInfo).Insert()
 		if err != nil {
 			return &TalentHttpResult{Code: -7, Msg: "get talentId failed"}
 		}

config/config.toml

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