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 f48efe9..b35d833 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 @@ -198,7 +198,7 @@ func CentralKitchenForSchoolMyReserve(userIdentityId int, date, startDate, endDa totalLunch++ dateMap[v.Date].LunchTotal++ if v.State == enum.CentralKitchenForSchoolUserWithDayStateForWait { - dateMap[v.Date].LunchOrdNoList = append(dateMap[v.Date].BreakfastOrdNoList, struct { + dateMap[v.Date].LunchOrdNoList = append(dateMap[v.Date].LunchOrdNoList, struct { OutTradeNo string `json:"out_trade_no" label:"业务订单号"` Id int `json:"id" label:"就餐记录id"` }{OutTradeNo: v.OrdNo, Id: v.Id}) @@ -208,7 +208,7 @@ func CentralKitchenForSchoolMyReserve(userIdentityId int, date, startDate, endDa dateMap[v.Date].DinnerTotal++ totalDinner++ if v.State == enum.CentralKitchenForSchoolUserWithDayStateForWait { - dateMap[v.Date].DinnerOrdNoList = append(dateMap[v.Date].BreakfastOrdNoList, struct { + dateMap[v.Date].DinnerOrdNoList = append(dateMap[v.Date].DinnerOrdNoList, struct { OutTradeNo string `json:"out_trade_no" label:"业务订单号"` Id int `json:"id" label:"就餐记录id"` }{OutTradeNo: v.OrdNo, Id: v.Id}) diff --git a/app/router/customer_router.go b/app/router/customer_router.go index fe068c9..390b8a4 100644 --- a/app/router/customer_router.go +++ b/app/router/customer_router.go @@ -26,7 +26,7 @@ func CustomerInit(r *gin.RouterGroup) { r.GET("/wxGetAccessToken", hdl.WxGetAccessToken) r.POST("/wxDecryptUserInfo", hdl.WxDecryptUserInfo) r.POST("/wxDecryptMobile", hdl.WxDecryptMobile) - r.POST("/wxPay", hdl.WxPay) + r.POST("/wxPay", hdl.Wx) r.POST("/register", hdl.Register) r.POST("/aesDecrypt", hdl.AesDecrypt)