|
|
@@ -140,8 +140,9 @@ func CommSettleDone(eg *xorm.Engine, pvd string, oid int64, masterId string, map |
|
|
|
if set != nil { |
|
|
|
appName = set.Val |
|
|
|
} |
|
|
|
pvdOid := oid |
|
|
|
if mapData["pvd_oid"] != "" { |
|
|
|
oid = utils.StrToInt64(mapData["pvd_oid"]) |
|
|
|
pvdOid = utils.StrToInt64(mapData["pvd_oid"]) |
|
|
|
} |
|
|
|
for _, item := range ol { |
|
|
|
if mapData["reward_type"] == "2" && item.Level == 0 { |
|
|
@@ -152,7 +153,7 @@ func CommSettleDone(eg *xorm.Engine, pvd string, oid int64, masterId string, map |
|
|
|
//公排 |
|
|
|
if utils.InArr(item.Mode, []string{"lv_commission_public_platoon", "lv_price_public_platoon"}) && item.ExtendType == 5 { |
|
|
|
fmt.Println("======================555") |
|
|
|
bools := PublicPlatoonSettle(session, "共富奖励", mapData["title"], utils.Int64ToStr(oid), item.Uid, 0, item.Amount) |
|
|
|
bools := PublicPlatoonSettle(session, "共富奖励", mapData["title"], utils.Int64ToStr(pvdOid), item.Uid, 0, item.Amount) |
|
|
|
fmt.Println("======================666", bools) |
|
|
|
if bools == false { |
|
|
|
_ = session.Rollback() |
|
|
@@ -160,11 +161,12 @@ func CommSettleDone(eg *xorm.Engine, pvd string, oid int64, masterId string, map |
|
|
|
} |
|
|
|
continue |
|
|
|
} |
|
|
|
item.Oid = pvdOid |
|
|
|
_ = CommCommSettleMoney(session, item, appName, masterId, mapData) |
|
|
|
} |
|
|
|
if utils.StrToFloat64(item.AdditionalSubsidy) > 0 { |
|
|
|
if item.Mode == "public_platoon" { //公排 |
|
|
|
bools := PublicPlatoonSettle(session, "共富奖励", mapData["title"], utils.Int64ToStr(oid), item.Uid, 0, utils.StrToFloat64(item.AdditionalSubsidy)) |
|
|
|
bools := PublicPlatoonSettle(session, "共富奖励", mapData["title"], utils.Int64ToStr(pvdOid), item.Uid, 0, utils.StrToFloat64(item.AdditionalSubsidy)) |
|
|
|
if bools == false { |
|
|
|
_ = session.Rollback() |
|
|
|
return false |
|
|
@@ -180,7 +182,7 @@ func CommSettleDone(eg *xorm.Engine, pvd string, oid int64, masterId string, map |
|
|
|
if utils.StrToFloat64(item.Amount) > 0 { |
|
|
|
if utils.InArr(item.Mode, []string{"lv_commission_public_platoon", "lv_price_public_platoon"}) && item.ExtendType == 5 { |
|
|
|
fmt.Println("======================555") |
|
|
|
bools := PublicPlatoonSettle(session, "共富奖励", mapData["title"], utils.Int64ToStr(oid), item.Uid, item.CoinId, utils.StrToFloat64(item.Amount)) |
|
|
|
bools := PublicPlatoonSettle(session, "共富奖励", mapData["title"], utils.Int64ToStr(pvdOid), item.Uid, item.CoinId, utils.StrToFloat64(item.Amount)) |
|
|
|
fmt.Println("======================666", bools) |
|
|
|
if bools == false { |
|
|
|
_ = session.Rollback() |
|
|
@@ -188,11 +190,12 @@ func CommSettleDone(eg *xorm.Engine, pvd string, oid int64, masterId string, map |
|
|
|
} |
|
|
|
continue |
|
|
|
} |
|
|
|
item.Oid = pvdOid |
|
|
|
_ = CommSettleVirtualCoin(session, item, mapData) |
|
|
|
} |
|
|
|
//公排 |
|
|
|
if item.Mode == "public_platoon" && utils.StrToFloat64(item.AdditionalSubsidy) > 0 { |
|
|
|
bools := PublicPlatoonSettle(session, "共富奖励", mapData["title"], utils.Int64ToStr(oid), item.Uid, item.CoinId, utils.StrToFloat64(item.AdditionalSubsidy)) |
|
|
|
bools := PublicPlatoonSettle(session, "共富奖励", mapData["title"], utils.Int64ToStr(pvdOid), item.Uid, item.CoinId, utils.StrToFloat64(item.AdditionalSubsidy)) |
|
|
|
if bools == false { |
|
|
|
_ = session.Rollback() |
|
|
|
return false |
|
|
|