Browse Source

fix_预估成本&复制任务

Ethan 2 weeks ago
parent
commit
9f99b8c0ed

+ 1 - 0
app/entity/local_life_info.go

@@ -52,6 +52,7 @@ type LocalLifeInfo struct {
 	NeedExplore         int64     `gorm:"column:need_explore;NOT NULL"`                     // 待探店
 	ExploredNum         int64     `gorm:"column:explored_num;default:0;NOT NULL"`           // 已探店
 	InvoiceStatus       int64     `gorm:"column:invoice_status;default:0;NOT NULL"`         // 开票状态(1开票中 2已开票)
+	NeedPay             float64   `gorm:"column:need_pay"`                                  // 待支付金额
 }
 
 func (m *LocalLifeInfo) TableName() string {

+ 1 - 0
app/entity/project.go

@@ -53,6 +53,7 @@ type Project struct {
 	BeforeDeliveryNum int64     `gorm:"column:before_delivery_num"`
 	DeliveryNum       int64     `gorm:"column:delivery_num"`
 	AfterDeliveryNum  int64     `gorm:"column:after_delivery_num"`
+	NeedPay           float64   `gorm:"column:need_pay"` // 待支付金额
 }
 
 func (m *Project) TableName() string {

+ 6 - 2
app/service/local_life_service.go

@@ -493,7 +493,11 @@ func (s LocalLifeService) GetLocalLifeDetail(localId string) (*vo.ReLocalDetail,
 	reLocalDetail.LocalStatus = localLife.TaskStatus
 	reLocalDetail.LocalPlatform = localLife.LocalPlatform
 	reLocalDetail.CreatedAt = localLife.CreatedAt.Format("2006-01-02 15:04:05")
-	reLocalDetail.EstimatedCost = localLife.EstimatedCost // 预估成本
+	if localLife.TaskStatus < 6 {
+		reLocalDetail.EstimatedCost = localLife.EstimatedCost
+	} else {
+		reLocalDetail.EstimatedCost = localLife.NeedPay
+	}
 	reLocalDetail.ServiceChargeRate = localLife.ServiceChargeRate
 	var creatorName, phone string
 	if localLife.OperatorType == 1 && localLife.SubAccountID == 0 {
@@ -622,7 +626,7 @@ func (s LocalLifeService) CopyLocalLife(param *vo.LocalSearchParam) (*string, er
 		EnterpriseID:        param.EnterpriseId,
 		SubAccountID:        param.SubAccountId,
 		OperatorType:        localLifeOrigin.OperatorType,
-		TaskStatus:          localLifeOrigin.TaskStatus,
+		TaskStatus:          1,
 		LocalID:             localIdNew,
 		LocalType:           localLifeOrigin.LocalType,
 		LocalPlatform:       localLifeOrigin.LocalPlatform,

+ 7 - 2
app/service/project_service.go

@@ -424,6 +424,7 @@ func (s ProjectService) UpdateProjectTarget(projectUpdateParam *vo.ProjectUpdate
 		ContentType:      projectUpdateParam.ContentType,
 		ProjectDetail:    projectUpdateParam.ProjectDetail,
 		Tools:            projectUpdateParam.Tools,
+		EstimatedCost:    estimatedCost,
 	}
 	//if projectUpdateParam.ProjectStatus == 2 {
 	//	updateProject.SubmitAt = t
@@ -513,7 +514,11 @@ func (s ProjectService) GetProjectDetail(projectId string) (*vo.ReProjectDetail,
 	reProjectDetail.ProjectStatus = project.ProjectStatus
 	reProjectDetail.ProjectPlatform = project.ProjectPlatform
 	reProjectDetail.CreatedAt = project.CreatedAt.Format("2006-01-02 15:04:05")
-	reProjectDetail.EstimatedCost = project.EstimatedCost
+	if project.ProjectStatus < 6 {
+		reProjectDetail.EstimatedCost = project.EstimatedCost
+	} else {
+		reProjectDetail.EstimatedCost = project.NeedPay
+	}
 	reProjectDetail.ServiceChargeRate = project.ServiceChargeRate
 	var creatorName, phone string
 	if project.SubAccountId == 0 {
@@ -617,7 +622,7 @@ func (s ProjectService) CopyProject(param *vo.ProjectSearchParam) (*string, erro
 
 	// 复制任务
 	projectNew := entity.Project{
-		ProjectStatus:     projectOrigin.ProjectStatus,
+		ProjectStatus:     1,
 		ProjectType:       projectOrigin.ProjectType,
 		ProjectId:         projectIdNew,
 		ProductID:         projectOrigin.ProductID,

+ 1 - 1
app/service/selection_info_service.go

@@ -553,7 +553,7 @@ func (s SelectionInfoService) CopySelection(param *vo.SelectionSearchParam) (*st
 
 	// 复制选品
 	selectionNew := entity.SelectionInfo{
-		SelectionStatus:  selectionOrigin.SelectionStatus,
+		SelectionStatus:  1,
 		SelectionID:      selectionIdNew,
 		ProductID:        selectionOrigin.ProductID,
 		ProductCategory:  selectionOrigin.ProductCategory,

+ 1 - 1
app/vo/re_local_detail.go

@@ -14,7 +14,7 @@ type ReLocalDetail struct {
 	CreatorName       string  `json:"creatorName"`       // 创建者
 	Phone             string  `json:"phone"`             // 联系方式
 	WX                string  `json:"wx"`                // 微信
-	EstimatedCost     float64 `json:"estimatedCost"`     // 成本预估
+	EstimatedCost     float64 `json:"estimatedCost"`     // 成本预估  2025.04.03:支付前是预估一口价+"自报价"字符串  支付后是同意的达人的一口价和自报价即need_pay字段
 	ServiceChargeRate float64 `json:"serviceChargeRate"` // 公开服务费率
 	// 支付方式参数待定
 	// 关联主体

+ 1 - 1
app/vo/re_project_detail.go

@@ -14,7 +14,7 @@ type ReProjectDetail struct {
 	CreatorName       string  `json:"creatorName"`       // 创建者
 	Phone             string  `json:"phone"`             // 联系方式
 	WX                string  `json:"wx"`                // 微信
-	EstimatedCost     float64 `json:"estimatedCost"`     // 成本预估
+	EstimatedCost     float64 `json:"estimatedCost"`     // 成本预估  2025.04.03:支付前是预估一口价+"自报价"字符串  支付后是同意的达人的一口价和自报价即need_pay字段
 	ServiceChargeRate float64 `json:"serviceChargeRate"` // 公开服务费率
 	// 支付方式参数待定
 	// 关联商品