From 5550b0641475edcb2f338178809a73fe6fa8c976 Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Wed, 14 Jun 2023 10:37:30 +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           | 32 +++++++++++++++++++++++++++++++-
 route/cp_r/cp_relation.go |  6 ++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/mysql/3.9.0.sql b/mysql/3.9.0.sql
index 6cbfd6b..ebbc812 100644
--- a/mysql/3.9.0.sql
+++ b/mysql/3.9.0.sql
@@ -208,4 +208,34 @@ VALUES (258, 'zh', "已经过期"),
        (258, 'ca', "ya vencido"),
        (258, 'hi', "पहले ही समाप्त हो चुका है"),
        (258, 'vi', "Đã hết hạn"),
-       (258, 'ur', "پہلے ہی ختم ہو چکا ہے۔");
\ No newline at end of file
+       (258, 'ur', "پہلے ہی ختم ہو چکا ہے۔");
+
+INSERT INTO hilo.res_multi_text (msg_id, `language`, content)
+VALUES (272, 'zh', "绑定CP花费"),
+       (272, 'en', "Binding CP cost"),
+       (272, 'ar', "تكلفة CP الارتباط"),
+       (272, 'tr', "Bağlayıcı CP maliyeti"),
+       (272, 'id', "Mengikat biaya CP"),
+       (272, 'ru', "Привязка стоимости CP"),
+       (272, 'ko', "구속력 있는 CP 비용"),
+       (272, 'pt', "Custo de CP vinculativo"),
+       (272, 'th', "ค่าซีพีเข้าเล่ม"),
+       (272, 'ca', "Costo de CP vinculante"),
+       (272, 'hi', "बाध्यकारी सीपी लागत"),
+       (272, 'vi', "Chi phí CP ràng buộc"),
+       (272, 'ur', "بائنڈنگ CP لاگت");
+
+INSERT INTO hilo.res_multi_text (msg_id, `language`, content)
+VALUES (273, 'zh', "绑定CP返还"),
+       (273, 'en', "Binding CP return"),
+       (273, 'ar', "استرداد CP الارتباط"),
+       (273, 'tr', "Bağlayıcı CP dönüşü"),
+       (273, 'id', "Pengembalian CP yang mengikat"),
+       (273, 'ru', "Обязательный возврат CP"),
+       (273, 'ko', "바인딩 CP 반환"),
+       (273, 'pt', "Retorno de CP vinculativo"),
+       (273, 'th', "การคืนค่า 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
diff --git a/route/cp_r/cp_relation.go b/route/cp_r/cp_relation.go
index fb63380..ec6360f 100644
--- a/route/cp_r/cp_relation.go
+++ b/route/cp_r/cp_relation.go
@@ -5,12 +5,14 @@ import (
 	"fmt"
 	"git.hilo.cn/hilo-common/_const/common"
 	"git.hilo.cn/hilo-common/_const/enum/diamond_e"
+	"git.hilo.cn/hilo-common/_const/enum/msg_e"
 	"git.hilo.cn/hilo-common/domain"
 	"git.hilo.cn/hilo-common/mycontext"
 	"git.hilo.cn/hilo-common/myerr/comerr"
 	"git.hilo.cn/hilo-common/resource/mysql"
 	"git.hilo.cn/hilo-common/sdk/tencentyun"
 	"git.hilo.cn/hilo-common/txop/bag_tx"
+	"git.hilo.cn/hilo-common/txop/diamond_tx"
 	"git.hilo.cn/hilo-common/txop/msg"
 	"git.hilo.cn/hilo-common/utils"
 	"github.com/gin-gonic/gin"
@@ -19,7 +21,6 @@ import (
 	"hilo-user/cv/user_cv"
 	"hilo-user/domain/cache/user_c"
 	"hilo-user/domain/model/cp_m"
-	"hilo-user/domain/model/diamond_m"
 	"hilo-user/domain/model/user_m"
 	"hilo-user/domain/service/cp_s"
 	"hilo-user/myerr"
@@ -243,7 +244,8 @@ func ReplyCpInvite(c *gin.Context) (*mycontext.MyContext, error) {
 			})
 		} else { // 拒绝
 			// 退费
-			err = diamond_m.ChangeDiamondAccountDetail(model, diamond_e.CpInviteRefund, cpRecord.Id, cpRecord.UserId, cpRecord.DiamondNum)
+			err = diamond_tx.SendDiamond(model, cpRecord.UserId, diamond_e.CpInviteRefund, cpRecord.Id, cpRecord.DiamondNum,
+				msg_e.MgrSendDiamondProperty)
 			if err != nil {
 				model.Log.Errorf("ReplyCpInvite UserId:%d, err:%v", cpRecord.UserId, err)
 				return err
-- 
2.22.0