From d6d42feedc5dfd2c95fc95d69da0428650cd895d Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Wed, 14 Jun 2023 10:56:42 +0800
Subject: [PATCH] =?UTF-8?q?cp=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mysql/3.9.0.sql           | 17 ++++++++++++++++-
 route/cp_r/cp_relation.go | 10 +++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/mysql/3.9.0.sql b/mysql/3.9.0.sql
index ebbc812..d59d86d 100644
--- a/mysql/3.9.0.sql
+++ b/mysql/3.9.0.sql
@@ -238,4 +238,19 @@ VALUES (273, 'zh', "绑定CP返还"),
        (273, 'ca', "Retorno de CP vinculante"),
        (273, 'hi', "बाध्यकारी सीपी वापसी"),
        (273, 'vi', "Lợi nhuận CP ràng buộc"),
-       (273, 'ur', "بائنڈنگ CP واپسی۔");
\ No newline at end of file
+       (273, 'ur', "بائنڈنگ CP واپسی۔");
+
+INSERT INTO hilo.res_multi_text (msg_id, `language`, content)
+VALUES (274, 'zh', "%s撤销了解绑CP的申请"),
+       (274, 'en', "%s canceled the application to unbind CP"),
+       (274, 'ar', "%s قام بسحب طلبه لفك ارتباط CP"),
+       (274, 'tr', "%s, CP'nin bağlantısını kaldırma başvurusunu iptal etti"),
+       (274, 'id', "%s membatalkan aplikasi untuk melepaskan CP"),
+       (274, 'ru', "%s отменил заявку на отвязку CP"),
+       (274, 'ko', "%s이(가) CP 바인딩 해제 신청을 취소했습니다."),
+       (274, 'pt', "%s cancelou o aplicativo para desvincular CP"),
+       (274, 'th', "%s ยกเลิกแอปพลิเคชันเพื่อยกเลิกการเชื่อมโยง CP"),
+       (274, 'ca', "%s canceló la solicitud para desvincular CP"),
+       (274, 'hi', "%s ने सीपी को अनबाइंड करने के लिए आवेदन को रद्द कर दिया"),
+       (274, 'vi', "%s đã hủy đơn đăng ký hủy liên kết CP"),
+       (274, 'ur', "");
\ No newline at end of file
diff --git a/route/cp_r/cp_relation.go b/route/cp_r/cp_relation.go
index ec6360f..dfbfa92 100644
--- a/route/cp_r/cp_relation.go
+++ b/route/cp_r/cp_relation.go
@@ -346,13 +346,13 @@ func ReplyCpCancel(c *gin.Context) (*mycontext.MyContext, error) {
 		var msgData []byte
 		if optType == 1 { // 撤销解除
 			// 私信
-			//content, err := msg.GetResMultiTextBy(model, common.MSG_ID_UNBIND_CP_SUCCEED, lang)
-			//if err != nil {
-			//	return err
-			//}
+			content, err := msg.GetResMultiTextBy(model, common.MSG_ID_CANCEL_UNBIND_CP, lang)
+			if err != nil {
+				return err
+			}
 			msgData, _ = json.Marshal(cp_m.CpDealCancelMessage{
 				Identifier: "CpDealCancelMessage",
-				Msg:        fmt.Sprintf("%s withdrew my application to lift CP", myUser.Nick), // cwj----
+				Msg:        fmt.Sprintf(content, myUser.Nick),
 				Status:     1,
 			})
 		} else { // 接受解除
-- 
2.22.0