|
|
@@ -67,11 +67,7 @@ func GetPayTransList(c *gin.Context) {
|
|
|
transData.MerchantCardTime = tools.TimeToStr(cardInfo.MerchantCardTime)
|
|
|
transData.TotalCancelNumber = cardInfo.CancelNumber
|
|
|
transData.CancelNumber = cardInfo.CancelNumber - cancelNum.GetNumber()
|
|
|
- if merchantCard[i].InvitationCode == "yuanshima" {
|
|
|
- transData.CommAmount = decimal.NewFromInt(0)
|
|
|
- } else {
|
|
|
- transData.CommAmount = merchantCard[i].Amount.Mul(decimal.NewFromInt(cardInfo.RebateRate)).Div(decimal.NewFromInt(100)).Round(2)
|
|
|
- }
|
|
|
+ transData.CommAmount = merchantCard[i].Amount.Mul(decimal.NewFromInt(cardInfo.RebateRate)).Div(decimal.NewFromInt(100)).Round(2)
|
|
|
|
|
|
outTransData = append(outTransData, transData)
|
|
|
}
|
|
|
@@ -162,7 +158,11 @@ func GetMerchantPayTransList(c *gin.Context) {
|
|
|
data.MerchantCardTime = tools.TimeToStr(mer[payInfo[i].MerchantCardID].MerchantCardTime)
|
|
|
data.MerchantCardName = mer[payInfo[i].MerchantCardID].MerchantCardName
|
|
|
data.TotalAmount = payInfo[i].Amount
|
|
|
- data.SaleAmount = payInfo[i].Amount.Mul(decimal.NewFromInt(mer[payInfo[i].MerchantCardID].RebateRate)).Div(decimal.NewFromInt(100)).Round(2)
|
|
|
+ if payInfo[i].InvitationCode == app.LIANMENGKA_YUAN_SHI_MA {
|
|
|
+ data.SaleAmount = decimal.NewFromInt(0)
|
|
|
+ } else {
|
|
|
+ data.SaleAmount = payInfo[i].Amount.Mul(decimal.NewFromInt(mer[payInfo[i].MerchantCardID].RebateRate)).Div(decimal.NewFromInt(100)).Round(2)
|
|
|
+ }
|
|
|
data.MerchantAmount = data.TotalAmount.Sub(data.SaleAmount)
|
|
|
data.MerchantCardID = payInfo[i].MerchantCardID
|
|
|
data.PayTime = payInfo[i].PayTime.Format(time.DateTime)
|
