From b7052cf39929f1ead93a45f67d03f8e50000917e Mon Sep 17 00:00:00 2001
From: wangxinyu <wangxinyu4585@163.com>
Date: Mon, 23 Dec 2024 16:58:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE-=E4=B8=BB=E6=92=AD=20?=
 =?UTF-8?q?id=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/mix/controller/zone_vas_api.go | 4 ++--
 app/mix/dao/mongo_vas.go           | 2 +-
 app/mix/service/logic/vas_zone.go  | 3 ++-
 dbstruct/vas_mongo.go              | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/mix/controller/zone_vas_api.go b/app/mix/controller/zone_vas_api.go
index cdce6f88..3ef6500e 100644
--- a/app/mix/controller/zone_vas_api.go
+++ b/app/mix/controller/zone_vas_api.go
@@ -119,7 +119,7 @@ func ZoneRefundV2(ctx *gin.Context) {
 
 	ec, err := service.DefaultService.ZoneRefundV2(ctx, req)
 	if ec != errcode.ErrCodeVasSrvOk {
-		logger.Error("ZoneRefundV2 fail, req: %v, ec: %v", util.ToJson(req), ec)
+		logger.Error("ZoneRefundV2 fail, req: %v, ec: %v, err: %v", util.ToJson(req), ec, err)
 		if ec == errcode.ErrCodeVasSrvFail && err != nil {
 			ReplyErrorMsg(ctx, err.Error())
 			return
@@ -145,7 +145,7 @@ func ZoneRefundList(ctx *gin.Context) {
 
 	list, ec, err := service.DefaultService.ZoneRefundList(ctx, req)
 	if ec != errcode.ErrCodeVasSrvOk {
-		logger.Error("ZoneRefundList fail, req: %v, ec: %v", util.ToJson(req), ec)
+		logger.Error("ZoneRefundList fail, req: %v, ec: %v, err: %v", util.ToJson(req), ec, err)
 		if ec == errcode.ErrCodeVasSrvFail && err != nil {
 			ReplyErrorMsg(ctx, err.Error())
 			return
diff --git a/app/mix/dao/mongo_vas.go b/app/mix/dao/mongo_vas.go
index c7acf19c..457e4904 100644
--- a/app/mix/dao/mongo_vas.go
+++ b/app/mix/dao/mongo_vas.go
@@ -296,7 +296,7 @@ func (m *Mongo) GetZoneRefundList(ctx *gin.Context, bMid int64, refundsStatusLis
 	doc := m.GetZoneRefund()
 
 	query := qmgo.M{
-		"b_mid": bMid,
+		"streamer_mid": bMid,
 		"refunds_status": qmgo.M{
 			"$in": refundsStatusList,
 		},
diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go
index 7ac53efa..f5b33d8b 100644
--- a/app/mix/service/logic/vas_zone.go
+++ b/app/mix/service/logic/vas_zone.go
@@ -1067,6 +1067,7 @@ func (v *Vas) ZoneRefundV2(ctx *gin.Context, req *vasproto.ZoneRefundReq) error
 		AuditId:       primitive.NewObjectID().Hex(),
 		Zid:           req.Zid,
 		Mid:           req.Mid,
+		StreamerMid:   order.GetUid(),
 		ByTime:        order.GetCt(),
 		RefundT:       time.Now().Unix(),
 		RefundsStatus: refundsStatus,
@@ -1133,7 +1134,7 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq
 		return fmt.Errorf("审核订单不存在")
 	}
 
-	if info.BMid != req.Mid {
+	if info.StreamerMid != req.Mid {
 		logger.Error("ZoneRefundAudit, Not personally audited the order, mid: %v, zid: %v, auditId: %v", req.Mid, req.Zid, req.AuditId)
 		return fmt.Errorf("非本人审核订单")
 	}
diff --git a/dbstruct/vas_mongo.go b/dbstruct/vas_mongo.go
index 488ca34f..bae3b04f 100644
--- a/dbstruct/vas_mongo.go
+++ b/dbstruct/vas_mongo.go
@@ -204,7 +204,7 @@ type RefundInfo struct {
 	Price         int64  `json:"price" bson:"price"`
 	CoinPrice     int64  `json:"coin_price" bson:"coin_price"`
 	Mid           int64  `json:"mid" bson:"mid"`
-	BMid          int64  `json:"b_mid" bson:"b_mid"`
+	StreamerMid   int64  `json:"streamer_mid" bson:"streamer_mid"`
 	ByTime        int64  `json:"by_time" bson:"by_time"`
 	RefundT       int64  `json:"refund_t" bson:"refund_t"`
 	RefundsStatus int64  `json:"refunds_status" bson:"refunds_status"`