task_logs

db/product_photo.go

@@ -44,8 +44,8 @@ func GetStorePhotoByStoreID(ctx context.Context, storeId int) ([]gorm_model.Youn
 	return productPhotos, nil
 }
 
-// GetTeamPhotoByStoreID 根据团购ID查找团购图片信息
-func GetTeamPhotoByStoreID(ctx context.Context, teamId int) ([]gorm_model.YounggeeProductPhoto, error) {
+// GetTeamPhotoByTeamID 根据团购ID查找团购图片信息
+func GetTeamPhotoByTeamID(ctx context.Context, teamId int) ([]gorm_model.YounggeeProductPhoto, error) {
 	db := GetReadDB(ctx)
 	productPhotos := []gorm_model.YounggeeProductPhoto{}
 	err := db.Where("team_buying_id = ?", teamId).Find(&productPhotos).Error

db/s_local_life.go

@@ -174,7 +174,7 @@ func GetSpecialLocalLifeList(ctx context.Context, pageSize, pageNum int32, condi
 	db := GetReadDB(ctx)
 
 	// 根据带货任务状态过滤
-	db = db.Debug().Model(gorm_model.YounggeeSLocalLifeInfo{}).Where("task_status = 4 and local_type = 2")
+	db = db.Debug().Model(gorm_model.YounggeeSLocalLifeInfo{}).Where("task_status = 8 and local_type = 2")
 
 	// 根据Project条件过滤
 	conditionType := reflect.TypeOf(condition).Elem()

db/s_project.go

@@ -77,7 +77,7 @@ func GetSpecialProjectList(ctx context.Context, supplierId int, pageSize, pageNu
 	db := GetReadDB(ctx)
 
 	// 1. 根据服务商id过滤
-	db = db.Debug().Model(gorm_model.SProjectInfo{}).Where("supplier_id = ? and project_status = 4 and project_type = 2", supplierId)
+	db = db.Debug().Model(gorm_model.SProjectInfo{}).Where("supplier_id = ? and project_status = 8 and project_type = 2", supplierId)
 
 	// 2. 根据SProjectCondition条件过滤
 	conditionType := reflect.TypeOf(condition).Elem()

db/sub_account.go

@@ -49,7 +49,7 @@ func FindSubAccountByPhone(ctx context.Context, phone string) (*gorm_model.Young
 	if err != nil {
 		return nil, err
 	}
-	fmt.Println(total)
+	// fmt.Println(total)
 	if total == 0 {
 		return nil, err
 	}

db/task_log.go

@@ -22,3 +22,19 @@ func CreateTaskLog(ctx context.Context, taskId string, log string) error {
 	}
 	return nil
 }
+
+// GetTaskLogsByTaskId 获取达人日志
+func GetTaskLogsByTaskId(ctx context.Context, taskId string) ([]*gorm_model.YounggeeTaskLog, int64, error) {
+	db := GetReadDB(ctx)
+	var total int64
+	var taskLogs []*gorm_model.YounggeeTaskLog
+	whereCondition := gorm_model.YounggeeTaskLog{TaskID: taskId}
+	err := db.Model(gorm_model.YounggeeTaskLog{}).Where(whereCondition).Find(&taskLogs).Count(&total).Error
+	if err != nil {
+		return nil, 0, err
+	}
+	if total == 0 {
+		return nil, 0, err
+	}
+	return taskLogs, total, nil
+}

model/common_model/full_local_life_condition.go

@@ -8,6 +8,7 @@ type SLocalLifeCondition struct {
 	LocalId         string `condition:"local_id"`           // 本地生活ID
 	TaskStatus      int    `condition:"task_status"`        // 任务状态
 	LocalName       string `condition:"local_name"`         // 本地生活标题
+	LocalType       int    `condition:"local_type"`
 }
 
 type SSpecialLocalLifeCondition struct {

model/gorm_model/enterprise.go

@@ -5,20 +5,29 @@ import (
 )
 
 type Enterprise struct {
-	EnterpriseID     string    `gorm:"column:enterprise_id"`     // 企业id，用户ID的生成规则为:1(企业用户代码)+分秒数字+四位随机数字
-	Industry         int64     `gorm:"column:industry"`          // 行业，1-14分别代表能源、化工、材料、机械设备/军工、企业服务/造纸印刷、运输设备、旅游酒店、媒体/信息通信服务、批发/零售、消费品、卫生保健/医疗、金融、建材/建筑/房地产、公共事业
-	BusinessName     string    `gorm:"column:business_name"`     // 公司或组织名称
-	UserID           int64     `gorm:"column:user_id"`           // 对应用户id
-	Balance          float64   `gorm:"column:balance"`           // 账户余额
-	FrozenBalance    float64   `gorm:"column:frozen_balance"`    // 冻结余额
-	AvailableBalance float64   `gorm:"column:available_balance"` // 可用余额
-	BillableAmount   float64   `gorm:"column:billable_amount"`   // 可开票金额
-	Invoicing        float64   `gorm:"column:invoicing"`         // 开票中金额
-	Recharging       float64   `gorm:"column:recharging"`        // 充值中金额
-	CreatedAt        time.Time `gorm:"column:created_at"`        // 创建时间
-	UpdatedAt        time.Time `gorm:"column:updated_at"`        // 更新时间
-	Phone            string    `gorm:"column:phone"`             // 手机号
-	AuthStatus       int       `gorm:"column:auth_status"`       // 商家认证状态，0未认证，1已认证
+	EnterpriseID     string    `gorm:"column:enterprise_id;primary_key"`      // 企业id，用户ID的生成规则为:1(企业用户代码)+分秒数字+四位随机数字
+	Industry         int64     `gorm:"column:industry"`                       // 行业，1-14分别代表能源、化工、材料、机械设备/军工、企业服务/造纸印刷、运输设备、旅游酒店、媒体/信息通信服务、批发/零售、消费品、卫生保健/医疗、金融、建材/建筑/房地产、公共事业
+	BusinessName     string    `gorm:"column:business_name"`                  // 公司或组织名称
+	TaxNumber        string    `gorm:"column:tax_number"`                     // 企业税号
+	Address          string    `gorm:"column:address"`                        // 公司注册地址
+	UserID           int64     `gorm:"column:user_id"`                        // 对应用户id
+	Balance          float64   `gorm:"column:balance"`                        // 账户余额
+	FrozenBalance    float64   `gorm:"column:frozen_balance"`                 // 冻结余额
+	AvailableBalance float64   `gorm:"column:available_balance"`              // 可用余额
+	BillableAmount   float64   `gorm:"column:billable_amount"`                // 可开票金额（3.0暂未用到）
+	Invoicing        float64   `gorm:"column:invoicing"`                      // 开票中金额（3.0暂未用到）
+	Recharging       float64   `gorm:"column:recharging"`                     // 充值中金额（3.0暂未用到）
+	CreatedAt        time.Time `gorm:"column:created_at"`                     // 创建时间
+	UpdatedAt        time.Time `gorm:"column:updated_at"`                     // 更新时间
+	AuthStatus       int       `gorm:"column:auth_status;default:0;NOT NULL"` // 商家认证状态，0未认证，1已认证
+	Avatar           string    `gorm:"column:avatar;NOT NULL"`                // 头像
+	Phone            string    `gorm:"column:phone;NOT NULL"`                 // 手机号
+	ContactPhone     string    `gorm:"column:contact_phone"`                  // 联系方式手机(不一定是绑定的手机号)
+	WechatNumber     string    `gorm:"column:wechat_number"`                  // 微信号
+	WechatQrCode     string    `gorm:"column:wechat_qr_code"`                 // 微信二维码
+	BusinessLicense  string    `gorm:"column:business_license"`               // 营业执照url
+	Usci             string    `gorm:"column:usci"`                           // 统一社会信用代码
+	EnterpriseName   string    `gorm:"column:enterprise_name"`                // 商家用户名称
 }
 
 func (m *Enterprise) TableName() string {

model/http_model/enterprise_supplier_cooperate.go

@@ -2,7 +2,7 @@ package http_model
 
 type EnterpriseListRequest struct {
 	PageSize        int64 `json:"page_size"`
-	PageNum         int64 `json:"page_num"`
+	PageNum         int64 `json:"page"`
 	SupplierId      int   `json:"supplier_id"`      // 服务商ID
 	CooperateStatus int   `json:"cooperate_status"` // 邀约状态：1待同意，2已同意，3已拒绝
 }
@@ -29,6 +29,9 @@ type EnterpriseSupplierCooperateData struct {
 	CreateTime         string `json:"create_time"`          // 合作邀约时间
 	AgreeTime          string `json:"agree_time"`           // 同意邀约时间
 	RejectTime         string `json:"reject_time"`          // 拒绝邀约时间
+	CompanyName        string `json:"company_name"`         // 商家认证公司名称
+	WechatNumber       string `json:"wechat_number"`        // 微信号码
+	WechatQrCode       string `json:"wechat_qr_code"`       // 微信二维码url
 }
 
 func NewEnterpriseListRequest() *EnterpriseListRequest {

model/http_model/s_local_life_list.go

@@ -30,6 +30,7 @@ type FullSLocalPreview struct {
 	StoreMainPhotoUid    string  `json:"store_main_photo_uid"`    // uid
 	StoreName            string  `json:"store_name"`              // 门店名称
 	StoreId              int     `json:"store_id"`                // 门店ID
+	TeamBuyingId         int     `json:"team_buying_id"`          // 团购ID
 	ApplyNum             int     `json:"apply_num"`               // 报名人数
 	RecruitNum           int     `json:"recruit_num"`             // 已招募人数
 	SettleNum            int     `json:"settle_num"`              // 已结算人数

model/http_model/show_task_progress.go

@@ -1,26 +1,18 @@
 package http_model
 
-import (
-	"time"
-	"youngee_b_api/model/gorm_model"
-)
+import "youngee_b_api/model/gorm_model"
 
 type ShowTaskProgressData struct {
-	TaskId          string                           `json:"task_id"`          // 种草子任务ID
-	ProjectId       string                           `json:"project_id"`       // 种草任务ID
-	TalentId        string                           `json:"talent_id"`        // 达人ID
-	CreateData      time.Time                        `json:"create_data"`      // 创建时间，即报名时间
-	SelectDate      time.Time                        `json:"select_date"`      // 反选时间，即任务开始执行时间
-	DeliveryDate    time.Time                        `json:"delivery_date"`    // 发货时间
-	SignedTime      time.Time                        `json:"signed_time"`      // 签收时间
-	SketchInfo      []*gorm_model.YounggeeSketchInfo `json:"sketch_info"`      // 初稿信息
-	LinkInfo        []*gorm_model.YounggeeLinkInfo   `json:"link_info"`        // 链接信息
-	ServiceCharge   float64                          `json:"service_charge"`   // 服务费
-	DraftFee        float64                          `json:"draft_fee"`        // 达人稿费
-	TerminateTime   time.Time                        `json:"terminate_time"`   // 终止合作时间
-	TerminateReason string                           `json:"terminate_reason"` // 终止合作理由
-	CancelTime      time.Time                        `json:"cancel_time"`      // 解约时间
-	CancelReason    string                           `json:"cancel_reason"`    // 解约理由
+	TaskId                  string                        `json:"task_id"`                    // 种草子任务ID
+	ProjectId               string                        `json:"project_id"`                 // 种草任务ID
+	TalentId                string                        `json:"talent_id"`                  // 达人ID
+	TalentHeadUrl           string                        `json:"talent_head_url"`            // 达人头像url
+	TalentPlatformAccountId string                        `json:"talent_platform_account_id"` // 达人平台账号
+	TalentLocation          string                        `json:"talent_location"`            // 达人地域
+	ServiceCharge           float64                       `json:"service_charge"`             // 服务费
+	DraftFee                float64                       `json:"draft_fee"`                  // 达人稿费
+	TaskStage               int                           `json:"task_stage"`                 // 任务状态
+	TaskLogs                []*gorm_model.YounggeeTaskLog `json:"task_logs"`                  // 任务日志
 }
 
 type ShowTaskProgressRequest struct {

service/local_life.go

@@ -39,6 +39,8 @@ func (*localLife) GetFullLocalLifeList(ctx context.Context, pageSize, pageNum in
 		fullLocalPreview.TaskForm = fullLocal.TaskForm
 		fullLocalPreview.LocalType = fullLocal.LocalType
 		fullLocalPreview.LocalContentType = fullLocal.ContentType
+		fullLocalPreview.StoreId = fullLocal.StoreId
+		fullLocalPreview.RecruitDdl = conv.MustString(fullLocal.RecruitDdl)[0:19]
 		fullLocalData.FullPreview = append(fullLocalData.FullPreview, fullLocalPreview)
 	}
 
@@ -56,13 +58,14 @@ func (*localLife) GetFullLocalLifeList(ctx context.Context, pageSize, pageNum in
 		}
 
 		// 2.2. 门店图片信息
+		//fmt.Println("store_id", local.StoreId)
 		productPhotoInfo, productPhotoErr := db.GetStorePhotoByStoreID(ctx, local.StoreId)
 		if productPhotoErr != nil {
 			return nil, productPhotoErr
 		}
 		if productPhotoInfo != nil {
 			for _, photo := range productPhotoInfo {
-				fmt.Println(photo)
+				//fmt.Println(photo)
 				if photo.Symbol == 1 {
 					local.ProductPhotoSymbol = 1
 					local.ProductPhotoUrl = photo.PhotoUrl
@@ -88,7 +91,7 @@ func (*localLife) GetFullLocalLifeList(ctx context.Context, pageSize, pageNum in
 		}
 
 		// 2.4. 判断是否加入商单
-		fmt.Println(local.LocalId)
+		// fmt.Println(local.LocalId)
 		sProjectCount, sProjectErr := db.FindSLocalByLocalIdAndSupplierId(ctx, local.LocalId, supplierId)
 		if sProjectErr != nil {
 			return nil, sProjectErr
@@ -203,10 +206,11 @@ func (*localLife) ShowLocalLife(ctx context.Context, req *http_model.ShowLocalRe
 		localInfo.EnterpriseId = localData.EnterpriseId
 		localInfo.ServiceChargeRate = localData.ServiceChargeRate
 		localInfo.EstimatedCost = localData.EstimatedCost
-		localInfo.CreateAt = conv.MustString(localData.CreatedAt)
+		localInfo.CreateAt = conv.MustString(localData.CreatedAt)[0:19]
 
 		// 2. 关联主体
 		// 2.1. 门店信息
+
 		storeInfo, storeErr := db.FindStoreById(ctx, localData.StoreId)
 		if storeErr != nil {
 			return nil, storeErr
@@ -215,7 +219,7 @@ func (*localLife) ShowLocalLife(ctx context.Context, req *http_model.ShowLocalRe
 			localInfo.StoreId = storeInfo.StoreId
 			localInfo.StoreName = storeInfo.StoreName
 			localInfo.StoreCategory = storeInfo.StoreCategory
-			localInfo.StoreRelatedAt = conv.MustString(localData.StoreRelatedAt)
+			localInfo.StoreRelatedAt = conv.MustString(localData.StoreRelatedAt)[0:19]
 
 			// 2.2. 门店图片信息
 			storePhotoInfo, storePhotoErr := db.GetStorePhotoByStoreID(ctx, localData.StoreId)
@@ -234,18 +238,19 @@ func (*localLife) ShowLocalLife(ctx context.Context, req *http_model.ShowLocalRe
 		}
 
 		// 2.3. 团购信息
-		teamInfo, teamErr := db.FindTeamById(ctx, localData.StoreId)
+		fmt.Println(localData.TeamBuyingId)
+		teamInfo, teamErr := db.FindTeamById(ctx, localData.TeamBuyingId)
 		if teamErr != nil {
 			return nil, teamErr
 		}
 		if teamInfo != nil {
-			localInfo.TeamBuyingId = teamInfo.StoreId
+			localInfo.TeamBuyingId = teamInfo.TeamBuyingId
 			localInfo.TeamBuyingName = teamInfo.TeamBuyingName
 			localInfo.TeamBuyingCategory = teamInfo.TeamBuyingCategory
 			localInfo.TeamBuyingRelatedAt = conv.MustString(localData.TeamBuyingRelatedAt)[0:19]
 
 			// 2.4. 团购图片信息
-			teamPhotoInfo, teamPhotoErr := db.GetTeamPhotoByStoreID(ctx, localData.StoreId)
+			teamPhotoInfo, teamPhotoErr := db.GetTeamPhotoByTeamID(ctx, localData.TeamBuyingId)
 			if teamPhotoErr != nil {
 				return nil, teamPhotoErr
 			}
@@ -284,7 +289,7 @@ func (*localLife) ShowLocalLife(ctx context.Context, req *http_model.ShowLocalRe
 			}
 			localInfo.TalentType = strings.Join(categories, ",")
 		}
-		localInfo.RecruitDdl = conv.MustString(localData.RecruitDdl)
+		localInfo.RecruitDdl = conv.MustString(localData.RecruitDdl)[0:19]
 		recruitStrategy, recruitErr := db.GetRecruitStrategyByProjectId(ctx, req.LocalId)
 		if recruitErr != nil {
 			return nil, recruitErr
@@ -396,7 +401,7 @@ func (*localLife) GetTeamBuyingInfo(ctx context.Context, req *http_model.FindTea
 		Photos = &http_model.TeamBuyingPhoto{}
 
 		// 2.4. 团购图片信息
-		teamPhotoInfo, teamPhotoErr := db.GetTeamPhotoByStoreID(ctx, req.TeamBuyingId)
+		teamPhotoInfo, teamPhotoErr := db.GetTeamPhotoByTeamID(ctx, req.TeamBuyingId)
 		if teamPhotoErr != nil {
 			return nil, teamPhotoErr
 		}

service/project.go

@@ -770,53 +770,93 @@ func (*project) GetSpecialProjectTaskList(ctx context.Context, projectID string,
 
 // ShowTaskProgress ToDo
 // ShowTaskProgress 展示种草子任务进度
-func (p *project) ShowTaskProgress(ctx *gin.Context, data http_model.ShowTaskProgressRequest) (*http_model.ShowTaskProgressData, error) {
+func (p *project) ShowTaskProgress(ctx *gin.Context, req http_model.ShowTaskProgressRequest) (*http_model.ShowTaskProgressData, error) {
 	// 1. 初始化返回数据结构体
 	var taskProgressData *http_model.ShowTaskProgressData
 	taskProgressData = &http_model.ShowTaskProgressData{}
 
-	// 2. 根据task_id筛选出对应的子任务基础信息
-	taskInfo, taskErr := db.GetTaskByTaskId(ctx, data.TaskId)
-	if taskErr != nil {
-		return nil, taskErr
+	// 1. 保存日志
+	taskLogs, total, taskLogsErr := db.GetTaskLogsByTaskId(ctx, req.TaskId)
+	if taskLogsErr != nil {
+		return nil, taskLogsErr
+	}
+	if taskLogs != nil {
+		fmt.Println(total)
+		for _, taskLog := range taskLogs {
+			taskProgressData.TaskLogs = append(taskProgressData.TaskLogs, taskLog)
+		}
+	}
+
+	// 2. 子任务信息
+	taskInfo, taskInfoErr := db.GetTaskByTaskId(ctx, req.TaskId)
+	if taskInfoErr != nil {
+		return nil, taskInfoErr
 	}
 	if taskInfo != nil {
-		taskProgressData.TaskId = data.TaskId
-		taskProgressData.CreateData = taskInfo.CreateDate
-		taskProgressData.SelectDate = taskInfo.SelectDate
-		taskProgressData.DeliveryDate = taskInfo.DeliveryDate
-		taskProgressData.SignedTime = taskInfo.SignedTime
+		taskProgressData.TaskId = req.TaskId
+		taskProgressData.TaskStage = taskInfo.TaskStage
 		taskProgressData.ServiceCharge = taskInfo.ServiceCharge
 		taskProgressData.DraftFee = taskInfo.DraftFee
-	}
+		taskProgressData.ProjectId = taskInfo.ProjectID
 
-	// 3. 筛选出上传初稿时间和初稿状态
-	taskSketchs, taskSketchErr := db.FindSketchInfoByTaskId(ctx, data.TaskId)
-	if taskSketchErr != nil {
-		return nil, taskSketchErr
-	}
-	if taskSketchs != nil {
-		taskProgressData.SketchInfo = taskSketchs
+		// 3. 达人信息
+		platformUserInfo, platformUserErr := db.FindUserInfoByOpenId(ctx, taskInfo.OpenId)
+		if platformUserErr != nil {
+			return nil, platformUserErr
+		}
+		if platformUserInfo != nil {
+			taskProgressData.TalentHeadUrl = platformUserInfo.HeadUri
+			taskProgressData.TalentLocation = platformUserInfo.City
+		}
 	}
+	return taskProgressData, nil
 
-	// 4. 筛选作品链接上传时间和状态
-	taskLinks, taskLinksErr := db.GetLinkByTaskId(ctx, data.TaskId)
-	if taskLinksErr != nil {
-		return nil, taskLinksErr
-	}
-	if taskLinks != nil {
-		taskProgressData.LinkInfo = taskLinks
-	}
+	/*
 
-	// 5. 若有违约，筛选出违约情况
-	if taskInfo != nil {
-		taskProgressData.TerminateTime = taskInfo.TerminateTime
-		taskProgressData.TerminateReason = taskInfo.TerminateReason
-		taskProgressData.CancelTime = taskInfo.CancelTime
-		taskProgressData.CancelReason = taskInfo.CancelReason
-	}
+		// 2. 根据task_id筛选出对应的子任务基础信息
+		taskInfo, taskErr := db.GetTaskByTaskId(ctx, data.TaskId)
+		if taskErr != nil {
+			return nil, taskErr
+		}
+		if taskInfo != nil {
+			taskProgressData.TaskId = data.TaskId
+			taskProgressData.CreateData = taskInfo.CreateDate
+			taskProgressData.SelectDate = taskInfo.SelectDate
+			taskProgressData.DeliveryDate = taskInfo.DeliveryDate
+			taskProgressData.SignedTime = taskInfo.SignedTime
+			taskProgressData.ServiceCharge = taskInfo.ServiceCharge
+			taskProgressData.DraftFee = taskInfo.DraftFee
+		}
 
-	return taskProgressData, nil
+		// 3. 筛选出上传初稿时间和初稿状态
+		taskSketchs, taskSketchErr := db.FindSketchInfoByTaskId(ctx, data.TaskId)
+		if taskSketchErr != nil {
+			return nil, taskSketchErr
+		}
+		if taskSketchs != nil {
+			taskProgressData.SketchInfo = taskSketchs
+		}
+
+		// 4. 筛选作品链接上传时间和状态
+		taskLinks, taskLinksErr := db.GetLinkByTaskId(ctx, data.TaskId)
+		if taskLinksErr != nil {
+			return nil, taskLinksErr
+		}
+		if taskLinks != nil {
+			taskProgressData.LinkInfo = taskLinks
+		}
+
+		// 5. 若有违约，筛选出违约情况
+		if taskInfo != nil {
+			taskProgressData.TerminateTime = taskInfo.TerminateTime
+			taskProgressData.TerminateReason = taskInfo.TerminateReason
+			taskProgressData.CancelTime = taskInfo.CancelTime
+			taskProgressData.CancelReason = taskInfo.CancelReason
+		}
+
+		return taskProgressData, nil
+
+	*/
 }
 
 func (p *project) GetProjectStrategys(ctx *gin.Context, projectId string) ([]gorm_model.RecruitStrategy, error) {

service/s_local_life.go

@@ -149,18 +149,18 @@ func (*sLocalLife) ShowSLocalLife(ctx context.Context, req *http_model.ShowSLoca
 		}
 
 		// 2.3. 团购信息
-		teamInfo, teamErr := db.FindTeamById(ctx, localInfo.StoreId)
+		teamInfo, teamErr := db.FindTeamById(ctx, localInfo.TeamBuyingId)
 		if teamErr != nil {
 			return nil, teamErr
 		}
 		if teamInfo != nil {
-			sLocalInfo.TeamBuyingId = teamInfo.StoreId
+			sLocalInfo.TeamBuyingId = teamInfo.TeamBuyingId
 			sLocalInfo.TeamBuyingName = teamInfo.TeamBuyingName
 			sLocalInfo.TeamBuyingCategory = teamInfo.TeamBuyingCategory
 			sLocalInfo.TeamBuyingRelatedAt = conv.MustString(localInfo.TeamBuyingRelatedAt)
 
 			// 2.4. 团购图片信息
-			teamPhotoInfo, teamPhotoErr := db.GetTeamPhotoByStoreID(ctx, localInfo.StoreId)
+			teamPhotoInfo, teamPhotoErr := db.GetTeamPhotoByTeamID(ctx, localInfo.TeamBuyingId)
 			if teamPhotoErr != nil {
 				return nil, teamPhotoErr
 			}
@@ -256,6 +256,9 @@ func (*sLocalLife) GetFullSLocalLifeList(ctx context.Context, pageSize, pageNum
 		var fullLocalPreview *http_model.FullSLocalPreview
 		fullLocalPreview = &http_model.FullSLocalPreview{}
 		fullLocalPreview.LocalId = fullLocal.LocalId
+		fullLocalPreview.SLocalId = fullLocal.SLocalId
+		fullLocalPreview.StoreId = fullLocal.StoreId
+		fullLocalPreview.TeamBuyingId = fullLocal.TeamBuyingId
 		fullLocalPreview.TaskStatus = fullLocal.TaskStatus
 		fullLocalPreview.LocalPlatform = fullLocal.LocalPlatform
 		fullLocalPreview.TaskForm = fullLocal.TaskForm
@@ -298,7 +301,7 @@ func (*sLocalLife) GetFullSLocalLifeList(ctx context.Context, pageSize, pageNum
 		}
 		if productPhotoInfo != nil {
 			for _, photo := range productPhotoInfo {
-				fmt.Println(photo)
+				// fmt.Println(photo)
 				if photo.Symbol == 1 {
 					local.StoreMainPhotoSymbol = 1
 					local.StoreMainPhotoUrl = photo.PhotoUrl