master
howell 3 years ago
parent 9f1d73d8a8
commit 3407bb971f

@ -550,7 +550,7 @@ func (o logic) ProfitShopList(args ArgsProfitListReq) (res ProfitDetail, err err
query := mysql.Db.Where("type = ?", args.Kind).Where("user_id = ?", args.UserID)
{
if args.Date != "" {
now, e := time.ParseInLocation("2006-01", args.Date, time.Local)
now, e := time.ParseInLocation("200601", args.Date, time.Local)
if e != nil {
err = errors.New("时间格式异常" + e.Error())
return
@ -576,11 +576,17 @@ func (o logic) ProfitShopList(args ArgsProfitListReq) (res ProfitDetail, err err
}
var ods []manage.RecookOrderInfoModel
mysql.Db.Preload("User").Find(&ods, "id in (?)", ids)
dateMap := make(map[string][]manage.RecookOrderInfoModel)
for _, v := range ods {
key := v.CreatedAt.Time.Format("2006")
dateMap[key] = append(dateMap[key], v)
if args.Date == "" {
for _, v := range ods {
key := v.CreatedAt.Time.Format("2006")
dateMap[key] = append(dateMap[key], v)
}
} else {
for _, v := range ods {
key := v.CreatedAt.Time.Format("2006-01-02")
dateMap[key] = append(dateMap[key], v)
}
}
for id, v := range dateMap {

Loading…
Cancel
Save