wangshan 2 лет назад
Родитель
Сommit
fd0680a8b7

+ 3 - 4
jyBXCore/rpc/internal/logic/updatebidstatuslogic.go

@@ -71,12 +71,11 @@ func (l *UpdateBidStatusLogic) UpdateBidStatus(in *bxcore.UpdateBidStatusReq) (*
 		return result, nil
 	}
 	// 2. 更新
-	flag := participateService.UpdateBidStatus(in, projectId)
-	if !flag {
-		result.ErrMsg = "更新失败"
+	if err := participateService.UpdateBidStatus(in, projectId); err != nil {
+		result.ErrMsg = err.Error()
 	} else {
+		result.Data = true
 		result.ErrCode = 0
 	}
-	result.Data = flag
 	return result, nil
 }

+ 7 - 5
jyBXCore/rpc/service/participateBid.go

@@ -249,14 +249,14 @@ func (p *ParticipateBid) CheckBidPower(projectId string, valid bool) (b bool) {
 			b = mysql.CheckParticipateManager(projectId, p.EntId, valid)
 		} else {
 			// 查参标人
-			b = mysql.CheckParticipateEntUser(projectId, p.PositionId, valid)
+			b = mysql.CheckParticipateEntUser(projectId, p.EntUserId, valid)
 		}
 	}
 	return
 }
 
 // UpdateBidStatus 更新投标状态
-func (p *ParticipateBid) UpdateBidStatus(in *bxcore.UpdateBidStatusReq, projectId string) (flag bool) {
+func (p *ParticipateBid) UpdateBidStatus(in *bxcore.UpdateBidStatusReq, projectId string) error {
 	if p.PositionType == PositionTypeEnt {
 		pLock := util.GetParticipateLock(fmt.Sprintf("%d_%s", p.EntId, projectId))
 		pLock.Lock()
@@ -280,7 +280,7 @@ func (p *ParticipateBid) UpdateBidStatus(in *bxcore.UpdateBidStatusReq, projectI
 	// 新旧对比 处理成要保存的字段
 	recordContent, err := processRecordStr(oldMap, newMap)
 	if err != nil {
-		return false
+		return err
 	}
 	// 保存
 	recordData := map[string]interface{}{
@@ -292,8 +292,10 @@ func (p *ParticipateBid) UpdateBidStatus(in *bxcore.UpdateBidStatusReq, projectI
 		"record_type":    RecordTypeBidStatus,
 		"create_date":    date.NowFormat(date.Date_Full_Layout),
 	}
-	flag = mysql.InsertBidContent(recordData)
-	return
+	if flag := mysql.InsertBidContent(recordData); !flag {
+		return fmt.Errorf("更新失败")
+	}
+	return nil
 
 }