探店列表

app/dao/local_life_task_info_dao.go

@@ -22,29 +22,44 @@ func (d LocalLifeTaskInfoDao) CountByTaskStage(localId string, taskStage int64)
 }
 
 // 获取指定任务阶段的本地生活子任务
-func (d LocalLifeTaskInfoDao) GetListByTaskStage(localId string, bookStatus int64, time string, page int, pageSize int) ([]*entity.LocalLifeTaskInfo, int64, error) {
+func (d LocalLifeTaskInfoDao) GetListByTaskStage(localId string, taskStage int64, time string, page int, pageSize int) ([]*entity.LocalLifeTaskInfo, int64, error) {
 	var taskInfos []*entity.LocalLifeTaskInfo
 	var total int64
-	query := Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND book_status = ?", localId, bookStatus)
+	query := Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND task_stage = ?", localId, taskStage)
 	// 计算偏移量
 	offset := (page - 1) * pageSize
 	var err error
-	if bookStatus == 1 {
+	if taskStage == 4 { // 待预约探店
 		query.Count(&total)
 		err = query.Order("select_date asc").Offset(offset).Limit(pageSize).Find(&taskInfos).Error
-	} else if bookStatus == 2 {
+	} else if taskStage == 5 { // 待确认探店
 		if time != "" {
 			query = query.Where("DATE(reserve_time) = ?", time)
 		}
 		query.Count(&total)
 		err = query.Order("reserve_time desc").Offset(offset).Limit(pageSize).Find(&taskInfos).Error
-	} else if bookStatus == 3 {
+	}
+	if err != nil {
+		return nil, 0, err
+	}
+	return taskInfos, total, nil
+}
+
+// 获取指定探店状态的本地生活子任务
+func (d LocalLifeTaskInfoDao) GetListByBookStatus(localId string, bookStatus int64, time string, page int, pageSize int) ([]*entity.LocalLifeTaskInfo, int64, error) {
+	var taskInfos []*entity.LocalLifeTaskInfo
+	var total int64
+	query := Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND book_status = ?", localId, bookStatus)
+	// 计算偏移量
+	offset := (page - 1) * pageSize
+	var err error
+	if bookStatus == 5 { // 待探店
 		if time != "" {
 			query = query.Where("DATE(explore_time) = ?", time)
 		}
 		query.Count(&total)
 		err = query.Order("explore_time desc").Offset(offset).Limit(pageSize).Find(&taskInfos).Error
-	} else if bookStatus == 4 {
+	} else if bookStatus == 6 { // 已探店
 		if time != "" {
 			query = query.Where("DATE(finish_explore_time) = ?", time)
 		}

app/service/local_life_service.go

@@ -1123,13 +1123,13 @@ func (s LocalLifeService) GetStoreExploreInfo(param *vo.StoreExploreParam) (*vo.
 	var err error
 	localLifeId := param.LocalLifeId
 	if param.Status == 1 { // 待预约
-		localLifeTaskInfos, total, err = dao.LocalLifeTaskInfoDao{}.GetListByTaskStage(localLifeId, 1, "", param.Page, param.PageSize)
+		localLifeTaskInfos, total, err = dao.LocalLifeTaskInfoDao{}.GetListByTaskStage(localLifeId, 4, "", param.Page, param.PageSize)
 	} else if param.Status == 2 { // 待确认
-		localLifeTaskInfos, total, err = dao.LocalLifeTaskInfoDao{}.GetListByTaskStage(localLifeId, 2, param.SearchTime, param.Page, param.PageSize)
-	} else if param.Status == 3 { // 待探店
 		localLifeTaskInfos, total, err = dao.LocalLifeTaskInfoDao{}.GetListByTaskStage(localLifeId, 5, param.SearchTime, param.Page, param.PageSize)
+	} else if param.Status == 3 { // 待探店
+		localLifeTaskInfos, total, err = dao.LocalLifeTaskInfoDao{}.GetListByBookStatus(localLifeId, 5, param.SearchTime, param.Page, param.PageSize)
 	} else if param.Status == 4 { // 已探店
-		localLifeTaskInfos, total, err = dao.LocalLifeTaskInfoDao{}.GetListByTaskStage(localLifeId, 6, param.SearchTime, param.Page, param.PageSize)
+		localLifeTaskInfos, total, err = dao.LocalLifeTaskInfoDao{}.GetListByBookStatus(localLifeId, 6, param.SearchTime, param.Page, param.PageSize)
 	}
 	if err != nil {
 		return nil, err
@@ -1186,8 +1186,8 @@ func (t LocalLifeService) StoreExploreInfoCount(param *vo.StoreExploreParam) map
 	var needConfirm int64
 	var needExplore int64
 	var explored int64
-	dao.Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND book_status = ?", param.LocalLifeId, 1).Count(&needBook)
-	dao.Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND book_status = ?", param.LocalLifeId, 2).Count(&needConfirm)
+	dao.Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND task_stage = ?", param.LocalLifeId, 4).Count(&needBook)
+	dao.Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND task_stage = ?", param.LocalLifeId, 5).Count(&needConfirm)
 	dao.Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND book_status = ?", param.LocalLifeId, 5).Count(&needExplore)
 	dao.Db.Model(&entity.LocalLifeTaskInfo{}).Where("local_id = ? AND book_status = ?", param.LocalLifeId, 6).Count(&explored)
 	res["needBook"] = needBook