修改探店时间的签收时间及解约信息

db/default.go

@@ -804,7 +804,7 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 	db1 := GetReadDB(ctx)
 	db1 = db1.Debug().Model(gorm_model.YoungeeContractInfo{})
 	var TerminatedInfos []gorm_model.YoungeeContractInfo
-	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND (default_status = 1 OR default_status = 4)", taskIds)
+	db1 = db1.Model(gorm_model.YoungeeContractInfo{}).Where("task_id IN ? AND (default_status = 1 OR default_status = 5)", taskIds)
 	err1 := db1.Find(&TerminatedInfos).Error
 	if err1 != nil {
 		logrus.WithContext(ctx).Errorf("[GetTaskTerminatedList] error query mysql find, err:%+v", err1)
@@ -812,6 +812,7 @@ func GetTaskTerminatedList(ctx context.Context, projectID string, pageSize, page
 	}
 	TerminatedMap := make(map[string]gorm_model.YoungeeContractInfo)
 	for _, TerminatedInfo := range TerminatedInfos {
+		fmt.Printf("TerminatedInfo%#v", TerminatedInfo)
 		TerminatedMap[TerminatedInfo.TaskID] = TerminatedInfo
 	}
 	// 查询总数

db/finance.go

@@ -174,12 +174,12 @@ func ConfirmWithdrawal(ctx context.Context, withdrawId string) error {
 }
 
 func GetBankInfo(ctx context.Context, req *http_model.GetBankInfoRequest) (*http_model.BankInfo, error) {
-	db := GetReadDB(ctx)
-	if req.BankId == "" {
-		return nil, nil
-	}
-	var infoBank *gorm_model.InfoBank
-	db.Debug().Model(gorm_model.InfoBank{}).Where("id = ?", req.BankId).First(&infoBank)
+	//db := GetReadDB(ctx)
+	//if req.BankId == "" {
+	//	return nil, nil
+	//}
+	//var infoBank *gorm_model.InfoBank
+	//db.Debug().Model(gorm_model.InfoBank{}).Where("id = ?", req.BankId).First(&infoBank)
 	db1 := GetReadDB(ctx)
 	var infoRegion *gorm_model.InfoRegion
 	db1.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", conv.MustInt(req.BankOpenAddress, 0)).First(&infoRegion)
@@ -192,7 +192,7 @@ func GetBankInfo(ctx context.Context, req *http_model.GetBankInfoRequest) (*http
 	var city *gorm_model.InfoRegion
 	db1.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", conv.MustInt(cityCode, 0)).First(&city)
 	data := new(http_model.BankInfo)
-	data.BankName = infoBank.Name
+	//data.BankName = infoBank.Name
 	data.BankOpenAddress = province.RegionName + city.RegionName + infoRegion.RegionName
 	//db.Model(gorm_model.InfoBank{}).Where("")
 	return data, nil

db/operate.go

@@ -294,7 +294,12 @@ func GetSignInOfflineTask(projectForm int32) error {
 					fmt.Println("logisticID", logisticInfo.LogisticsID)
 					dd, _ := time.ParseDuration(conv.MustString(t, "") + "h")
 					if logisticInfo.AutoSignAt == nil || logisticInfo.AutoSignAt.IsZero() {
-						t := logisticInfo.DeliveryTime.Add(dd)
+						var t time.Time
+						if logisticInfo.ThingsType == 3 {
+							t = logisticInfo.SignedTime.Add(dd)
+						} else {
+							t = logisticInfo.DeliveryTime.Add(dd)
+						}
 						db5 := GetReadDB(context.Background())
 						db5.Model(gorm_model.YoungeeTaskLogistics{}).Where("logistics_id = ?", logisticInfo.LogisticsID).
 							Updates(&gorm_model.YoungeeTaskLogistics{AutoSignAt: &t})
@@ -316,8 +321,8 @@ func GetSignInOfflineTask(projectForm int32) error {
 		signedTaskId = append(signedTaskId, logisticInfo.TaskID)
 		if logisticInfo.Status == 0 {
 			db6 := GetReadDB(context.Background())
-			db6.Model(gorm_model.YoungeeTaskLogistics{}).Where("logistics_id = ?", logisticInfo.LogisticsID).Updates(&gorm_model.YoungeeTaskLogistics{SignedTime: time.Now(), Status: 1})
-
+			db6.Model(gorm_model.YoungeeTaskLogistics{}).Where("logistics_id = ?", logisticInfo.LogisticsID).Updates(
+				&gorm_model.YoungeeTaskLogistics{SignedTime: time.Now(), Status: 1})
 			err = CreateTaskLog(context.Background(), logisticInfo.TaskID, "签收时间")
 			if err != nil {
 				logrus.WithContext(context.Background()).Errorf("[operate db] call CreateTaskLog error,err:%+v", err)
@@ -900,7 +905,7 @@ func GetAutoDraftDefaultInPicTask() error {
 			TaskIdToProjectId[taskInfo.TaskId] = projectId
 			taskNeedMod := gorm_model.YoungeeTaskInfo{}
 			db2 := GetReadDB(context.Background())
-			// 保存所有满足物流状态为3 且 初稿上传状态为 1或 3 的任务记录的id
+			// 保存所有满足物流状态为 3 且 初稿上传状态为 1或 3 的任务记录的id
 			db2.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskInfo.TaskId).First(&taskNeedMod)
 			taskIdToFeeFormMap[taskInfo.TaskId] = taskInfo.FeeForm
 			if taskNeedMod.TaskStage == 9 && taskNeedMod.ScriptStatus == 1 {
@@ -971,15 +976,21 @@ func GetAutoDraftDefaultInPicTask() error {
 			}
 			settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.LinkBreakRate+taskInfo.DataBreakRate+sketchDefaultRate+taskInfo.ScriptBreakRate)/100)
 			if settleAmount <= 0 {
-				settleAmount = float64(0.01)
+				settleAmount = 0.0
 			}
 			realPayment := taskInfo.AllPayment * (1.0 - float64(sketchErrRate)/100)
 			if realPayment <= 0 {
-				realPayment = float64(0.01)
+				realPayment = 0.0
 			}
 			db8 := GetReadDB(context.Background())
 			db8.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskLogisticNeedMod.TaskID).Updates(
-				&gorm_model.YoungeeTaskInfo{CurDefaultType: 3, SketchBreakRate: sketchDefaultRate, SettleAmount: settleAmount, ErrBreakRate: sketchErrRate, RealPayment: realPayment})
+				map[string]interface{}{
+					"cur_default_type":  3,
+					"sketch_break_rate": sketchDefaultRate,
+					"settle_amount":     settleAmount,
+					"err_break_rate":    sketchErrRate,
+					"real_payment":      realPayment,
+				})
 
 			err = CreateTaskLog(context.Background(), taskLogisticNeedMod.TaskID, "初稿逾期")
 			if err != nil {
@@ -1047,15 +1058,21 @@ func GetAutoDraftDefaultInPicTask() error {
 			}
 			settleAmount := taskInfo.TaskReward * (1.0 - float64(sketchDefaultRate+taskInfo.DataBreakRate+taskInfo.LinkBreakRate+taskInfo.ScriptBreakRate)/100)
 			if settleAmount <= 0 {
-				settleAmount = float64(0.01)
+				settleAmount = 0.
 			}
 			realPayment := taskInfo.AllPayment * (1.0 - float64(sketchErrRate)/100)
 			if realPayment <= 0 {
-				realPayment = float64(0.01)
+				realPayment = 0.0
 			}
 			db3 := GetReadDB(context.Background())
 			err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitTaskNeedModId).Updates(
-				&gorm_model.YoungeeTaskInfo{CurDefaultType: 3, SketchBreakRate: sketchDefaultRate, SettleAmount: settleAmount, ErrBreakRate: sketchErrRate, RealPayment: realPayment}).Error
+				map[string]interface{}{
+					"cur_default_type":  3,
+					"sketch_break_rate": sketchDefaultRate,
+					"settle_amount":     settleAmount,
+					"err_break_rate":    sketchErrRate,
+					"real_payment":      realPayment,
+				}).Error
 			if err2 != nil {
 				return err2
 			}
@@ -1380,15 +1397,21 @@ func GetAutoScriptDefaultTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+taskInfo.DataBreakRate+taskInfo.LinkBreakRate+scriptDefaultRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = float64(0.01)
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(scriptErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", videoTaskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 1, ScriptBreakRate: scriptDefaultRate, SettleAmount: settleAmount, ErrBreakRate: scriptErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type":  1,
+						"sketch_break_rate": scriptDefaultRate,
+						"settle_amount":     settleAmount,
+						"err_break_rate":    scriptErrRate,
+						"real_payment":      realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}
@@ -1541,15 +1564,21 @@ func GetAutoScriptDefaultTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+taskInfo.DataBreakRate+taskInfo.LinkBreakRate+scriptDefaultRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = float64(0.01)
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(scriptErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
-				err3 := db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitVideoTaskNeedModId).Updates(&gorm_model.YoungeeTaskInfo{
-					CurDefaultType: 1, ScriptBreakRate: scriptDefaultRate, SettleAmount: settleAmount, ErrBreakRate: scriptErrRate, RealPayment: realPayment}).Error
+				err3 := db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitVideoTaskNeedModId).Updates(
+					map[string]interface{}{
+						"cur_default_type":  1,
+						"sketch_break_rate": scriptDefaultRate,
+						"settle_amount":     settleAmount,
+						"err_break_rate":    scriptErrRate,
+						"real_payment":      realPayment,
+					}).Error
 				if err3 != nil {
 					return err3
 				}
@@ -1827,15 +1856,21 @@ func GetAutoLinkBreachTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(linkDefaultRate+taskInfo.DataBreakRate+taskInfo.SketchBreakRate+taskInfo.ScriptBreakRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = float64(0.01)
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(linkErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", submitTaskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 5, LinkBreakRate: linkDefaultRate, SettleAmount: settleAmount, ErrBreakRate: linkErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type":  5,
+						"sketch_break_rate": linkDefaultRate,
+						"settle_amount":     settleAmount,
+						"err_break_rate":    linkErrRate,
+						"real_payment":      realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}
@@ -1992,16 +2027,22 @@ func GetAutoCaseCloseDefaultTask() error {
 				}
 				settleAmount := taskInfo.TaskReward * (1.0 - float64(taskInfo.SketchBreakRate+dataDefaultRate+taskInfo.LinkBreakRate+taskInfo.ScriptBreakRate)/100)
 				if settleAmount <= 0 {
-					settleAmount = float64(0.01)
+					settleAmount = 0.0
 				}
 				realPayment := taskInfo.AllPayment * (1.0 - float64(dataErrRate)/100)
 				if realPayment <= 0 {
-					realPayment = float64(0.01)
+					realPayment = 0.0
 				}
 				fmt.Println("settleAmount: ", settleAmount)
 				db3 := GetReadDB(context.Background())
 				err2 = db3.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id = ?", taskNeedModId).Updates(
-					&gorm_model.YoungeeTaskInfo{CurDefaultType: 7, DataBreakRate: dataDefaultRate, SettleAmount: settleAmount, ErrBreakRate: dataErrRate, RealPayment: realPayment}).Error
+					map[string]interface{}{
+						"cur_default_type":  7,
+						"sketch_break_rate": dataDefaultRate,
+						"settle_amount":     settleAmount,
+						"err_break_rate":    dataErrRate,
+						"real_payment":      realPayment,
+					}).Error
 				if err2 != nil {
 					return err2
 				}

model/http_model/task_terminated.go

@@ -1,7 +1,6 @@
 package http_model
 
 import (
-	"time"
 	"youngee_m_api/model/gorm_model"
 )
 
@@ -29,16 +28,16 @@ type TaskTerminatedPreview struct {
 }
 
 type TaskTerminatedInfo struct {
-	TaskID            string    `json:"task_id"`             // 任务ID
-	ProjectID         string    `json:"project_id"`          // 项目ID
-	PlatformNickname  string    `json:"platform_nickname"`   // 账号昵称
-	FansCount         string    `json:"fans_count"`          // 粉丝数
-	RecruitStrategyID int       `json:"recruit_strategy_id"` // 招募策略ID
-	StrategyID        int       `json:"strategy_id"`         // 报名选择的招募策略id
-	AllPayment        float64   `json:"all_payment"`         // 企业支付
-	RealPayment       float64   `json:"real_payment"`        // 企业实际支付（扣除违约扣款）
-	HandleAt          time.Time `json:"handle_at"`           // 处理时间
-	BreakType         int       `json:"break_type"`          // 违约类型（4类严重违约）：1（脚本）2（初稿）3（链接）4（数据）
+	TaskID            string  `json:"task_id"`             // 任务ID
+	ProjectID         string  `json:"project_id"`          // 项目ID
+	PlatformNickname  string  `json:"platform_nickname"`   // 账号昵称
+	FansCount         string  `json:"fans_count"`          // 粉丝数
+	RecruitStrategyID int     `json:"recruit_strategy_id"` // 招募策略ID
+	StrategyID        int     `json:"strategy_id"`         // 报名选择的招募策略id
+	AllPayment        float64 `json:"all_payment"`         // 企业支付
+	RealPayment       float64 `json:"real_payment"`        // 企业实际支付（扣除违约扣款）
+	HandleAt          string  `json:"handle_at"`           // 处理时间
+	BreakType         int     `json:"break_type"`          // 违约类型（4类严重违约）：1（脚本）2（初稿）3（链接）4（数据）
 }
 
 type TaskTerminated struct {

pack/task_terminated_list.go

@@ -25,6 +25,7 @@ func MGormTaskTerminatedInfoToHttpTaskTerminatedPreview(TaskTerminatedInfo *http
 		StrategyID:        conv.MustString(TaskTerminatedInfo.StrategyID, ""),
 		AllPayment:        TaskTerminatedInfo.AllPayment,
 		RealPayment:       TaskTerminatedInfo.RealPayment,
+		HandleAt:          conv.MustString(TaskTerminatedInfo.HandleAt, ""),
 		BreakType:         conv.MustString(TaskTerminatedInfo.BreakType, ""),
 	}
 }
@@ -32,8 +33,8 @@ func MGormTaskTerminatedInfoToHttpTaskTerminatedPreview(TaskTerminatedInfo *http
 func TaskTerminatedToTaskInfo(TaskTerminateds []*http_model.TaskTerminated) []*http_model.TaskTerminatedInfo {
 	var TaskTerminatedInfos []*http_model.TaskTerminatedInfo
 	for _, TaskTerminated := range TaskTerminateds {
-		TaskTerminated := GetTerminatedInfoStruct(TaskTerminated)
-		TaskTerminatedInfos = append(TaskTerminatedInfos, TaskTerminated)
+		TaskTerminated1 := GetTerminatedInfoStruct(TaskTerminated)
+		TaskTerminatedInfos = append(TaskTerminatedInfos, TaskTerminated1)
 	}
 	return TaskTerminatedInfos
 }
@@ -49,5 +50,6 @@ func GetTerminatedInfoStruct(TaskTerminated *http_model.TaskTerminated) *http_mo
 		AllPayment:       TaskTerminated.Talent.AllPayment,
 		RealPayment:      TaskTerminated.Talent.RealPayment,
 		BreakType:        TaskTerminated.Default.BreakType,
+		HandleAt:         conv.MustString(TaskTerminated.Default.HandleAt, "")[:19],
 	}
 }

service/logistics.go

@@ -45,7 +45,7 @@ func (*logistics) Create(ctx context.Context, newLogistics http_model.CreateLogi
 		ExplorestoreEndtime, _ := time.ParseInLocation("2006-01-02 15:04:05", newLogistics.ExplorestoreEndtime, time.Local)
 		Logistics.ExplorestoreStarttime = ExplorestoreStarttime
 		Logistics.ExplorestoreEndtime = ExplorestoreEndtime
-		// Logistics.ExplorestorePeriod = newLogistics.ExplorestorePeriod
+		Logistics.SignedTime = ExplorestoreEndtime
 	} else {
 		Logistics.CouponCodeInformation = newLogistics.CouponCodeInformation
 	}