Merge remote-tracking branch 'origin/develop' into develop

app/dao/local_life_dao.go

@@ -112,7 +112,7 @@ func (d LocalLifeDao) GetLocalPreviews(param *vo.LocalSearchParam) ([]vo.ReLocal
 		query = query.Where("enterprise_id = ? or local_id = ? or local_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, local_id, local_platform, task_status, estimated_cost, need_pay, task_form, content_type, need_review, need_quality, need_calculate, store_id, team_buying_id, tools")
+	query = query.Select("enterprise_id, sub_account_id, local_id, local_name, local_platform, task_status, estimated_cost, need_pay, task_form, content_type, need_review, need_quality, need_calculate, store_id, team_buying_id, tools")
 	offset := (param.Page - 1) * param.PageSize
 	if param.Order == 1 {
 		if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&localLifes).Error; err != nil {
@@ -128,6 +128,7 @@ func (d LocalLifeDao) GetLocalPreviews(param *vo.LocalSearchParam) ([]vo.ReLocal
 			EnterpriseId:  localLife.EnterpriseID,
 			SubAccountId:  localLife.SubAccountID,
 			LocalId:       localLife.LocalID,
+			LocalName:     localLife.LocalName,
 			LocalPlatform: localLife.LocalPlatform,
 			LocalStatus:   localLife.TaskStatus,
 			LocalForm:     localLife.TaskForm,
@@ -187,7 +188,7 @@ func (d LocalLifeDao) GetLocalDraftList(param *vo.LocalDraftParam) ([]vo.ReLocal
 		query = query.Where("enterprise_id = ? or local_id = ? or local_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, local_id, local_platform, local_type, created_at, store_id")
+	query = query.Select("enterprise_id, sub_account_id, local_id, local_name, local_platform, local_type, created_at, store_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&localLifeInfos).Error; err != nil {
 		return nil, 0, err
@@ -197,6 +198,7 @@ func (d LocalLifeDao) GetLocalDraftList(param *vo.LocalDraftParam) ([]vo.ReLocal
 			EnterpriseId:  localLifeInfo.EnterpriseID,
 			SubAccountId:  localLifeInfo.SubAccountID,
 			LocalId:       localLifeInfo.LocalID,
+			LocalName:     localLifeInfo.LocalName,
 			LocalPlatform: localLifeInfo.LocalPlatform,
 			LocalType:     localLifeInfo.LocalType,
 			CreatedAt:     localLifeInfo.CreatedAt.Format("2006-01-02 15:04:05"),
@@ -288,7 +290,7 @@ func (d LocalLifeDao) GetLocalStoreExplorePreviews(param *vo.LocalSearchParam) (
 	}
 	query = query.Where("task_status = ? AND task_form = ?", 8, 1)
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, local_id, local_type, local_platform, need_reserve, need_confirm, need_explore, explored_num, store_id, team_buying_id")
+	query = query.Select("enterprise_id, sub_account_id, local_id, local_name, local_type, local_platform, need_reserve, need_confirm, need_explore, explored_num, store_id, team_buying_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("pay_at asc").Offset(offset).Limit(param.PageSize).Find(&localLifes).Error; err != nil {
 		return nil, 0, err
@@ -298,6 +300,7 @@ func (d LocalLifeDao) GetLocalStoreExplorePreviews(param *vo.LocalSearchParam) (
 			EnterpriseId:  localLife.EnterpriseID,
 			SubAccountId:  localLife.SubAccountID,
 			LocalId:       localLife.LocalID,
+			LocalName:     localLife.LocalName,
 			LocalPlatform: localLife.LocalPlatform,
 			LocalType:     localLife.LocalType,
 			NeedReserve:   localLife.NeedReserve,
@@ -341,7 +344,7 @@ func (d LocalLifeDao) GetBillLocalPreviews(param *vo.LocalSearchParam) ([]vo.ReB
 		query = query.Where("enterprise_id = ? or local_id = ? or local_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, local_id, local_platform, task_status, estimated_cost, need_pay, task_form, content_type, store_id, team_buying_id, settlement_amount")
+	query = query.Select("enterprise_id, sub_account_id, local_id, local_name, local_platform, task_status, estimated_cost, need_pay, task_form, content_type, store_id, team_buying_id, settlement_amount")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&localLifes).Error; err != nil {
 		return nil, 0, err
@@ -351,6 +354,7 @@ func (d LocalLifeDao) GetBillLocalPreviews(param *vo.LocalSearchParam) ([]vo.ReB
 			EnterpriseId:  localLife.EnterpriseID,
 			SubAccountId:  localLife.SubAccountID,
 			LocalId:       localLife.LocalID,
+			LocalName:     localLife.LocalName,
 			LocalPlatform: localLife.LocalPlatform,
 			LocalStatus:   localLife.TaskStatus,
 			LocalForm:     localLife.TaskForm,

app/dao/project_dao.go

@@ -112,7 +112,7 @@ func (d ProjectDAO) GetProjectPreviews(param *vo.ProjectSearchParam) ([]vo.RePro
 		query = query.Where("enterprise_id = ? or project_id = ? or project_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, project_id, project_platform, project_status, estimated_cost, need_pay, project_form, content_type, need_review, need_quality, need_calculate, before_delivery_num, delivery_num, after_delivery_num, product_id, tools")
+	query = query.Select("enterprise_id, sub_account_id, project_id, project_name, project_platform, project_status, estimated_cost, need_pay, project_form, content_type, need_review, need_quality, need_calculate, before_delivery_num, delivery_num, after_delivery_num, product_id, tools")
 	offset := (param.Page - 1) * param.PageSize
 	if param.Order == 1 {
 		if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&projects).Error; err != nil {
@@ -132,6 +132,7 @@ func (d ProjectDAO) GetProjectPreviews(param *vo.ProjectSearchParam) ([]vo.RePro
 			EnterpriseId:    project.EnterpriseID,
 			SubAccountId:    project.SubAccountId,
 			ProjectId:       project.ProjectId,
+			ProjectName:     project.ProjectName,
 			ProjectPlatform: project.ProjectPlatform,
 			ProjectStatus:   project.ProjectStatus,
 			ProjectForm:     project.ProjectForm,
@@ -194,7 +195,7 @@ func (d ProjectDAO) GetProjectDraftList(param *vo.ProjectDraftParam) ([]vo.RePro
 		query = query.Where("enterprise_id = ? or project_id = ? or project_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, project_id, project_platform, project_type, created_at, product_id")
+	query = query.Select("enterprise_id, sub_account_id, project_id, project_name, project_platform, project_type, created_at, product_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&projects).Error; err != nil {
 		return nil, 0, err
@@ -204,6 +205,7 @@ func (d ProjectDAO) GetProjectDraftList(param *vo.ProjectDraftParam) ([]vo.RePro
 			EnterpriseId:    project.EnterpriseID,
 			SubAccountId:    project.SubAccountId,
 			ProjectId:       project.ProjectId,
+			ProjectName:     project.ProjectName,
 			ProjectPlatform: project.ProjectPlatform,
 			ProjectType:     project.ProjectType,
 			CreatedAt:       project.CreatedAt.Format("2006-01-02 15:04:05"),
@@ -247,7 +249,7 @@ func (d ProjectDAO) GetProjectPublicList(param *vo.DefaultSearchParam) ([]vo.ReT
 		query = query.Where("project_id = ?", param.TaskId)
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, project_id, project_platform, project_form, content_type, product_id")
+	query = query.Select("enterprise_id, sub_account_id, project_id, project_name, project_platform, project_form, content_type, product_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&projects).Error; err != nil {
 		return nil, 0, err
@@ -257,6 +259,7 @@ func (d ProjectDAO) GetProjectPublicList(param *vo.DefaultSearchParam) ([]vo.ReT
 			EnterpriseId: project.EnterpriseID,
 			SubAccountId: project.SubAccountId,
 			TaskId:       project.ProjectId,
+			TaskName:     project.ProjectName,
 			Platform:     project.ProjectPlatform,
 			TaskForm:     project.ProjectForm,
 			ContentType:  project.ContentType,
@@ -373,7 +376,7 @@ func (d ProjectDAO) GetBillProjectPreviews(param *vo.ProjectSearchParam) ([]vo.R
 		query = query.Where("enterprise_id = ? or project_id = ? or project_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, project_id, project_platform, project_status, estimated_cost, need_pay, project_form, content_type, product_id, settlement_amount")
+	query = query.Select("enterprise_id, sub_account_id, project_id, project_name, project_platform, project_status, estimated_cost, need_pay, project_form, content_type, product_id, settlement_amount")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&projects).Error; err != nil {
 		return nil, 0, err
@@ -383,6 +386,7 @@ func (d ProjectDAO) GetBillProjectPreviews(param *vo.ProjectSearchParam) ([]vo.R
 			EnterpriseId:    project.EnterpriseID,
 			SubAccountId:    project.SubAccountId,
 			ProjectId:       project.ProjectId,
+			ProjectName:     project.ProjectName,
 			ProjectPlatform: project.ProjectPlatform,
 			ProjectStatus:   project.ProjectStatus,
 			ProjectForm:     project.ProjectForm,

app/dao/selection_info_dao.go

@@ -101,7 +101,7 @@ func (d SelectionInfoDAO) GetSelectionPreviews(param *vo.SelectionSearchParam) (
 		query = query.Where("enterprise_id = ? or selection_id = ? or selection_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, selection_id, platform, selection_status, created_at, task_ddl, sample_num, enroll_num, choose_num, product_id, estimated_cost")
+	query = query.Select("enterprise_id, sub_account_id, selection_id, selection_name, platform, selection_status, created_at, task_ddl, sample_num, enroll_num, choose_num, product_id, estimated_cost")
 	offset := (param.Page - 1) * param.PageSize
 	if param.Order == 1 {
 		if err := query.Order("selection_status desc").Order("task_ddl asc").Offset(offset).Limit(param.PageSize).Find(&selectionInfos).Error; err != nil {
@@ -118,6 +118,7 @@ func (d SelectionInfoDAO) GetSelectionPreviews(param *vo.SelectionSearchParam) (
 			EnterpriseId:      selectionInfo.EnterpriseID,
 			SubAccountId:      selectionInfo.SubAccountId,
 			SelectionId:       selectionInfo.SelectionID,
+			SelectionName:     selectionInfo.SelectionName,
 			SelectionPlatform: selectionInfo.Platform,
 			SelectionStatus:   selectionInfo.SelectionStatus,
 			CreatedAt:         selectionInfo.CreatedAt.Format("2006-01-02 15:04:05"),
@@ -168,7 +169,7 @@ func (d SelectionInfoDAO) GetSelectionDraftList(param *vo.SelectionDraftParam) (
 		query = query.Where("enterprise_id = ? or selection_id = ? or selection_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, selection_id, platform, created_at, product_id")
+	query = query.Select("enterprise_id, sub_account_id, selection_id, selection_name, platform, created_at, product_id")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&selectionInfos).Error; err != nil {
 		return nil, 0, err
@@ -178,6 +179,7 @@ func (d SelectionInfoDAO) GetSelectionDraftList(param *vo.SelectionDraftParam) (
 			EnterpriseId:      selectionInfo.EnterpriseID,
 			SubAccountId:      selectionInfo.SubAccountId,
 			SelectionId:       selectionInfo.SelectionID,
+			SelectionName:     selectionInfo.SelectionName,
 			SelectionPlatform: selectionInfo.Platform,
 			CreatedAt:         selectionInfo.CreatedAt.Format("2006-01-02 15:04:05"),
 			ProductId:         selectionInfo.ProductID,
@@ -255,7 +257,7 @@ func (d SelectionInfoDAO) GetBillSelectionPreviews(param *vo.SelectionSearchPara
 		query = query.Where("enterprise_id = ? or selection_id = ? or selection_name LIKE ?", param.Others, param.Others, "%"+param.Others+"%")
 	}
 	query.Count(&total)
-	query = query.Select("enterprise_id, sub_account_id, selection_id, platform, selection_status, created_at, task_ddl, product_id, settlement_amount")
+	query = query.Select("enterprise_id, sub_account_id, selection_id, selection_name, platform, selection_status, created_at, task_ddl, product_id, settlement_amount")
 	offset := (param.Page - 1) * param.PageSize
 	if err := query.Order("created_at asc").Offset(offset).Limit(param.PageSize).Find(&selectionInfos).Error; err != nil {
 		return nil, 0, err
@@ -265,6 +267,7 @@ func (d SelectionInfoDAO) GetBillSelectionPreviews(param *vo.SelectionSearchPara
 			EnterpriseId:      selectionInfo.EnterpriseID,
 			SubAccountId:      selectionInfo.SubAccountId,
 			SelectionId:       selectionInfo.SelectionID,
+			SelectionName:     selectionInfo.SelectionName,
 			SelectionPlatform: selectionInfo.Platform,
 			SelectionStatus:   selectionInfo.SelectionStatus,
 			CreatedAt:         selectionInfo.CreatedAt.Format("2006-01-02 15:04:05"),

app/vo/re_bill_local_task_preview.go

@@ -6,6 +6,7 @@ type ReBillLocalTaskPreview struct {
 	StoreLocation string `json:"storeLocation"`
 	StoreId       int64  `json:"storeId"`
 	TeamBuyingId  int64  `json:"teamBuyingId"`
+	LocalName     string `json:"localName"`
 
 	EnterpriseId  string  `json:"enterpriseId"`
 	SubAccountId  int64   `json:"subAccountId"`

app/vo/re_bill_project_task_preview.go

@@ -5,6 +5,7 @@ type ReBillProjectTaskPreview struct {
 	MainImage    string  `json:"mainImage"`
 	ProductName  string  `json:"productName"`
 	ProductPrice float64 `json:"productPrice"`
+	ProjectName  string  `json:"projectName"`
 
 	EnterpriseId    string  `json:"enterpriseId"`
 	SubAccountId    int64   `json:"subAccountId"`

app/vo/re_bill_selection_task_preview.go

@@ -1,10 +1,11 @@
 package vo
 
 type ReBillSelectionTaskPreview struct {
-	ProductId    int64   `json:"productId"`
-	MainImage    string  `json:"mainImage"`
-	ProductName  string  `json:"productName"`
-	ProductPrice float64 `json:"productPrice"`
+	ProductId     int64   `json:"productId"`
+	MainImage     string  `json:"mainImage"`
+	ProductName   string  `json:"productName"`
+	ProductPrice  float64 `json:"productPrice"`
+	SelectionName string  `json:"selectionName"`
 
 	EnterpriseId      string `json:"enterpriseId"`
 	SubAccountId      int64  `json:"subAccountId"`

app/vo/re_local_store_explore_preview.go

@@ -6,6 +6,7 @@ type ReLocalStoreExplorePreview struct {
 	StoreLocation string `json:"storeLocation"`
 	StoreId       int64  `json:"storeId"`
 	TeamBuyingId  int64  `json:"teamBuyingId"`
+	LocalName     string `json:"localName"`
 
 	EnterpriseId  string `json:"enterpriseId"`
 	SubAccountId  int64  `json:"subAccountId"`

app/vo/re_local_task_preview.go

@@ -6,6 +6,7 @@ type ReLocalTaskPreview struct {
 	StoreLocation string `json:"storeLocation"`
 	StoreId       int64  `json:"storeId"`
 	TeamBuyingId  int64  `json:"teamBuyingId"`
+	LocalName     string `json:"localName"`
 
 	EnterpriseId  string  `json:"enterpriseId"`
 	SubAccountId  int64   `json:"subAccountId"`

app/vo/re_project_task_preview.go

@@ -5,6 +5,7 @@ type ReProjectTaskPreview struct {
 	MainImage    string  `json:"mainImage"`
 	ProductName  string  `json:"productName"`
 	ProductPrice float64 `json:"productPrice"`
+	ProjectName  string  `json:"projectName"`
 
 	EnterpriseId    string  `json:"enterpriseId"`
 	SubAccountId    int64   `json:"subAccountId"`

app/vo/re_selection_task_preview.go

@@ -1,10 +1,11 @@
 package vo
 
 type ReSelectionTaskPreview struct {
-	ProductId    int64   `json:"productId"`
-	MainImage    string  `json:"mainImage"`
-	ProductName  string  `json:"productName"`
-	ProductPrice float64 `json:"productPrice"`
+	ProductId     int64   `json:"productId"`
+	MainImage     string  `json:"mainImage"`
+	ProductName   string  `json:"productName"`
+	ProductPrice  float64 `json:"productPrice"`
+	SelectionName string  `json:"selectionName"`
 
 	EnterpriseId        string  `json:"enterpriseId"`
 	SubAccountId        int64   `json:"subAccountId"`

app/vo/re_task_default_public.go

@@ -5,6 +5,7 @@ type ReTaskDefaultPublic struct {
 	MainImage    string  `json:"mainImage"`
 	ProductName  string  `json:"productName"`
 	ProductPrice float64 `json:"productPrice"`
+	TaskName     string  `json:"taskName"`
 
 	StoreName     string `json:"storeName"`
 	StoreLocation string `json:"storeLocation"`