|
|
|
@@ -34,12 +34,12 @@ func WithdrawalIncome(c *gin.Context) { |
|
|
|
if amountMap["is_show_official_amount"] == "1" { |
|
|
|
var tmp = map[string]string{"name": "账户一余额", "value": amountMap["amount"], "type": "amount", "tip": "", "alipay": amountMap["alipay"], "alipay_name": amountMap["alipay_name"], "is_need_bing_alipay": isNeedBingAlipay, "is_show_withdrawal": "1"} |
|
|
|
res = append(res, tmp) |
|
|
|
if utils.StrToInt(amountMap["puid"]) > 0 { |
|
|
|
if amountMap["is_show_agent_amount"] == "1" { |
|
|
|
var tmpAgent = map[string]string{"name": "账户二余额", "value": amountMap["agent_amount"], "type": "agent_amount", "tip": "", "alipay": amountMap["alipay"], "alipay_name": amountMap["alipay_name"], "is_need_bing_alipay": isNeedBingAlipay, "is_show_withdrawal": "1"} |
|
|
|
res = append(res, tmpAgent) |
|
|
|
} |
|
|
|
} else { |
|
|
|
var tmpAgent = map[string]string{"name": "账户余额", "value": amountMap["agent_amount"], "type": "agent_amount", "tip": "", "alipay": amountMap["alipay"], "alipay_name": amountMap["alipay_name"], "is_need_bing_alipay": isNeedBingAlipay, "is_show_withdrawal": "1"} |
|
|
|
var tmpAgent = map[string]string{"name": "账户二余额", "value": amountMap["agent_amount"], "type": "agent_amount", "tip": "", "alipay": amountMap["alipay"], "alipay_name": amountMap["alipay_name"], "is_need_bing_alipay": isNeedBingAlipay, "is_show_withdrawal": "1"} |
|
|
|
res = append(res, tmpAgent) |
|
|
|
} |
|
|
|
res = append(res, map[string]string{"name": "上月预估收益", "value": monthAmountMap["last_month_amount"], "type": "last_month_amount", "tip": "", "is_need_bing_alipay": "0", "is_show_withdrawal": "0"}) |
|
|
|
@@ -382,7 +382,10 @@ func masterAmount(mid, types string) map[string]string { |
|
|
|
res["agent_amount"] = "0" |
|
|
|
res["is_show_official_amount"] = "1" |
|
|
|
res["puid"] = puid |
|
|
|
res["is_show_agent_amount"] = "0" |
|
|
|
if utils.StrToInt(puid) > 0 && hwOwnOpen == "1" { |
|
|
|
res["is_show_agent_amount"] = "1" |
|
|
|
|
|
|
|
agentMasterAmounts := masterAmountDb.GetMasterAmountByExtendUid(masterInfos["id"], puid, types) |
|
|
|
if agentMasterAmounts != nil { |
|
|
|
if agentMasterAmounts.Amount != "" { |
|
|
|
|
huangjiajun