|
|
|
@ -40,6 +40,8 @@ type Profit struct {
|
|
|
|
|
EAmount6 decimal.Decimal // 自购导购未到账金额
|
|
|
|
|
ECount7 uint // 批发收益未到账补贴
|
|
|
|
|
EAmount7 decimal.Decimal // 批发收益未到账金额
|
|
|
|
|
ECount9 uint // 批发收益未到账补贴
|
|
|
|
|
EAmount9 decimal.Decimal // 批发收益未到账金额
|
|
|
|
|
|
|
|
|
|
Count1 uint
|
|
|
|
|
Amount1 decimal.Decimal
|
|
|
|
@ -55,6 +57,8 @@ type Profit struct {
|
|
|
|
|
Amount6 decimal.Decimal
|
|
|
|
|
Count7 uint
|
|
|
|
|
Amount7 decimal.Decimal
|
|
|
|
|
Count9 uint
|
|
|
|
|
Amount9 decimal.Decimal
|
|
|
|
|
|
|
|
|
|
Total decimal.Decimal // 全部到账金额
|
|
|
|
|
ETotal decimal.Decimal // 全部未到账金额
|
|
|
|
@ -136,7 +140,11 @@ func (i *incomeLogic) Profit(userID uint) (res Profit) {
|
|
|
|
|
case order.Sale:
|
|
|
|
|
res.ECount7 += 1
|
|
|
|
|
res.EAmount7 = res.EAmount7.Add(v.Income)
|
|
|
|
|
case order.Vip:
|
|
|
|
|
res.ECount9 += 1
|
|
|
|
|
res.EAmount9 = res.EAmount9.Add(v.Income)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
res.ETotal = res.ETotal.Add(v.Income)
|
|
|
|
|
case 2:
|
|
|
|
|
switch v.Type {
|
|
|
|
@ -160,7 +168,10 @@ func (i *incomeLogic) Profit(userID uint) (res Profit) {
|
|
|
|
|
res.Amount6 = res.Amount6.Add(v.Income)
|
|
|
|
|
case order.Sale:
|
|
|
|
|
res.Count7 += 1
|
|
|
|
|
res.Amount7 = res.Amount7.Add(v.Income)
|
|
|
|
|
res.Amount7 = res.Amount9.Add(v.Income)
|
|
|
|
|
case order.Vip:
|
|
|
|
|
res.Count9 += 1
|
|
|
|
|
res.Amount9 = res.Amount9.Add(v.Income)
|
|
|
|
|
}
|
|
|
|
|
res.Total = res.Total.Add(v.Income)
|
|
|
|
|
}
|
|
|
|
|