diff --git a/app/customer/svc/order/svc_central_kitchen_for_school_order.go b/app/customer/svc/order/svc_central_kitchen_for_school_order.go index c4706e2..f2a6390 100644 --- a/app/customer/svc/order/svc_central_kitchen_for_school_order.go +++ b/app/customer/svc/order/svc_central_kitchen_for_school_order.go @@ -184,7 +184,7 @@ func CentralKitchenForSchoolMyReserve(userIdentityId int, date, startDate, endDa } dateMap[v.Date].Date = v.Date total++ - if v.Kind == enum.CentralKitchenForSchoolUserWithDayKindForBreakfast { + if v.Kind == enum.CentralKitchenForSchoolUserWithDayKindForBreakfast && v.State == enum.CentralKitchenForSchoolUserWithDayStateForWait { dateMap[v.Date].BreakfastOrdNoList = append(dateMap[v.Date].BreakfastOrdNoList, struct { OutTradeNo string `json:"out_trade_no" label:"业务订单号"` Id int `json:"id" label:"就餐记录id"` @@ -192,7 +192,7 @@ func CentralKitchenForSchoolMyReserve(userIdentityId int, date, startDate, endDa totalBreakfast++ dateMap[v.Date].BreakfastTotal++ } - if v.Kind == enum.CentralKitchenForSchoolUserWithDayKindForLunch { + if v.Kind == enum.CentralKitchenForSchoolUserWithDayKindForLunch && v.State == enum.CentralKitchenForSchoolUserWithDayStateForWait { dateMap[v.Date].LunchOrdNoList = append(dateMap[v.Date].BreakfastOrdNoList, struct { OutTradeNo string `json:"out_trade_no" label:"业务订单号"` Id int `json:"id" label:"就餐记录id"` @@ -200,7 +200,7 @@ func CentralKitchenForSchoolMyReserve(userIdentityId int, date, startDate, endDa totalLunch++ dateMap[v.Date].LunchTotal++ } - if v.Kind == enum.CentralKitchenForSchoolUserWithDayKindForDinner { + if v.Kind == enum.CentralKitchenForSchoolUserWithDayKindForDinner && v.State == enum.CentralKitchenForSchoolUserWithDayStateForWait { dateMap[v.Date].DinnerOrdNoList = append(dateMap[v.Date].BreakfastOrdNoList, struct { OutTradeNo string `json:"out_trade_no" label:"业务订单号"` Id int `json:"id" label:"就餐记录id"`