Commit 2ca8a8de authored by chenweijian's avatar chenweijian

cp解除

parent 4b98c331
...@@ -130,6 +130,15 @@ func CancelCpRelation(myCtx *mycontext.MyContext, myUserId uint64, externalId, l ...@@ -130,6 +130,15 @@ func CancelCpRelation(myCtx *mycontext.MyContext, myUserId uint64, externalId, l
return err return err
} }
// 我和对方是否是cp,且cp关系存在
cpRelation, err := cp_m.GetCpByIds(model, myUserId, userRec.ID)
if err != nil {
return err
}
if cpRelation.Id == 0 {
model.Log.Errorf("CancelCpRelation cp关系不存在 id1:%v, id2:%v", myUserId, userRec.ID)
return myerr.WrapErr(bizerr.InvalidParameter)
}
// 自己没有cp了 // 自己没有cp了
myCp, err := cp_m.GetCp(model, myUserId) myCp, err := cp_m.GetCp(model, myUserId)
if err != nil { if err != nil {
...@@ -146,15 +155,6 @@ func CancelCpRelation(myCtx *mycontext.MyContext, myUserId uint64, externalId, l ...@@ -146,15 +155,6 @@ func CancelCpRelation(myCtx *mycontext.MyContext, myUserId uint64, externalId, l
if inviCp.Id == 0 { if inviCp.Id == 0 {
return myerr.WrapErr(bizerr.InvalidParameter) return myerr.WrapErr(bizerr.InvalidParameter)
} }
// 我和对方是否是cp,且cp关系存在
cpRelation, err := cp_m.GetCpByIds(model, myUserId, userRec.ID)
if err != nil {
return err
}
if cpRelation.Id == 0 {
model.Log.Errorf("CancelCpRelation cp关系不存在 id1:%v, id2:%v", myUserId, userRec.ID)
return myerr.WrapErr(bizerr.InvalidParameter)
}
// 是否有关于我的cp解除申请,且还未被处理 // 是否有关于我的cp解除申请,且还未被处理
myCancel, err := cp_m.GetCpCancelWithMe(model, user.ID, cp_e.CpCancel) myCancel, err := cp_m.GetCpCancelWithMe(model, user.ID, cp_e.CpCancel)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment