diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index ae5cf006..b7d51785 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -3002,7 +3002,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*2 { + if time.Now().Unix()-zu.GetAdmissionCt() < 3600*48 { 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 b5b43d90..d55c7afa 100644 --- a/app/mix/service/logic/vas_zone.go +++ b/app/mix/service/logic/vas_zone.go @@ -10,6 +10,7 @@ import ( "service/bizcommon/util" "service/dbstruct" "service/library/logger" + "service/library/payclients/alipaycli" "service/library/redis" "time" @@ -1089,6 +1090,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小时后重试") + } // 退款 err = v.RefundOrder(ctx, &vasproto.RefundOrderReq{ diff --git a/library/payclients/alipaycli/client.go b/library/payclients/alipaycli/client.go index 0567097d..29d85df7 100644 --- a/library/payclients/alipaycli/client.go +++ b/library/payclients/alipaycli/client.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/go-pay/gopay" "github.com/go-pay/gopay/alipay" - "math/rand" "net/http" "service/bizcommon/util" "service/library/configcenter" @@ -28,10 +27,10 @@ const ( var allAlipayClients = map[string]*AlipayClient{} func GetDefaultAlipayClient() *AlipayClient { - rate := rand.Intn(100) - if rate < 75 { - return allAlipayClients[AppIdMiYuanTianShi] - } + //rate := rand.Intn(100) + //if rate < 75 { + // return allAlipayClients[AppIdMiYuanTianShi] + //} return allAlipayClients[AppIdLanXing01] }