0211大修改

db/data.go

@@ -32,9 +32,9 @@ func GetTaskDataList(ctx context.Context, projectID string, pageSize, pageNum in
 		if tag == "data_status" {
 			fmt.Printf("Data %+v", value.Interface() == int64(0))
 			if value.Interface() == int64(0) {
-				db = db.Where("task_stage = ?", 14)
+				db = db.Where("task_stage = 14")
 			} else {
-				db = db.Where("task_stage > ?", 14)
+				db = db.Where("task_stage > 14 and task_stage <> 16")
 			}
 			continue
 		} else if !util.IsBlank(value) {
@@ -204,9 +204,9 @@ func GetSpecialTaskDataList(ctx context.Context, projectID string, pageSize, pag
 		if tag == "data_status" {
 			fmt.Printf("Data %+v", value.Interface() == int64(0))
 			if value.Interface() == int64(0) {
-				db = db.Where("task_stage = ?", 14)
+				db = db.Where("task_stage = 14")
 			} else {
-				db = db.Where("task_stage > ?", 14)
+				db = db.Where("task_stage > 14 and task_stage <> 16")
 			}
 			continue
 		} else if !util.IsBlank(value) {

db/finance.go

@@ -295,7 +295,7 @@ func GetInvoiceRecords(ctx context.Context, req *http_model.InvoiceRecordsReques
 		InvoiceRecord.Phone = invoiceRecord.Phone
 		InvoiceRecord.ShipmentNumber = invoiceRecord.ShipmentNumber
 		InvoiceRecord.BusinessName = enterpriseIdToUserInfoMap[invoiceRecord.EnterpriseID].BusinessName
-		InvoiceRecord.UserId = enterpriseIdToUserInfoMap[invoiceRecord.EnterpriseID].UserID
+		InvoiceRecord.UserId = invoiceRecord.EnterpriseID
 		InvoiceRecord.Username = GetUsernameByUserID(ctx, enterpriseIdToUserInfoMap[invoiceRecord.EnterpriseID].UserID)
 		InvoiceRecord.SubmitAt = conv.MustString(invoiceRecord.SubmitAt, "")[:19]
 		InvoiceRecord.BillingAt = conv.MustString(invoiceRecord.BillingAt, "")[:19]
@@ -398,7 +398,7 @@ func GetRechargeRecords(ctx context.Context, req *http_model.GetRechargeRecordsR
 		RechargeRecord.Phone = rechargeRecord.Phone
 		RechargeRecord.TransferVoucher = rechargeRecord.TransferVoucherUrl
 		RechargeRecord.RechargeMethod = consts.GetRechargeMethod(rechargeRecord.RechargeMethod)
-		RechargeRecord.UserId = enterpriseIdToUserInfoMap[rechargeRecord.EnterpriseID].UserID
+		RechargeRecord.UserId = rechargeRecord.EnterpriseID
 		RechargeRecord.Username = GetUsernameByUserID(ctx, enterpriseIdToUserInfoMap[rechargeRecord.EnterpriseID].UserID)
 		RechargeRecord.BusinessName = enterpriseIdToUserInfoMap[rechargeRecord.EnterpriseID].BusinessName
 		RechargeRecords = append(RechargeRecords, RechargeRecord)

db/link.go

@@ -32,9 +32,9 @@ func GetTaskLinkList(ctx context.Context, projectID string, pageSize, pageNum in
 		if tag == "link_status" {
 			fmt.Printf("link %+v", value.Interface() == int64(0))
 			if value.Interface() == int64(0) {
-				db = db.Where("task_stage = ?", 12)
+				db = db.Where("task_stage = 12")
 			} else {
-				db = db.Where("task_stage > ?", 12)
+				db = db.Where("task_stage > 12 and task_stage <> 16")
 			}
 			continue
 		} else if !util.IsBlank(value) {
@@ -184,9 +184,9 @@ func GetSpecialTaskLinkList(ctx context.Context, projectID string, pageSize, pag
 		if tag == "link_status" {
 			fmt.Printf("link %+v", value.Interface() == int64(0))
 			if value.Interface() == int64(0) {
-				db = db.Where("task_stage = ?", 12)
+				db = db.Where("task_stage = 12")
 			} else {
-				db = db.Where("task_stage > ?", 12)
+				db = db.Where("task_stage > 12 and task_stage <> 16")
 			}
 			continue
 		} else if !util.IsBlank(value) {

db/logistics.go

@@ -52,7 +52,7 @@ func SignForReceipt(ctx context.Context, taskID string) error {
 	return nil
 }
 
-// 查询包含物流信息的task list
+// GetTaskLogisticsList 查询包含物流信息的task list
 func GetTaskLogisticsList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TalentConditions) ([]*http_model.TaskLogisticsInfo, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询Task表信息

db/operate.go

@@ -314,7 +314,7 @@ func GetSignInOfflineTask(projectForm int32) error {
 	var signedTaskId []string
 	for _, logisticInfo := range logisticInfos {
 		signedTaskId = append(signedTaskId, logisticInfo.TaskID)
-		if logisticInfo.SignedTime.IsZero() {
+		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})
 
@@ -1073,7 +1073,7 @@ func GetAutoDraftDefaultInPicTask() error {
 	return nil
 }
 
-// 视频-初稿超时违约判断
+// GetAutoDraftDefaultInMvTask 视频-初稿超时违约判断
 func GetAutoDraftDefaultInMvTask() error {
 	db := GetReadDB(context.Background())
 	var projectInfos []*gorm_model.ProjectInfo
@@ -1272,7 +1272,7 @@ func GetAutoDraftDefaultInMvTask() error {
 	return nil
 }
 
-// 脚本超时违约判断
+// GetAutoScriptDefaultTask 脚本超时违约判断
 func GetAutoScriptDefaultTask() error {
 	db := GetReadDB(context.Background())
 	var projectInfos []*gorm_model.ProjectInfo
@@ -1544,7 +1544,7 @@ func GetAutoScriptDefaultTask() error {
 	return nil
 }
 
-// 链接超时违约判断
+// GetAutoLinkBreachTask 链接超时违约判断
 func GetAutoLinkBreachTask() error {
 	db := GetReadDB(context.Background())
 	var projectInfos []*gorm_model.ProjectInfo
@@ -1812,7 +1812,7 @@ func GetAutoLinkBreachTask() error {
 	return nil
 }
 
-// 数据超时违约判断
+// GetAutoCaseCloseDefaultTask 数据超时违约判断
 func GetAutoCaseCloseDefaultTask() error {
 	db := GetReadDB(context.Background())
 	var projectInfos []*gorm_model.ProjectInfo

db/product.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"github.com/caixw/lib.go/conv"
 	"gorm.io/gorm"
+	"strconv"
 	"youngee_m_api/model/gorm_model"
 )
 
@@ -42,6 +43,17 @@ func GetEnterpriseIDByUserID(ctx context.Context, UserId string) string {
 	return enterpriseID
 }
 
+func GetUserIDByEnterpriseID(ctx context.Context, enterpriseId string) string {
+	db := GetReadDB(ctx)
+	enterpriseInfo := gorm_model.Enterprise{}
+	err := db.Where("enterprise_id = ?", enterpriseId).Find(&enterpriseInfo).Error
+	if err != nil {
+		return ""
+	}
+	enterpriseID := enterpriseInfo.UserID
+	return strconv.FormatInt(enterpriseID, 10)
+}
+
 func GetProductByEnterpriseID(ctx context.Context, enterpriseID string) ([]gorm_model.YounggeeProduct, error) {
 	db := GetReadDB(ctx)
 	var products []gorm_model.YounggeeProduct

db/recruit_strategy.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"context"
+	"fmt"
 	"github.com/sirupsen/logrus"
 	"gorm.io/gorm"
 	"youngee_m_api/model/gorm_model"
@@ -9,6 +10,7 @@ import (
 
 func CreateRecruitStrategy(ctx context.Context, recruitStrategys []gorm_model.RecruitStrategy) error {
 	db := GetReadDB(ctx)
+	fmt.Println("recruitStrategys", recruitStrategys)
 	err := db.Create(&recruitStrategys).Error
 	if err != nil {
 		return err
@@ -25,9 +27,9 @@ func DeleteRecruitStrategyByProjectID(ctx context.Context, projectID string) err
 	return nil
 }
 
-func CalculateSelectedNumberByRecruitStrategyID(ctx context.Context, recruitStrategyIDs []int64, AddNumber int64) error {
+func CalculateSelectedNumberByRecruitStrategyID(ctx context.Context, recruitStrategyID int64, AddNumber int64) error {
 	db := GetReadDB(ctx)
-	err := db.Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id in ?", recruitStrategyIDs).
+	err := db.Debug().Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id = ?", recruitStrategyID).
 		Updates(map[string]interface{}{
 			"selected_number": gorm.Expr("selected_number + ?", AddNumber),
 			"waiting_number":  gorm.Expr("waiting_number + ?", AddNumber)}).Error
@@ -37,17 +39,6 @@ func CalculateSelectedNumberByRecruitStrategyID(ctx context.Context, recruitStra
 	return nil
 }
 
-func UpdateSelectedNumber(ctx context.Context, RecruitStrategyID int64, selected_number int64) error {
-	db := GetReadDB(ctx)
-	err := db.Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id = ?", RecruitStrategyID).
-		Update("selected_number", gorm.Expr("selected_number + ?", selected_number)).Error
-	if err != nil {
-		logrus.WithContext(ctx).Errorf("[logistics db] call CreateLogistics error,err:%+v", err)
-		return err
-	}
-	return nil
-}
-
 func UpdateLogisticsNumber(ctx context.Context, RecruitStrategyID int64, delivered_value int64, waiting_value int64, signed_value int64) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.RecruitStrategy{}).Where("recruit_strategy_id = ?", RecruitStrategyID).

db/script.go

@@ -20,7 +20,7 @@ import (
 func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum int64, conditions *common_model.TalentConditions) ([]*http_model.TaskScriptInfo, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询Task表信息
-	db = db.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("task_status = 2")
+	db = db.Debug().Model(gorm_model.YoungeeTaskInfo{}).Where("task_status = 2 ")
 	// 根据Project条件过滤
 	conditionType := reflect.TypeOf(conditions).Elem()
 	conditionValue := reflect.ValueOf(conditions).Elem()
@@ -32,9 +32,9 @@ func GetTaskScriptList(ctx context.Context, projectID string, pageSize, pageNum
 		if tag == "script_status" {
 			fmt.Printf("script %+v", value.Interface() == int64(2))
 			if value.Interface() == int64(2) {
-				db = db.Where("task_stage = ?", 8)
+				db = db.Where("task_stage = 8")
 			} else {
-				db = db.Where("task_stage > ?", 8)
+				db = db.Where("task_stage > 8 and task_stage <> 16")
 			}
 			continue
 		} else if !util.IsBlank(value) {
@@ -178,9 +178,9 @@ func GetSpecialTaskScriptList(ctx context.Context, projectID string, pageSize, p
 		if tag == "script_status" {
 			fmt.Printf("script %+v", value.Interface() == int64(2))
 			if value.Interface() == int64(2) {
-				db = db.Where("task_stage = ?", 8)
+				db = db.Where("task_stage = 8")
 			} else {
-				db = db.Where("task_stage > ?", 8)
+				db = db.Where("task_stage > 8 and task_stage <> 16")
 			}
 			continue
 		} else if !util.IsBlank(value) {

db/sketch.go

@@ -32,9 +32,9 @@ func GetTaskSketchList(ctx context.Context, projectID string, pageSize, pageNum
 		if tag == "sketch_status" {
 			fmt.Printf("sketch %+v", value.Interface() == int64(0))
 			if value.Interface() == int64(0) {
-				db = db.Where("task_stage = ?", 10)
+				db = db.Where("task_stage = 10")
 			} else {
-				db = db.Where("task_stage > ?", 10)
+				db = db.Where("task_stage > 10 and task_stage <> 16")
 			}
 			continue
 		} else if !util.IsBlank(value) {

db/talent.go

@@ -92,27 +92,12 @@ func AccountIncome(ctx context.Context, talentId string) (*http_model.TalentInfo
 			return nil, err
 		}
 	}
-	db3 := GetReadDB(ctx)
-	var infoBank *gorm_model.InfoBank
-	db3.Debug().Model(gorm_model.InfoBank{}).Where("id = ?", talentBankInfo.BankID).First(&infoBank)
 	region := ""
 	if talentBankInfo.BankOpenAddress != 0 {
 		region = GetRegion(ctx, talentBankInfo.BankOpenAddress)
 	}
-	//db4 := GetReadDB(ctx)
-	//var infoRegion *gorm_model.InfoRegion
-	//db4.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", talentBankInfo.BankOpenAddress).First(&infoRegion)
-	//
-	//provinceCode := conv.MustString(talentBankInfo.BankOpenAddress, "")[0:2] + "0000"
-	//var province *gorm_model.InfoRegion
-	//db4.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", conv.MustInt(provinceCode, 0)).First(&province)
-	//
-	//cityCode := conv.MustString(talentBankInfo.BankOpenAddress, "")[0:4] + "00"
-	//var city *gorm_model.InfoRegion
-	//db4.Debug().Model(gorm_model.InfoRegion{}).Where("self_code = ?", conv.MustInt(cityCode, 0)).First(&city)
 
-	data.Bank = infoBank.Name
-	//data.BankOpenAddress = province.RegionName + city.RegionName + infoRegion.RegionName
+	data.Bank = talentBankInfo.Bank
 	data.BankOpenAddress = region
 	data.BankCardNumber = talentBankInfo.BankCardNumber
 	data.Name = talentBankInfo.Name

db/terminate.go

@@ -2,76 +2,75 @@ package db
 
 import (
 	"context"
+	"fmt"
+	"gorm.io/gorm"
+	"log"
 	"time"
 	"youngee_m_api/model/gorm_model"
+	"youngee_m_api/util"
 
 	"github.com/sirupsen/logrus"
 )
 
 // Terminate 批量提交解约申请
-func Terminate(ctx context.Context, TaskIDs []string) error {
+func Terminate(ctx context.Context, TaskIDs []string, projectIds []string) error {
 	db := GetReadDB(ctx)
 	err := db.Model(gorm_model.YoungeeContractInfo{}).Where("task_id in ?  and (default_status = 1 or default_status = 4)", TaskIDs).Updates(map[string]interface{}{"default_status": 3, "terminate_at": time.Now()}).Error
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Data db] Update YoungeeContractInfo error,err:%+v", err)
 		return err
 	}
-	err = db.Model(gorm_model.YoungeeTaskInfo{}).Where("task_id in ?", TaskIDs).Updates(gorm_model.YoungeeTaskInfo{CurDefaultType: 9}).Error
-	if err != nil {
-		logrus.WithContext(ctx).Errorf("[Data db] Update YoungeeTaskInfo error,err:%+v", err)
-		return err
+	projectIds = util.RemoveStrRepByMap(projectIds)
+	var unfinishedNum int64
+	for _, projectId := range projectIds {
+		err1 := db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = 2 AND task_stage < 15", projectId).Count(&unfinishedNum).Error
+		if err1 != nil {
+			logrus.WithContext(ctx).Errorf("[Data db] Count YoungeeTaskInfo error,err:%+v", err)
+			return err1
+		}
+		var finishedNum int64
+		db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Count(&finishedNum)
+		if unfinishedNum == 0 && finishedNum != 0 {
+			// 2. 释放企业账户因项目冻结的资金
+			// 1） 计算剩余资金
+			db1 := GetReadDB(ctx)
+			var allPayment float64
+			var realPayment float64
+			err = db1.Model(gorm_model.YoungeeTaskInfo{}).
+				Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Pluck("COALESCE(SUM(all_payment), 0) as allPayment", &allPayment).Error
+			if err != nil {
+				log.Println("DB GetAutoCaseCloseTask error in data:", err)
+				return err
+			}
+			err = db1.Model(gorm_model.YoungeeTaskInfo{}).Select("sum(real_payment) as realPayment").
+				Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Pluck("COALESCE(SUM(real_payment), 0) as realPayment", &realPayment).Error
+			if err != nil {
+				log.Println("DB GetAutoCaseCloseTask error in data:", err)
+				return err
+			}
+			fmt.Println("企业应支付金额总计：", allPayment, "实际支付总计：", realPayment)
+			db2 := GetReadDB(ctx)
+			var enterpriseID int64
+			db2.Model(gorm_model.ProjectInfo{}).Select("enterprise_id").Where("project_id = ?", projectId).Find(&enterpriseID)
+			// 	2）. 释放剩余资金
+			err = db1.Model(gorm_model.Enterprise{}).Where("enterprise_id = ?", enterpriseID).Updates(
+				map[string]interface{}{
+					"frozen_balance":    gorm.Expr("frozen_balance - ?", allPayment),
+					"balance":           gorm.Expr("balance - ?", realPayment),
+					"available_balance": gorm.Expr("available_balance + ?", allPayment-realPayment)}).Error
+			if err != nil {
+				log.Println("DB GetAutoCaseCloseTask error in data:", err)
+				return err
+			}
+			// 1. 更新项目状态为已结束
+			t := time.Now()
+			err = db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).
+				Updates(map[string]interface{}{"project_status": 10, "payment_amount": realPayment, "finish_at": &t}).Error
+			if err != nil {
+				logrus.WithContext(ctx).Errorf("[Project db] Update ProjectInfo error,err:%+v", err)
+				return err
+			}
+		}
 	}
-	// projectIds = util.RemoveStrRepByMap(projectIds)
-	// var unfinishedNum int64
-	// for _, projectId := range projectIds {
-	// 	err1 := db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? AND task_status = 2 AND task_stage < 15", projectId).Count(&unfinishedNum).Error
-	// 	if err1 != nil {
-	// 		logrus.WithContext(ctx).Errorf("[Data db] Count YoungeeTaskInfo error,err:%+v", err)
-	// 		return err1
-	// 	}
-	// 	var finishedNum int64
-	// 	db.Model(gorm_model.YoungeeTaskInfo{}).Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Count(&finishedNum)
-	// 	if unfinishedNum == 0 && finishedNum != 0 {
-	// 		// 2. 释放企业账户因项目冻结的资金
-	// 		// 1） 计算剩余资金
-	// 		db1 := GetReadDB(ctx)
-	// 		var allPayment float64
-	// 		var realPayment float64
-	// 		err = db1.Model(gorm_model.YoungeeTaskInfo{}).
-	// 			Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Pluck("COALESCE(SUM(all_payment), 0) as allPayment", &allPayment).Error
-	// 		if err != nil {
-	// 			log.Println("DB GetAutoCaseCloseTask error in data:", err)
-	// 			return err
-	// 		}
-	// 		err = db1.Model(gorm_model.YoungeeTaskInfo{}).Select("sum(real_payment) as realPayment").
-	// 			Where("project_id = ? and task_status = 2 and task_stage >= 15", projectId).Pluck("COALESCE(SUM(real_payment), 0) as realPayment", &realPayment).Error
-	// 		if err != nil {
-	// 			log.Println("DB GetAutoCaseCloseTask error in data:", err)
-	// 			return err
-	// 		}
-	// 		fmt.Println("企业应支付金额总计：", allPayment, "实际支付总计：", realPayment)
-	// 		db2 := GetReadDB(ctx)
-	// 		var enterpriseID int64
-	// 		db2.Model(gorm_model.ProjectInfo{}).Select("enterprise_id").Where("project_id = ?", projectId).Find(&enterpriseID)
-	// 		// 	2）. 释放剩余资金
-	// 		err = db1.Model(gorm_model.Enterprise{}).Where("enterprise_id = ?", enterpriseID).Updates(
-	// 			map[string]interface{}{
-	// 				"frozen_balance":    gorm.Expr("frozen_balance - ?", allPayment),
-	// 				"balance":           gorm.Expr("balance - ?", realPayment),
-	// 				"available_balance": gorm.Expr("available_balance + ?", allPayment-realPayment)}).Error
-	// 		if err != nil {
-	// 			log.Println("DB GetAutoCaseCloseTask error in data:", err)
-	// 			return err
-	// 		}
-	// 		// 1. 更新项目状态为已结束
-	// 		t := time.Now()
-	// 		err = db.Model(gorm_model.ProjectInfo{}).Where("project_id = ?", projectId).
-	// 			Updates(map[string]interface{}{"project_status": 10, "payment_amount": realPayment, "finish_at": &t}).Error
-	// 		if err != nil {
-	// 			logrus.WithContext(ctx).Errorf("[Project db] Update ProjectInfo error,err:%+v", err)
-	// 			return err
-	// 		}
-	// 	}
-	// }
 	return nil
 }

db/user.go

@@ -168,7 +168,11 @@ func DisabledUser(ctx context.Context, user string) (string, error) {
 func GetEnterpriseUserList(ctx context.Context, pageSize, pageNum int32, conditions *common_model.EnterpriseUserConditions) ([]*http_model.EnterpriseUserPreview, int64, error) {
 	db := GetReadDB(ctx)
 	// 查询user表信息，筛选出企业用户
-	db = db.Debug().Model([]gorm_model.YounggeeUser{}).Where("role = ? ", "3")
+	db = db.Model([]gorm_model.YounggeeUser{}).Where("role = ? ", "3")
+	if conditions.User != "" {
+		userId := GetUserIDByEnterpriseID(ctx, conditions.User)
+		db = db.Where("id = ?", userId)
+	}
 	// 根据 查询条件过滤
 	conditionType := reflect.TypeOf(conditions).Elem()
 	conditionValue := reflect.ValueOf(conditions).Elem()
@@ -177,23 +181,28 @@ func GetEnterpriseUserList(ctx context.Context, pageSize, pageNum int32, conditi
 		tag := field.Tag.Get("condition")
 		value := conditionValue.FieldByName(field.Name)
 		if !util.IsBlank(value) && tag != "created_at" && tag != "username" && tag != "user" {
-			db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
+			db = db.Debug().Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 		} else if tag == "created_at" && value.Interface() != nil {
 			db = db.Where(fmt.Sprintf("created_at like '%s%%'", value.Interface()))
-		} else if (tag == "username" || tag == "user") && value.Interface() != nil {
-			db = db.Where(fmt.Sprintf("username like '%%%s%%'", value.Interface()))
-		} else if tag == "user" && value.Interface() != nil {
-			db = db.Where(fmt.Sprintf("user like '%%%s%%'", value.Interface()))
+		} else if tag == "username" && value.Interface() != nil {
+			db = db.Debug().Where(fmt.Sprintf("username like '%%%s%%'", value.Interface()))
 		}
 	}
-	var users []gorm_model.YounggeeUser
 	var totalUser int64
 	if err := db.Count(&totalUser).Error; err != nil {
 		logrus.WithContext(ctx).Errorf("[GetEnterpriseUserList] error query mysql total, err:%+v", err)
 		return nil, 0, err
 	}
-	db.Order("created_at desc").Find(&users)
 
+	var users []gorm_model.YounggeeUser
+	// 查询该页数据
+	limit := pageSize
+	offset := pageSize * pageNum // assert pageNum start with 0
+	err := db.Order("created_at desc").Limit(int(limit)).Offset(int(offset)).Find(&users).Error
+	if err != nil {
+		logrus.WithContext(ctx).Errorf("[GetEnterpriseUserList] error query mysql total, err:%+v", err)
+		return nil, 0, err
+	}
 	// 查询 用户自增的id
 	var userIds []int64
 	userMap := make(map[int64]gorm_model.YounggeeUser)
@@ -204,16 +213,8 @@ func GetEnterpriseUserList(ctx context.Context, pageSize, pageNum int32, conditi
 
 	db1 := GetReadDB(ctx)
 	var enterprises []gorm_model.Enterprise
-	db1 = db1.Debug().Model(gorm_model.Enterprise{}).Where("user_id IN ?", userIds).Find(&enterprises)
+	db1 = db1.Model(gorm_model.Enterprise{}).Where("user_id IN ?", userIds).Find(&enterprises)
 
-	// 查询该页数据
-	limit := pageSize
-	offset := pageSize * pageNum // assert pageNum start with 0
-	err := db.Order("created_at desc").Limit(int(limit)).Offset(int(offset)).Error
-	if err != nil {
-		logrus.WithContext(ctx).Errorf("[GetEnterpriseUserList] error query mysql total, err:%+v", err)
-		return nil, 0, err
-	}
 	enterpriseMap := make(map[int64]gorm_model.Enterprise)
 	for _, enterprise := range enterprises {
 		enterpriseMap[enterprise.UserID] = enterprise
@@ -246,12 +247,14 @@ func GetCreatorList(ctx context.Context, pageSize, pageNum int32, conditions *co
 		field := conditionType.Field(i)
 		tag := field.Tag.Get("condition")
 		value := conditionValue.FieldByName(field.Name)
-		if !util.IsBlank(value) && tag != "create_date" && tag != "talent_wx_nickname" {
-			db = db.Where(fmt.Sprintf("%s = ?", tag), value.Interface())
+		if !util.IsBlank(value) && tag != "create_date" && tag != "talent_wx_nickname" && tag != "id" {
+			db = db.Debug().Where(fmt.Sprintf("%s = ?", tag), value.Interface())
 		} else if tag == "create_date" && value.Interface() != nil {
 			db = db.Where(fmt.Sprintf("create_date like '%s%%'", value.Interface()))
 		} else if tag == "talent_wx_nickname" && value.Interface() != nil {
 			db = db.Where(fmt.Sprintf("talent_wx_nickname like '%%%s%%'", value.Interface()))
+		} else if tag == "id" && value.Interface() != nil {
+			db = db.Where(fmt.Sprintf("id like '%%%s%%'", value.Interface()))
 		}
 	}
 

handler/logistics_create.go

@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"fmt"
 	"youngee_m_api/consts"
 	"youngee_m_api/model/http_model"
 	"youngee_m_api/service"
@@ -45,7 +44,6 @@ func (h *CreateLogisticsHandler) run() {
 	data = *h.req
 	isUpdate := data.IsUpdate
 	if isUpdate == 0 {
-		fmt.Println("Create in")
 		res, err := service.Logistics.Create(h.ctx, data)
 		if err != nil {
 			logrus.Errorf("[CreateLogisticsHandler] call Create err:%+v\n", err)

handler/product_create.go

@@ -46,7 +46,7 @@ func (h *CreateProductHandler) run() {
 	fmt.Println("ProductId:", h.req.ProductId)
 	enterpriseID := db.GetEnterpriseIDByProductID(h.ctx, h.req.ProductId)
 	fmt.Println("enterpriseID:", enterpriseID)
-	//根据品牌名和商品名查询商品是否存在，若存在则更新，否则新增
+	// 根据品牌名和商品名查询商品是否存在，若存在则更新，否则新增
 	product, err := service.Product.FindByID(h.ctx, data.ProductId)
 	if err != nil {
 		logrus.Errorf("[CreateProductHandler] call FindByID err:%+v\n", err)

model/gorm_model/talent_bank_info.go

@@ -10,7 +10,7 @@ type YounggeeTalentBank struct {
 	TalentID        string    `gorm:"column:talent_id;NOT NULL"`            // 达人id，取younggee_talent_info表中的id字段值
 	Name            string    `gorm:"column:name"`                          // 户主姓名
 	Phone           string    `gorm:"column:phone"`                         // 手机号
-	BankID          string    `gorm:"column:bank_id;default:0"`             // 银行id，取info_bank表中的bank_id字段值
+	Bank            string    `gorm:"column:bank;default:0"`                // 银行
 	BankCardNumber  string    `gorm:"column:bank_card_number"`              // 银行卡号
 	BankOpenAddress int       `gorm:"column:bank_open_address"`             // 开户地址区域码，取info_region表中的self_code字段值
 	AlipayNumber    string    `gorm:"column:alipay_number"`                 // 支付宝账号

model/http_model/GetRechargeRecordsRequest.go

@@ -15,7 +15,7 @@ type GetRechargeRecordsRequest struct {
 type RechargeRecordsPreview struct {
 	RechargeId      string  `json:"recharge_id"`
 	EnterpriseID    string  `json:"enterprise_id"`
-	UserId          int64   `json:"user_id"`
+	UserId          string  `json:"user_id"`
 	Username        string  `json:"username"`
 	BusinessName    string  `json:"business_name"`
 	RechargeAmount  float64 `json:"recharge_amount"`

model/http_model/InvoiceRecordsRequest.go

@@ -13,7 +13,7 @@ type InvoiceRecordsRequest struct {
 
 type InvoiceRecordsPreviews struct {
 	BillingId      string  `json:"billing_id"`
-	UserId         int64   `json:"user_id"`
+	UserId         string  `json:"user_id"`
 	Username       string  `json:"username"`
 	BusinessName   string  `json:"business_name"`
 	Amount         float64 `json:"amount"`

model/http_model/get_finish_data.go

@@ -5,28 +5,27 @@ type GetFinishDataRequest struct {
 }
 
 type GetFinishDataInfo struct {
-	FeeForm         string `json:"fee_form"`         // 稿费形式，1-3分别代表产品置换、固定稿费、自报价
-	StrategyID      string `json:"strategy_id"`      // 策略id
-	FollowersLow    string `json:"followers_low"`    // 达人粉丝数下限
-	FollowersUp     string `json:"followers_up"`     // 达人粉丝数上限
-	RecruitNumber   string `json:"recruit_number"`   // 招募数量
-	Offer           string `json:"offer"`            // 报价
-	ProjectID       string `json:"project_id"`       // 所属项目id
-	ServiceCharge   string `json:"service_charge"`   // 平台服务费，稿费形式为产品置换时必填
-	SelectedNumber  string `json:"selected_number"`  // 已选数量，被企业选择的达人数量
-	WaitingNumber   string `json:"waiting_number"`   // 待发货
-	DeliveredNumber string `json:"delivered_number"` // 已发货
-	SignedNumber    string `json:"signed_number"`    // 已签收
-	MaxOffer        string `json:"max_offer"`        // 报价上限
-	MinOffer        string `json:"min_offer"`        // 报价下限
-	FanNumber       string `json:"fan_number"`       // 总粉丝量
-	PlayNumber      string `json:"play_number"`      // 总播放量
-	LikeNumber      string `json:"like_number"`      // 总点赞数
-	CollectNumber   string `json:"collect_number"`   // 总收藏量
-	CommentNumber   string `json:"comment_number"`   // 总评论数
-	FinishNumber    string `json:"finish_number"`    // 结案数量
-	TotalOffer      string `json:"total_offer"`      // 支付合计
-
+	FeeForm         string  `json:"fee_form"`         // 稿费形式，1-3分别代表产品置换、固定稿费、自报价
+	StrategyID      string  `json:"strategy_id"`      // 策略id
+	FollowersLow    string  `json:"followers_low"`    // 达人粉丝数下限
+	FollowersUp     string  `json:"followers_up"`     // 达人粉丝数上限
+	RecruitNumber   string  `json:"recruit_number"`   // 招募数量
+	Offer           string  `json:"offer"`            // 报价
+	ProjectID       string  `json:"project_id"`       // 所属项目id
+	ServiceCharge   string  `json:"service_charge"`   // 平台服务费，稿费形式为产品置换时必填
+	SelectedNumber  string  `json:"selected_number"`  // 已选数量，被企业选择的达人数量
+	WaitingNumber   string  `json:"waiting_number"`   // 待发货
+	DeliveredNumber string  `json:"delivered_number"` // 已发货
+	SignedNumber    string  `json:"signed_number"`    // 已签收
+	MaxOffer        string  `json:"max_offer"`        // 报价上限
+	MinOffer        string  `json:"min_offer"`        // 报价下限
+	FanNumber       string  `json:"fan_number"`       // 总粉丝量
+	PlayNumber      string  `json:"play_number"`      // 总播放量
+	LikeNumber      string  `json:"like_number"`      // 总点赞数
+	CollectNumber   string  `json:"collect_number"`   // 总收藏量
+	CommentNumber   string  `json:"comment_number"`   // 总评论数
+	FinishNumber    string  `json:"finish_number"`    // 结案数量
+	TotalOffer      float64 `json:"total_offer"`      // 支付合计
 }
 
 type GetFinishData struct {

model/http_model/logistics_create.go

@@ -1,20 +1,18 @@
 package http_model
 
-import "time"
-
 type CreateLogisticsRequest struct {
-	StrategyID            int64     `json:"strategy_id"`             //招募策略id
-	LogisticsID           int64     `json:"logistics_id"`            // 货物-id
-	CompanyName           string    `json:"company_name"`            // 实物商品-物流公司名称
-	LogisticsNumber       string    `json:"logistics_number"`        // 实物商品-物流单号
-	ExplorestoreStarttime time.Time `json:"explorestore_starttime"`  // 线下探店-探店开始时间
-	ExplorestoreEndtime   time.Time `json:"explorestore_endtime"`    // 线下探店-探店结束时间
-	ExplorestorePeriod    string    `json:"explorestore_period"`     // 线下探店-探店持续时间
-	CouponCodeInformation string    `json:"coupon_code_information"` // 虚拟产品-券码信息
-	TaskID                string    `json:"task_id"`                 // 任务id
-	DeliveryTime          string    `json:"delivery_time"`           // 发货时间
-	ThingsType            int       `json:"things_type"`             //产品类型 1：实物, 2：虚拟产品，3：线下探店
-	IsUpdate              int       `json:"is_update"`               //更新标志位 0：不更新 1：更新
+	StrategyID            int64  `json:"strategy_id"`             //招募策略id
+	LogisticsID           int64  `json:"logistics_id"`            // 货物-id
+	CompanyName           string `json:"company_name"`            // 实物商品-物流公司名称
+	LogisticsNumber       string `json:"logistics_number"`        // 实物商品-物流单号
+	ExplorestoreStarttime string `json:"explorestore_starttime"`  // 线下探店-探店开始时间
+	ExplorestoreEndtime   string `json:"explorestore_endtime"`    // 线下探店-探店结束时间
+	ExplorestorePeriod    string `json:"explorestore_period"`     // 线下探店-探店持续时间
+	CouponCodeInformation string `json:"coupon_code_information"` // 虚拟产品-券码信息
+	TaskID                string `json:"task_id"`                 // 任务id
+	DeliveryTime          string `json:"delivery_time"`           // 发货时间
+	ThingsType            int    `json:"things_type"`             //产品类型 1：实物, 2：虚拟产品，3：线下探店
+	IsUpdate              int    `json:"is_update"`               //更新标志位 0：不更新 1：更新
 }
 
 type CreateLogisticsData struct {

pack/get_finish_data.go

@@ -37,6 +37,6 @@ func MGormRecruitStrategyToHttpGetFinishDataInfo(RecruitStrategy *gorm_model.Rec
 		CollectNumber:   conv.MustString(RecruitStrategy.CollectNumber, ""),
 		CommentNumber:   conv.MustString(RecruitStrategy.CommentNumber, ""),
 		FinishNumber:    conv.MustString(RecruitStrategy.FinishNumber, ""),
-		TotalOffer:      conv.MustString(RecruitStrategy.TotalOffer, ""),
+		TotalOffer:      RecruitStrategy.TotalOffer,
 	}
 }

pack/project_task_list.go

@@ -1,7 +1,6 @@
 package pack
 
 import (
-	"fmt"
 	"github.com/caixw/lib.go/conv"
 	"github.com/tidwall/gjson"
 	"youngee_m_api/model/gorm_model"
@@ -45,7 +44,7 @@ func TaskAccountToTaskInfo(taskAccounts []gorm_model.YoungeeTaskInfo) []*http_mo
 
 func GetTaskInfoStruct(taskAccount gorm_model.YoungeeTaskInfo) *http_model.ProjectTaskInfo {
 	TalentPlatformInfoSnap := taskAccount.TalentPlatformInfoSnap
-	fmt.Printf("任务-账户关联 %+v", taskAccount)
+	//fmt.Printf("任务-账户关联 %+v", taskAccount)
 	return &http_model.ProjectTaskInfo{
 		TaskID:             taskAccount.TaskId,
 		TaskReward:         taskAccount.TaskReward,

route/init.go

@@ -102,12 +102,12 @@ func InitRoute(r *gin.Engine) {
 	u := r.Group("/youngee/m/user")
 	{
 		u.Use(middleware.LoginAuthMiddleware)
-		u.POST("/getUserList", handler.WrapGetUserListHandler)
-		u.POST("/updateUserInfo", handler.WrapUpdateUserInfoHandler)
-		u.POST("/createUser", handler.WrapCreateUserHandler)
-		u.POST("/disabledUser", handler.WrapDisabledUserHandler)
-		u.POST("/enterpriseUser", handler.WrapEnterpriseUserHandler)
-		u.POST("/creatorList", handler.WrapCreatorListHandler)
+		u.POST("/getUserList", handler.WrapGetUserListHandler)       // 查找员工账号信息
+		u.POST("/updateUserInfo", handler.WrapUpdateUserInfoHandler) // 修改员工信息
+		u.POST("/createUser", handler.WrapCreateUserHandler)         // 创建员工账号
+		u.POST("/disabledUser", handler.WrapDisabledUserHandler)     // 禁用员工账号
+		u.POST("/enterpriseUser", handler.WrapEnterpriseUserHandler) // 查找企业用户信息
+		u.POST("/creatorList", handler.WrapCreatorListHandler)       // 查找创作者信息
 		u.POST("/platformAccInfo", handler.WrapPlatformAccInfoHandler)
 		u.POST("/talentInfo", handler.WrapTalentInfoHandler)
 		u.POST("/accountInfo", handler.WrapAccountInfoHandler)

service/login_auth.go

@@ -138,9 +138,11 @@ func (l *loginAuth) parseToken(ctx context.Context, token string) (string, error
 	}
 	return "", errors.New("token invalid")
 }
+
 func (l *loginAuth) encryptPassword(password string) string {
 	return util.MD5(password)
 }
+
 func (l *loginAuth) getRedisKey(key string) string {
 	return fmt.Sprintf("%s%s", consts.SessionRedisPrefix, key)
 }

service/logistics.go

@@ -32,15 +32,19 @@ func (*logistics) Create(ctx context.Context, newLogistics http_model.CreateLogi
 		DeliveryTime:          time.Now(),
 		SignedTime:            time.Now(),
 	}
-	fmt.Println("ThingsType:", ThingsType)
+	//fmt.Println("ThingsType:", ThingsType)
 	//实物
 	if ThingsType == 1 {
 		Logistics.CompanyName = newLogistics.CompanyName
 		Logistics.LogisticsNumber = newLogistics.LogisticsNumber
 		Logistics.DeliveryTime = time.Now()
 	} else if ThingsType == 3 {
-		Logistics.ExplorestoreStarttime = newLogistics.ExplorestoreStarttime
-		Logistics.ExplorestoreEndtime = newLogistics.ExplorestoreEndtime
+		fmt.Println("开始时间：", newLogistics.ExplorestoreStarttime)
+		fmt.Println("结束时间：", newLogistics.ExplorestoreEndtime)
+		ExplorestoreStarttime, _ := time.ParseInLocation("2006-01-02 15:04:05", newLogistics.ExplorestoreStarttime, time.Local)
+		ExplorestoreEndtime, _ := time.ParseInLocation("2006-01-02 15:04:05", newLogistics.ExplorestoreEndtime, time.Local)
+		Logistics.ExplorestoreStarttime = ExplorestoreStarttime
+		Logistics.ExplorestoreEndtime = ExplorestoreEndtime
 		// Logistics.ExplorestorePeriod = newLogistics.ExplorestorePeriod
 	} else {
 		Logistics.CouponCodeInformation = newLogistics.CouponCodeInformation
@@ -129,8 +133,11 @@ func (*logistics) Update(ctx context.Context, newLogistics http_model.CreateLogi
 		Logistics.LogisticsNumber = newLogistics.LogisticsNumber
 	} else if ThingsType == 3 {
 		fmt.Println("开始时间：", newLogistics.ExplorestoreStarttime)
-		Logistics.ExplorestoreStarttime = newLogistics.ExplorestoreStarttime
-		Logistics.ExplorestoreEndtime = newLogistics.ExplorestoreEndtime
+		fmt.Println("结束时间：", newLogistics.ExplorestoreEndtime)
+		ExplorestoreStarttime, _ := time.ParseInLocation("2006-01-02 15:04:05", newLogistics.ExplorestoreStarttime, time.Local)
+		ExplorestoreEndtime, _ := time.ParseInLocation("2006-01-02 15:04:05", newLogistics.ExplorestoreEndtime, time.Local)
+		Logistics.ExplorestoreStarttime = ExplorestoreStarttime
+		Logistics.ExplorestoreEndtime = ExplorestoreEndtime
 		// Logistics.ExplorestorePeriod = newLogistics.ExplorestorePeriod
 	} else {
 		Logistics.CouponCodeInformation = newLogistics.CouponCodeInformation

service/number_info.go

@@ -155,6 +155,5 @@ func (*number) GetSpecialFinishData(ctx context.Context, request http_model.GetS
 		logrus.WithContext(ctx).Errorf("[Data service] call CreateData error,err:%+v", err)
 		return nil, err
 	}
-
 	return NumberData, nil
 }

service/project.go

@@ -436,13 +436,14 @@ func (*project) Update(ctx context.Context, newProject http_model.UpdateProjectR
 				Strategy.TOffer = Strategy.Offer * (1 - conv.MustFloat64(pricingStrategy.ServiceRate, 0)/1000)
 			}
 			RecruitStrategy := gorm_model.RecruitStrategy{
-				FeeForm:       conv.MustInt64(Strategy.FeeForm, 0),
-				StrategyID:    conv.MustInt64(Strategy.StrategyID, 0),
-				FollowersLow:  conv.MustInt64(Strategy.FollowersLow, 0),
-				FollowersUp:   conv.MustInt64(Strategy.FollowersUp, 0),
-				RecruitNumber: conv.MustInt64(Strategy.RecruitNumber, 0),
-				Offer:         conv.MustFloat64(Strategy.Offer, 0),
-				TOffer:        conv.MustFloat64(Strategy.TOffer, 0),
+				FeeForm:       Strategy.FeeForm,
+				StrategyID:    Strategy.StrategyID,
+				FollowersLow:  Strategy.FollowersLow,
+				FollowersUp:   Strategy.FollowersUp,
+				RecruitNumber: Strategy.RecruitNumber,
+				Offer:         Strategy.Offer,
+				TOffer:        Strategy.TOffer,
+				ServiceCharge: Strategy.ServiceCharge,
 				ProjectID:     project.ProjectID,
 			}
 			fmt.Printf("Offer:\t %+v", Strategy.Offer)
@@ -549,22 +550,28 @@ func (*project) GetTaskLogisticsList(ctx context.Context, projectID string, page
 }
 
 func (*project) ChangeTaskStatus(ctx *gin.Context, data http_model.ProjectChangeTaskStatusRequest) interface{} {
+	fmt.Println("taskIds :", data.TaskIds)
+	fmt.Println("task_status :", data.TaskStatus)
 	RecruitStrategyIDs, err := db.ChangeTaskStatus(ctx, data.TaskIds, data.TaskStatus)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
 		return err
 	}
 	if data.TaskStatus == "2" {
-		err = db.CalculateSelectedNumberByRecruitStrategyID(ctx, RecruitStrategyIDs, 1)
-		if err != nil {
-			logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
-			return err
+		for _, RecruitStrategyID := range RecruitStrategyIDs {
+			err = db.CalculateSelectedNumberByRecruitStrategyID(ctx, RecruitStrategyID, 1)
+			if err != nil {
+				logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
+				return err
+			}
 		}
 	} else {
-		err = db.CalculateSelectedNumberByRecruitStrategyID(ctx, RecruitStrategyIDs, -1)
-		if err != nil {
-			logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
-			return err
+		for _, RecruitStrategyID := range RecruitStrategyIDs {
+			err = db.CalculateSelectedNumberByRecruitStrategyID(ctx, RecruitStrategyID, -1)
+			if err != nil {
+				logrus.WithContext(ctx).Errorf("[project service] call ChangeTaskStatus error,err:%+v", err)
+				return err
+			}
 		}
 	}
 	return nil

service/terminate.go

@@ -23,7 +23,7 @@ func (*terminate) TaskTerminate(ctx context.Context, request http_model.TaskTerm
 		TaskIDList = append(TaskIDList, taskId)
 	}
 	fmt.Printf("acc request %+v", TaskIDList)
-	err := db.Terminate(ctx, TaskIDList)
+	err := db.Terminate(ctx, TaskIDList, request.ProjectIds)
 	if err != nil {
 		logrus.WithContext(ctx).Errorf("[Terminate service] call CreateTerminate error,err:%+v", err)
 		return nil, err