Compare commits

..

No commits in common. "38117c3a08b50a433583a72c15d71b08a8d29026" and "ee190b4a964cd96f27b749fa415862aeb4a933b3" have entirely different histories.

View File

@ -516,11 +516,9 @@ func CheckUserBundleBalance(userID int32, balanceType modelCast.BalanceTypeEnum,
}
case modelCast.BalanceTypeImageValue:
//判断用户是新购还是续费,新购就提示验收失败,套餐已过期,续费就继续扣减
if len(otherFields) >= 2 {
confirmFailType, err = CheckOrderRenewal(otherFields[1], resp)
if err != nil {
return
}
confirmFailType, err = CheckOrderRenewal(otherFields[1], resp)
if err != nil {
return
}
if resp.ImageExtendConsumptionNumber >= resp.ImageExtendNumber {
confirmFailType = cast.ConfirmFailENUM_ConfirmFailENUM_NOTENOUGH
@ -528,12 +526,10 @@ func CheckUserBundleBalance(userID int32, balanceType modelCast.BalanceTypeEnum,
return
}
case modelCast.BalanceTypeVideoValue:
if len(otherFields) >= 2 {
//判断用户是新购还是续费,新购就提示验收失败,套餐已过期,续费就继续扣减
confirmFailType, err = CheckOrderRenewal(otherFields[1], resp)
if err != nil {
return
}
//判断用户是新购还是续费,新购就提示验收失败,套餐已过期,续费就继续扣减
confirmFailType, err = CheckOrderRenewal(otherFields[1], resp)
if err != nil {
return
}
if resp.VideoExtendConsumptionNumber >= resp.VideoExtendNumber {
confirmFailType = cast.ConfirmFailENUM_ConfirmFailENUM_NOTENOUGH