wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into test

This commit is contained in:
wangxinyu 2024-12-23 16:58:38 +08:00
parent 37c50094c5 b7052cf399
commit 16d4cd46a5
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/mix/controller/zone_vas_api.go
View File

@ -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

2
app/mix/dao/mongo_vas.go
View File

@ -362,7 +362,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,
},

3
app/mix/service/logic/vas_zone.go
View File

@ -1270,6 +1270,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,
@ -1336,7 +1337,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("非本人审核订单")
}

2
dbstruct/vas_mongo.go
View File

@ -222,7 +222,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"`