|
|
|
@ -233,9 +233,10 @@ func (i *incomeLogic) ProfitCard(args EntryDate) (res []Entry) {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
next := now.AddDate(0, 1, 0)
|
|
|
|
|
mysql.Db.Preload("Address").Preload("OrderSku.Sku").
|
|
|
|
|
mysql.Db.Preload("User").Preload("OrderSku.Sku").
|
|
|
|
|
Where("created_at between ? and ?", now, next).
|
|
|
|
|
Where("is_split = 1").
|
|
|
|
|
Where("status in ?", []uint{1, 4}).
|
|
|
|
|
Where("jcook_order_id = 0 or shama_order_id = 0").
|
|
|
|
|
Find(&od, "sharer_id = ? AND sharer_id != user_id", args.UserID)
|
|
|
|
|
for _, v := range od {
|
|
|
|
@ -249,8 +250,8 @@ func (i *incomeLogic) ProfitCard(args EntryDate) (res []Entry) {
|
|
|
|
|
s = "年卡"
|
|
|
|
|
}
|
|
|
|
|
res = append(res, Entry{
|
|
|
|
|
Name: v.Address.ReceiverName,
|
|
|
|
|
Mobile: v.Address.Mobile,
|
|
|
|
|
Name: v.User.Nickname,
|
|
|
|
|
Mobile: v.User.Mobile,
|
|
|
|
|
TypeStr: s,
|
|
|
|
|
Amount: v.ActualTotalAmount,
|
|
|
|
|
})
|
|
|
|
|