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-25 12:31:36 +08:00
parent 6cd2f0801f 0b927164c1
commit e30115e539
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,7 +448,7 @@ func (m *Mongo) GetRefundAudit(ctx *gin.Context) ([]*dbstruct.RefundInfo, error)
"$gte": at - 5*60, // >=
"$lte": at, // <=
},
"refunds_status": dbstruct.RefundsApproved,
"refunds_status": dbstruct.RefundsAwaiting,
}
err := col.Find(ctx, query).All(&list)
if errors.Is(err, qmgo.ErrNoSuchDocuments) {

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

@ -1344,6 +1344,11 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq
if time.Now().Unix()-info.Ct > 24*3600 {
logger.Warn("ZoneRefundAudit, Order review timeout, automatic refund, mid: %v, zid: %v, auditId: %v", req.Mid, req.Zid, req.AuditId)
err = v.store.SetZoneRefundAuditInfo(ctx, req.AuditId, dbstruct.RefundsOvertime)
if err != nil {
logger.Error("ZoneRefundAudit SetZoneRefundAuditInfo fail, mid: %v, zid: %v, orderId: %v, err: %v", info.Mid, info.Zid, info.OrderId, err)
return err
}
return fmt.Errorf("审核订单超时，已自动退款")
}
@ -1352,12 +1357,6 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq
return fmt.Errorf("退款订单已审核")
}
err = v.store.SetZoneRefundAuditInfo(ctx, req.AuditId, req.RefundsStatus)
if err != nil {
logger.Error("ZoneRefundAudit SetZoneRefundAuditInfo fail, mid: %v, zid: %v, orderId: %v, err: %v", info.Mid, info.Zid, info.OrderId, err)
return err
}
// 退款
err = v.RefundOrder(ctx, &vasproto.RefundOrderReq{
OrderId: info.OrderId,
@ -1373,6 +1372,12 @@ func (v *Vas) ZoneRefundAudit(ctx *gin.Context, req *vasproto.ZoneRefundAuditReq
return err
}
err = v.store.SetZoneRefundAuditInfo(ctx, req.AuditId, req.RefundsStatus)
if err != nil {
logger.Error("ZoneRefundAudit SetZoneRefundAuditInfo fail, mid: %v, zid: %v, orderId: %v, err: %v", info.Mid, info.Zid, info.OrderId, err)
return err
}
return nil
}
@ -1389,13 +1394,6 @@ func (v *Vas) UserRefundAuditTimes(ctx *gin.Context) error {
ids = append(ids, v.AuditId)
}
// 订单自动退款 mongodb 数据修改
err = v.store.SetRefundAudit(ctx, ids)
if err != nil {
logger.Error("UserRefundAuditTimes SetRefundAudit fail ", err)
return err
}
for _, refundInfo := range list {
req := &vasproto.ZoneRefundReq{
Zid: refundInfo.Zid,
@ -1413,6 +1411,12 @@ func (v *Vas) UserRefundAuditTimes(ctx *gin.Context) error {
continue
}
}
// 订单自动退款 mongodb 数据修改
err = v.store.SetRefundAudit(ctx, ids)
if err != nil {
logger.Error("UserRefundAuditTimes SetRefundAudit fail ", err)
return err
}
logger.Info("UserRefundAuditTimes Refund order streamer review timeout, list: %v, ", util.ToJson(list))
return nil
}