diff --git a/route/cp_r/cp_relation.go b/route/cp_r/cp_relation.go index 97461eb7fc63ad797d4170e6933c5b8c37b6a150..b161fab6c98fbf83c96c7ab74e23e6141152d4b8 100644 --- a/route/cp_r/cp_relation.go +++ b/route/cp_r/cp_relation.go @@ -494,10 +494,12 @@ func CheckCpImExpire(c *gin.Context) (*mycontext.MyContext, error) { switch cpRecord.Status { case cp_e.CpInvite: if userId == cpRecord.UserId { // 发起人 - resId = common.MSG_ID_ALREADY_EXPIRED + resId = common.MSG_ID_ALREADY_EXPIRED // 等待对方接受 } - case cp_e.CpInviteAccept, cp_e.CpInviteRefuse: - resId = common.MSG_ID_ALREADY_EXPIRED + case cp_e.CpInviteAccept: + resId = common.MSG_ID_ALREADY_EXPIRED // 已接受 + case cp_e.CpInviteRefuse: + resId = common.MSG_ID_ALREADY_EXPIRED // 已拒绝 case cp_e.CpInviteExpired: resId = common.MSG_ID_ALREADY_EXPIRED } @@ -514,12 +516,12 @@ func CheckCpImExpire(c *gin.Context) (*mycontext.MyContext, error) { switch cpCancel.Status { case cp_e.CpCancel: if userId == cpCancel.UserId { // 发起人 - resId = common.MSG_ID_ALREADY_EXPIRED + resId = common.MSG_ID_ALREADY_EXPIRED // 等待对方接受 } - case cp_e.CpCancelRevoke, cp_e.CpCancelAccept: - resId = common.MSG_ID_ALREADY_EXPIRED - case cp_e.CpCancelAcceptAuto: - resId = common.MSG_ID_ALREADY_EXPIRED + case cp_e.CpCancelRevoke: + resId = common.MSG_ID_ALREADY_EXPIRED // 已被取消 + case cp_e.CpCancelAccept, cp_e.CpCancelAcceptAuto: + resId = common.MSG_ID_ALREADY_EXPIRED // 已解绑 } } if resId > 0 {