wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-lwl/zone' into test

This commit is contained in:
lwl0608 2024-04-29 16:25:30 +08:00
parent 1b17cf1a79 f12a1ad2a2
commit 9e4a6e744a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/mix/service/logic/vas.go
View File

@ -776,7 +776,7 @@ func (v *Vas) OneStepUnlockContact(ctx *gin.Context, req *vasproto.OneStepUnlock
if originalContactProductId == dbstruct.ProductIdH5ContactWechat { if originalContactProductId == dbstruct.ProductIdH5ContactWechat {
totalDias = uVasInfo.GetWechatCoinPrice() totalDias = uVasInfo.GetWechatCoinPrice()
} }
incomeList, err1 := v.calcAndUpdateIncome(ctx, tx, uid, mid, req.Did, orderId, contactProductId, totalDias, dbstruct.CHSTypeIncomeContact) incomeList, err1 := v.calcAndUpdateIncome(ctx, tx, uid, mid, req.Did, coinOrderId, contactProductId, totalDias, dbstruct.CHSTypeIncomeContact)
if err1 != nil { if err1 != nil {
logger.Error("calcAndUpdateIncome fail, coinOrder: %v, err: %v", util.ToJson(coinOrder), err1) logger.Error("calcAndUpdateIncome fail, coinOrder: %v, err: %v", util.ToJson(coinOrder), err1)
err = err1 err = err1
@ -788,20 +788,27 @@ func (v *Vas) OneStepUnlockContact(ctx *gin.Context, req *vasproto.OneStepUnlock
"total_dias": totalDias, "total_dias": totalDias,
"income_list": incomeList, "income_list": incomeList,
} }
err = v.store.UpdateCoinOrderExt(ctx, tx, orderId, util.ToJson(orderExt)) err = v.store.UpdateCoinOrderExt(ctx, tx, coinOrderId, util.ToJson(orderExt))
if err != nil { if err != nil {
logger.Error("UpdateCoinOrderExt fail, order_id: %v, ext: %v, err: %v", orderId, util.ToJson(orderExt), err) logger.Error("UpdateCoinOrderExt fail, order_id: %v, ext: %v, err: %v", coinOrderId, util.ToJson(orderExt), err)
return return
} }
// 增加空间消费 // 增加空间消费
if coinPrice > 0 { if coinPrice > 0 {
_err := v.IncZoneConsume(ctx, tx, 0, mid, uid, coinPrice, orderId, contactProductId) _err := v.IncZoneConsume(ctx, tx, 0, mid, uid, coinPrice*10, coinOrderId, contactProductId)
if _err != nil { if _err != nil {
logger.Error("IncZoneConsume fail, mid: %v, streamerMid: %v, orderId: %v, err: %v", mid, uid, orderId, err) logger.Error("IncZoneConsume fail, mid: %v, streamerMid: %v, coinOrderId: %v, err: %v", mid, uid, coinOrderId, err)
} }
} }
} }
// 是否达到铁粉解锁条件
_err := v.UnlockZoneIronfanshipReachConsume(ctx, tx, coinOrder.GetMid(), 0, coinOrder.GetUid())
if _err != nil {
logger.Error("UnlockZoneIronfanshipReachConsume fail, coinOrder: %v, err: %v", util.ToJson(coinOrder), _err)
return
}
return return
} }