服务商数据卡完善

app/dao/local_task_link_statistic_dao.go

@@ -15,3 +15,17 @@ func (d LocalTaskLinkStatisticDao) GetSupplierData(supplierId int64) ([]entity.L
 	}
 	return localTaskLinkStatistics, nil
 }
+
+// 获取指定服务商下的作品数据
+func (d LocalTaskLinkStatisticDao) GetLocalList(supplierId int64, page int, pageSize int) ([]entity.LocalTaskLinkStatistic, int64, error) {
+	var localTaskLinkStatistics []entity.LocalTaskLinkStatistic
+	var total int64
+	query := Db.Model(&entity.LocalTaskLinkStatistic{}).Where("supplier_id = ?", supplierId)
+	query.Count(&total)
+	offset := (page - 1) * pageSize
+	if err := query.Order("create_time desc").Offset(offset).Limit(pageSize).Find(&localTaskLinkStatistics).Error; err != nil {
+		return nil, 0, err
+	}
+
+	return localTaskLinkStatistics, total, nil
+}

app/dao/project_dao.go

@@ -741,3 +741,16 @@ func (d ProjectDAO) GetTaskInviteToDo(enterpriseId string, subAccountId int64, p
 
 	return resultMap, nil
 }
+
+//// 获取服务商（与某商家）参与的种草任务
+//func (d ProjectDAO) GetProjectBySupplierId(supplierId int64, enterpriseId string) ([]*entity.Project, error) {
+//	var projectInfos []*entity.Project
+//	if enterpriseId == "" {
+//		err := Db.Model(&entity.Project{}).Where("").Find(&projectInfos).Error
+//	}
+//
+//	if err != nil {
+//		return nil, err
+//	}
+//	return projectInfos, nil
+//}

app/dao/project_task_link_statistic_dao.go

@@ -15,3 +15,17 @@ func (d ProjectTaskLinkStatisticDao) GetSupplierData(supplierId int64) ([]entity
 	}
 	return projectTaskLinkStatistics, nil
 }
+
+// 获取指定服务商下的作品数据
+func (d ProjectTaskLinkStatisticDao) GetProjectList(supplierId int64, page int, pageSize int) ([]entity.ProjectTaskLinkStatistic, int64, error) {
+	var projectTaskLinkStatistics []entity.ProjectTaskLinkStatistic
+	var total int64
+	query := Db.Model(&entity.ProjectTaskLinkStatistic{}).Where("supplier_id = ?", supplierId)
+	query.Count(&total)
+	offset := (page - 1) * pageSize
+	if err := query.Order("create_time desc").Offset(offset).Limit(pageSize).Find(&projectTaskLinkStatistics).Error; err != nil {
+		return nil, 0, err
+	}
+
+	return projectTaskLinkStatistics, total, nil
+}

app/service/cooperation_service.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"gorm.io/gorm"
@@ -282,10 +283,63 @@ func (t CooperationService) GetSupplierPerform(param *vo.SupplierDataParam) (vo.
 		Data:     supplierDataParams,
 	}
 	// 获取supplierId下的所有任务，再根据任务获取数据
