Merge branch 'dev/v1.1.20_fuwencai' of http://192.168.3.207:8080/BaseService/jyMicroservices into dev/v1.1.20_fuwencai

jyBXCore/rpc/model/tidb/tidb.go

@@ -20,6 +20,7 @@ var (
 
 //划转参标信息
 func TransferParticipateInfo(in *bxcore.ParticipateActionReq) error {
+	defer MC.Catch()
 	//保存或更新新跟踪人
 	if !IC.BaseMysql.ExecTx("划转参标信息", func(tx *sql.Tx) bool {
 		var (
@@ -69,6 +70,7 @@ func TransferParticipateInfo(in *bxcore.ParticipateActionReq) error {
 
 //终止参标
 func CancelParticipateInfo(in *bxcore.ParticipateActionReq, roleId int64) error {
+	defer MC.Catch()
 	if !IC.BaseMysql.ExecTx("终止参标", func(tx *sql.Tx) bool {
 		var (
 			b1, b2 bool
@@ -110,6 +112,7 @@ func CancelParticipateInfo(in *bxcore.ParticipateActionReq, roleId int64) error
 
 //保存参标信息
 func SaveParticipateInfo(in *bxcore.ParticipateActionReq) error {
+	defer MC.Catch()
 	if !IC.BaseMysql.ExecTx("保存|更新参标信息及保存参标记录", func(tx *sql.Tx) bool {
 		var (
 			b1, b2 bool
@@ -151,6 +154,7 @@ func SaveParticipateInfo(in *bxcore.ParticipateActionReq) error {
 
 //查询当前招标信息是否已被参标
 func IsParticipatedByBidId(in *bxcore.ParticipateActionReq) bool {
+	defer MC.Catch()
 	//如果不允许多人参标 当前项目是否已经有企业其他人员参标
 	query := fmt.Sprintf(`SELECT count(id) FROM participate_user WHERE %s AND project_id = %s AND state >-1`, "%s", in.BidId)
 	if in.PositionType > 0 {
@@ -163,6 +167,7 @@ func IsParticipatedByBidId(in *bxcore.ParticipateActionReq) bool {
 
 //获取参标权限
 func GetParticipateIsAllow(query map[string]interface{}) (b bool) {
+	defer MC.Catch()
 	if info, ok := IC.Mgo.FindOne(PartTable, query); ok {
 		if info != nil {
 			if (*info)["i_isallow"] != nil {
@@ -175,6 +180,7 @@ func GetParticipateIsAllow(query map[string]interface{}) (b bool) {
 
 //更新设置信息
 func UpdateParticipateSetInfo(in *bxcore.ParticipateSetUpInfoReq) error {
+	defer MC.Catch()
 	query := map[string]interface{}{
 		"i_positionid": in.PositionId,
 	}
@@ -213,6 +219,7 @@ func UpdateParticipateSetInfo(in *bxcore.ParticipateSetUpInfoReq) error {
 
 //查询企业|个人参标设置信息
 func GetParticipateSetInfo(in *bxcore.ParticipateSetUpInfoReq) (*bxcore.ParticipateSetUpInfo, error) {
+	defer MC.Catch()
 	query := map[string]interface{}{
 		"i_positionid": in.PositionId,
 	}

jyBXCore/rpc/service/participate.go

@@ -22,6 +22,7 @@ import (
 
 //参标动作：参标、终止参标、划转:in:参标；out:终止参标；transfer:划转
 func ParticipateDo(in *bxcore.ParticipateActionReq) (*bxcore.ParticipateActionRes, error) {
+	defer MC.Catch()
 	//招标信息解密
 	in.BidId = encrypt.DecodeArticleId2ByCheck(in.BidId)[0]
 	if in.BidId == "" {
@@ -93,6 +94,7 @@ func ParticipateDo(in *bxcore.ParticipateActionReq) (*bxcore.ParticipateActionRe
 
 //参标设置更新及设置内容
 func GetParticipateSetInfo(in *bxcore.ParticipateSetUpInfoReq) (*bxcore.ParticipateSetUpInfoRes, error) {
+	defer MC.Catch()
 	res := &bxcore.ParticipateSetUpInfoRes{Data: &bxcore.ParticipateSetUpInfo{
 		IsAllow:    "0",
 		BidType:    nil,