From b5515cb3520f864d42ab2ff55afacfcab7b46089 Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Mon, 8 Sep 2025 18:04:24 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=88=96=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=A7=E5=93=81id=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E9=81=BF=E5=85=8D=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=B8=9A=E5=8A=A1=E8=AE=A2=E5=8D=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/apis/migumanage/migu_music.go | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/admin/apis/migumanage/migu_music.go b/app/admin/apis/migumanage/migu_music.go
index 98cd36a..5a3d666 100644
--- a/app/admin/apis/migumanage/migu_music.go
+++ b/app/admin/apis/migumanage/migu_music.go
@@ -306,7 +306,9 @@ func (e MiGuDeployService) MusicFeedback(c *gin.Context) {
 
 			if 1 == 1 { // 更新订单表的退订信息
 				var lastOrder models.MgOrder
-				e.Orm.Model(&models.MgOrder{}).Where("phone_number = ?", req.MSISDN).
+				e.Orm.Model(&models.MgOrder{}).
+					Where("product_id = ?", models.MusicProductID).
+					Where("phone_number = ?", req.MSISDN).
 					Order("subscribe_time DESC").First(&lastOrder)
 
 				if lastOrder.IsOneHourCancel != 1 { // 非1小时退订才更新，否则不用更新
@@ -321,7 +323,9 @@ func (e MiGuDeployService) MusicFeedback(c *gin.Context) {
 					}
 
 					// 更新订单状态
-					err = database.Db.Table("mg_order").Where("phone_number = ?", req.MSISDN).Updates(map[string]interface{}{
+					err = database.Db.Table("mg_order").
+						Where("product_id = ? and phone_number = ?", models.MusicProductID,
+							req.MSISDN).Updates(map[string]interface{}{
 						"state":              models.UnsubscribeOK,
 						"is_one_hour_cancel": cancelFlag,
 						"unsubscribe_time":   unsubTime,
@@ -336,7 +340,9 @@ func (e MiGuDeployService) MusicFeedback(c *gin.Context) {
 
 			if 2 == 2 { // 更新订单log表的退订信息
 				var lastOrderLog models.MgOrderLog
-				e.Orm.Model(&models.MgOrderLog{}).Where("phone_number = ?", req.MSISDN).
+				e.Orm.Model(&models.MgOrderLog{}).
+					Where("product_id = ?", models.MusicProductID).
+					Where("phone_number = ?", req.MSISDN).
 					Order("subscribe_time DESC").First(&lastOrderLog)
 
 				if lastOrderLog.IsOneHourCancel != 1 { // 非1小时退订才更新，否则不用更新
@@ -351,7 +357,8 @@ func (e MiGuDeployService) MusicFeedback(c *gin.Context) {
 					}
 
 					// 更新订单状态
-					err = database.Db.Table("mg_order_log").Where("phone_number = ?", req.MSISDN).Updates(map[string]interface{}{
+					err = database.Db.Table("mg_order_log").Where("product_id = ? and phone_number = ?",
+						models.MusicProductID, req.MSISDN).Updates(map[string]interface{}{
 						"state":              models.UnsubscribeOK,
 						"is_one_hour_cancel": cancelFlagLog,
 						"unsubscribe_time":   unsubTimeLog,
@@ -366,7 +373,9 @@ func (e MiGuDeployService) MusicFeedback(c *gin.Context) {
 
 		} else {
 			var lastOrder models.MgOrderLog
-			err = e.Orm.Model(&models.MgOrderLog{}).Where("phone_number = ?", req.MSISDN).
+			err = e.Orm.Model(&models.MgOrderLog{}).
+				Where("product_id = ?", models.MusicProductID).
+				Where("phone_number = ?", req.MSISDN).
 				Order("subscribe_time DESC").First(&lastOrder).Error
 			if err != nil && err != gorm.ErrRecordNotFound {
 				logger.Info("query mg_order_log err:", err)
@@ -502,7 +511,9 @@ func (e MiGuDeployService) AIMusicFeedback(c *gin.Context) {
 
 	if req.ResCode == 1 { // 成功消息
 		var lastOrder models.MgOrder
-		result := e.Orm.Model(&models.MgOrder{}).Where("phone_number = ?", req.PhoneNumber).
+		result := e.Orm.Model(&models.MgOrder{}).
+			Where("product_id = ?", models.MusicProductID).
+			Where("phone_number = ?", req.PhoneNumber).
 			Order("subscribe_time DESC").First(&lastOrder)
 
 		if errors.Is(result.Error, gorm.ErrRecordNotFound) {