-
-	supplierDataParams = append(supplierDataParams, &vo.SupplierPerformance{
-		ProductName: "xxxxxx",
-	})
+	if param.TaskType == 2 {
+		projectTaskLinkStatistics, total1, err1 := dao.ProjectTaskLinkStatisticDao{}.GetProjectList(param.SupplierId, param.Page, param.PageSize)
+		total = total1
+		if err1 != nil {
+			return result, err1
+		}
+		for _, projectTaskLinkStatistic := range projectTaskLinkStatistics {
+			var perform vo.SupplierPerformance
+			projectId := projectTaskLinkStatistic.ProjectID
+			project, err2 := dao.ProjectDAO{}.GetProjectById(projectId)
+			if err2 != nil {
+				return result, err2
+			}
+			var product entity.Product
+			var productMainPhoto entity.ProductPhoto
+			err11 := json.Unmarshal([]byte(project.ProductSnap), &product)
+			err12 := json.Unmarshal([]byte(project.ProductPhotoSnap), &productMainPhoto)
+			if err11 != nil && err12 != nil {
+				perform.MainImage = productMainPhoto.PhotoUrl
+				perform.ProductName = product.ProductName
+				perform.Price = product.ProductPrice
+				perform.ViewCount = projectTaskLinkStatistic.ViewCount
+				perform.VoteCount = projectTaskLinkStatistic.VoteCount
+				perform.CollectCount = projectTaskLinkStatistic.CollectionCount
+				perform.CommentCount = projectTaskLinkStatistic.CommitCount
+			}
+			supplierDataParams = append(supplierDataParams, &perform)
+		}
+	} else if param.TaskType == 3 {
+		localTaskLinkStatistics, total1, err1 := dao.LocalTaskLinkStatisticDao{}.GetLocalList(param.SupplierId, param.Page, param.PageSize)
+		total = total1
+		if err1 != nil {
+			return result, err1
+		}
+		for _, localTaskLinkStatistic := range localTaskLinkStatistics {
+			var perform vo.SupplierPerformance
+			localId := localTaskLinkStatistic.LocalID
+			local, err2 := dao.LocalLifeDao{}.GetLocalById(localId)
+			if err2 != nil {
+				return result, err2
+			}
+			store, err11 := dao.StoreDao{}.GetStoreByID(local.StoreID)
+			if err11 == nil && store != nil {
+				photoUrl, e := dao.ProductPhotoDAO{}.GetMainPhotoByStoreID(store.StoreID)
+				if e != nil {
+					photoUrl = ""
+				}
+				perform.MainImage = photoUrl
+				perform.StoreName = store.StoreName
+				perform.ViewCount = localTaskLinkStatistic.ViewCount
+				perform.VoteCount = localTaskLinkStatistic.VoteCount
+				perform.CollectCount = localTaskLinkStatistic.CollectionCount
+				perform.CommentCount = localTaskLinkStatistic.CommitCount
+			}
+			supplierDataParams = append(supplierDataParams, &perform)
+		}
+	}
 
 	result = vo.ResultVO{
 		Page:     param.Page,

app/service/recharge_service.go

@@ -173,7 +173,7 @@ func (s RechargeService) QueryOrderByTradeId(enterpriseId string, subAccountId i
 	// 更新充值记录/账户金额相关信息
 	if "SUCCESS" == *resp.TradeState {
 		payTime := resp.SuccessTime
-		t, _ := time.Parse("2006-01-02 15:04:05", *payTime)
+		t, _ := time.Parse(time.RFC3339, *payTime)
 		err = dao.RechargeRecordDao{}.UpdateRechargeStatus(tradeId, 2, &t)
 		amount := float64(*resp.Amount.Total) / 100
 		_, err = dao.EnterpriseDao{}.UpdateEnterpriseBalance(enterpriseId, amount)

app/service/task_info_service.go

@@ -220,16 +220,17 @@ func (t TaskInfoService) SelectionRewardCashDetail(param *vo.SelectionRewardCash
 	for _, selectionTaskInfo := range selectionTaskInfos {
 		platformKuaishouUserInfo, _ := dao.PlatformKuaishouUserInfoDao{}.GetUserInfo(selectionTaskInfo.OpenID)
 		talentRewardMsg := vo.TalentRewardMsg{
-			PhotoUrl:   platformKuaishouUserInfo.HeadUri,
-			Nickname:   platformKuaishouUserInfo.NickName,
-			Account:    platformKuaishouUserInfo.OpenID,
-			PlatformId: platformKuaishouUserInfo.PlatformID,
-			City:       platformKuaishouUserInfo.City,
-			Gender:     platformKuaishouUserInfo.Gender,
-			OrderNum:   selectionTaskInfo.SaleActual,
-			CashTime:   selectionTaskInfo.WithdrawDate.Format("2006-01-02 15:04:05"),
-			TaskId:     selectionTaskInfo.TaskID,
-			TaskReward: selectionTaskInfo.TaskReward,
+			PhotoUrl:     platformKuaishouUserInfo.HeadUri,
+			Nickname:     platformKuaishouUserInfo.NickName,
+			Account:      platformKuaishouUserInfo.OpenID,
+			PlatformId:   platformKuaishouUserInfo.PlatformID,
+			City:         platformKuaishouUserInfo.City,
+			Gender:       platformKuaishouUserInfo.Gender,
+			OrderNum:     selectionTaskInfo.SaleActual,
+			CashTime:     selectionTaskInfo.WithdrawDate.Format("2006-01-02 15:04:05"),
+			TaskId:       selectionTaskInfo.TaskID,
+			TaskReward:   selectionTaskInfo.TaskReward,
+			TalentSource: 1,
 		}
 		talentRewardMsgs = append(talentRewardMsgs, talentRewardMsg)
 	}

app/vo/re_selection_reward_cash.go

@@ -9,14 +9,15 @@ type ReSelectionRewardCash struct {
 }
 
 type TalentRewardMsg struct {
-	PhotoUrl   string  `json:"photoUrl"`
-	Nickname   string  `json:"nickname"`
-	Account    string  `json:"account"`
-	PlatformId int64   `json:"platformId"`
-	City       string  `json:"city"`
-	OrderNum   int64   `json:"orderNum"`
-	CashTime   string  `json:"cashTime"`
-	Gender     string  `json:"gender"` // U:未知；M，m：男； F女
-	TaskId     string  `json:"taskId"`
-	TaskReward float64 `json:"taskReward"` // 兑现金额
+	PhotoUrl     string  `json:"photoUrl"`
+	Nickname     string  `json:"nickname"`
+	Account      string  `json:"account"`
+	PlatformId   int64   `json:"platformId"`
+	City         string  `json:"city"`
+	OrderNum     int64   `json:"orderNum"`
+	CashTime     string  `json:"cashTime"`
+	Gender       string  `json:"gender"` // U:未知；M，m：男； F女
+	TaskId       string  `json:"taskId"`
+	TalentSource int64   `json:"talentSource"` // 1-公海
+	TaskReward   float64 `json:"taskReward"`   // 兑现金额
 }