DengBiao
1 year ago
1 changed files with 3 additions and 3 deletions
Unified View
Diff Options
+ 3
- 3
app/customer/svc/order/svc_central_kitchen_for_school_order.go
View File
| @@ -184,7 +184,7 @@ func CentralKitchenForSchoolMyReserve(userIdentityId int, date, startDate, endDa | |||||
| } | } | ||||
| dateMap[v.Date].Date = v.Date | dateMap[v.Date].Date = v.Date | ||||
| total++ | 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 { | dateMap[v.Date].BreakfastOrdNoList = append(dateMap[v.Date].BreakfastOrdNoList, struct { | ||||
| OutTradeNo string `json:"out_trade_no" label:"业务订单号"` | OutTradeNo string `json:"out_trade_no" label:"业务订单号"` | ||||
| Id int `json:"id" label:"就餐记录id"` | Id int `json:"id" label:"就餐记录id"` | ||||
| @@ -192,7 +192,7 @@ func CentralKitchenForSchoolMyReserve(userIdentityId int, date, startDate, endDa | |||||
| totalBreakfast++ | totalBreakfast++ | ||||
| dateMap[v.Date].BreakfastTotal++ | 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 { | dateMap[v.Date].LunchOrdNoList = append(dateMap[v.Date].BreakfastOrdNoList, struct { | ||||
| OutTradeNo string `json:"out_trade_no" label:"业务订单号"` | OutTradeNo string `json:"out_trade_no" label:"业务订单号"` | ||||
| Id int `json:"id" label:"就餐记录id"` | Id int `json:"id" label:"就餐记录id"` | ||||
| @@ -200,7 +200,7 @@ func CentralKitchenForSchoolMyReserve(userIdentityId int, date, startDate, endDa | |||||
| totalLunch++ | totalLunch++ | ||||
| dateMap[v.Date].LunchTotal++ | 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 { | dateMap[v.Date].DinnerOrdNoList = append(dateMap[v.Date].BreakfastOrdNoList, struct { | ||||
| OutTradeNo string `json:"out_trade_no" label:"业务订单号"` | OutTradeNo string `json:"out_trade_no" label:"业务订单号"` | ||||
| Id int `json:"id" label:"就餐记录id"` | Id int `json:"id" label:"就餐记录id"` | ||||