diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index 57da110f..5dffcd67 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -2852,7 +2852,7 @@ func (s *Service) ApiGetZoneListByMid(ctx *gin.Context, req *zoneproto.ApiListBy logger.Info("_ZU mid: %v, zid: %v, zidZuMapTmp: %v", req.BaseRequest.Mid, zid, util.ToJson(zidZuMapTmp)) if zu, ok := zidZuMapTmp[zid]; ok { logger.Info("_ZU mid: %v, zid: %v, zu: %v", req.BaseRequest.Mid, zid, util.ToJson(zu)) - if time.Now().Unix()-zu.GetAdmissionCt() < 3600*48 { + if time.Now().Unix()-zu.GetAdmissionCt() < 3600*2 { refundEnable = 1 } if zu.GetAdmissionUnlockType() == dbstruct.ZoneUnlockTypeRefund { diff --git a/app/mix/service/logic/vas_zone.go b/app/mix/service/logic/vas_zone.go index f7cccb8e..307d39c9 100644 --- a/app/mix/service/logic/vas_zone.go +++ b/app/mix/service/logic/vas_zone.go @@ -10,7 +10,6 @@ import ( "service/bizcommon/util" "service/dbstruct" "service/library/logger" - "service/library/payclients/alipaycli" "service/library/redis" "time" @@ -975,9 +974,9 @@ func (v *Vas) ZoneRefund(ctx *gin.Context, req *vasproto.ZoneRefundReq) error { logger.Error("get zone admission order info fail, mid: %v, zid: %v, orderId: %v, err: %v", req.Mid, req.Zid, zv.GetAdmissionOrderId(), err) return err } - if order.GetOid3() == alipaycli.AppIdMiYuanTianShi { - return fmt.Errorf("订单正在处理,请24小时后重试") - } + //if order.GetOid3() == alipaycli.AppIdMiYuanTianShi { + // return fmt.Errorf("订单正在处理,请24小时后重试") + //} // 退款 err = v.RefundOrder(ctx, &vasproto.RefundOrderReq{