|
@@ -53,10 +53,14 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
if isTask && (now.Hour() > 8) && now.After(settleTime) { |
|
|
if isTask && (now.Hour() > 8) && now.After(settleTime) { |
|
|
|
|
|
session.Rollback() |
|
|
//TODO::结算时间 ~ 凌晨 8 点运行 |
|
|
//TODO::结算时间 ~ 凌晨 8 点运行 |
|
|
return errors.New("非运行时间") |
|
|
return errors.New("非运行时间") |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if isTask && zhios_order_relate_utils.InArr(now.Weekday().String(), []string{"Sunday", "Saturday"}) && subsidyBase.HolidaySettleOpen != 1 { |
|
|
|
|
|
session.Rollback() |
|
|
|
|
|
return errors.New("周末不运行") |
|
|
|
|
|
} |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
_ = session.Rollback() |
|
|
_ = session.Rollback() |
|
|
return err |
|
|
return err |
|
|