diff --git a/app/admin/svc/order/svc_central_kitchen_for_school_order.go b/app/admin/svc/order/svc_central_kitchen_for_school_order.go index 33a3208..99de045 100644 --- a/app/admin/svc/order/svc_central_kitchen_for_school_order.go +++ b/app/admin/svc/order/svc_central_kitchen_for_school_order.go @@ -20,10 +20,10 @@ func CentralKitchenForSchoolOrderRefundList(req md.CentralKitchenForSchoolOrderR sess.And("enterprise.id =?", req.EnterpriseId) } if req.Phone != "" { - sess.And("user.phone like ?", "%"+req.Name+"%") + sess.And("user.phone like ?", "%"+req.Phone+"%") } if req.Name != "" { - sess.And("user_identity.name like ?", "%"+req.Phone+"%") + sess.And("user_identity.name like ?", "%"+req.Name+"%") } if req.Kind != 0 { sess.And("central_kitchen_for_school_user_with_day.kind = ?", req.Kind) diff --git a/app/router/admin_router.go b/app/router/admin_router.go index 4e9cd38..fe8578c 100644 --- a/app/router/admin_router.go +++ b/app/router/admin_router.go @@ -224,22 +224,22 @@ func rEnterpriseManage(r *gin.RouterGroup) { //r.POST("/selfSupportForSchool/statisticsList", hdl2.SelfSupportForSchoolDataStatisticsList) //"自营-学校-数据统计"-列表 //r.DELETE("/selfSupportForSchool/statisticsDelete/:id", hdl2.SelfSupportForSchoolDataStatisticsDelete) //"自营-学校-数据统计"-删除 - r.POST("/nursingHome/userUpdate", hdl.NursingHomeUserUpdate) //"养老院"用户编辑 - r.POST("/nursingHome/userDelete", hdl.NursingHomeUserDelete) //"养老院"用户删除 - r.POST("/nursingHome/ordList", hdl.NursingHomeOrdList) //"养老院"订单列表 - r.GET("/nursingHome/ordDetail", hdl.NursingHomeOrdDetail) //"养老院"订单详情 - r.POST("/nursingHome/ordRefund", hdl.NursingHomeOrdRefund) //"养老院"订单退款 - r.POST("/nursingHome/reserveList", hdl.NursingHomeReserveList) //"养老院"预定列表 - r.GET("/nursingHome/reserveDetail", hdl.NursingHomeReserveDetail) //"养老院"预定详情 - r.POST("/nursingHome/orderRefundList", hdl2.CentralKitchenForSchoolOrderRefundList) //"养老院"订单退款列表 - r.POST("/setBasicNursingHome", hdl.SetBasicNursingHome) //"养老院"设置基础设置 - r.GET("/getBasicNursingHome", hdl.GetBasicNursingHome) //"养老院"获取基础设置 - r.POST("/setNursingHomeWithSpec", hdl.SetNursingHomeWithSpec) //设置"养老院-规格" - r.GET("/getNursingHomeWithSpec", hdl.GetNursingHomeWithSpec) //获取"养老院-规格" - r.POST("/listNursingHomePackage", hdl.ListNursingHomePackage) //"养老院-套餐" 列表 - r.GET("/detailNursingHomePackage", hdl.DetailNursingHomePackage) //"养老院-套餐" 详情 - r.POST("/saveNursingHomePackage", hdl.SaveNursingHomePackage) //新增/编辑 "养老院-套餐" - r.DELETE("/deleteNursingHomePackage/:id", hdl.DeleteNursingHomePackage) //删除 "养老院-套餐" + r.POST("/nursingHome/userUpdate", hdl.NursingHomeUserUpdate) //"养老院"用户编辑 + r.POST("/nursingHome/userDelete", hdl.NursingHomeUserDelete) //"养老院"用户删除 + r.POST("/nursingHome/ordList", hdl.NursingHomeOrdList) //"养老院"订单列表 + r.GET("/nursingHome/ordDetail", hdl.NursingHomeOrdDetail) //"养老院"订单详情 + r.POST("/nursingHome/ordRefund", hdl.NursingHomeOrdRefund) //"养老院"订单退款 + r.POST("/nursingHome/reserveList", hdl.NursingHomeReserveList) //"养老院"预定列表 + r.GET("/nursingHome/reserveDetail", hdl.NursingHomeReserveDetail) //"养老院"预定详情 + r.POST("/nursingHome/orderRefundList", hdl2.NursingHomeOrderRefundList) //"养老院"订单退款列表 + r.POST("/setBasicNursingHome", hdl.SetBasicNursingHome) //"养老院"设置基础设置 + r.GET("/getBasicNursingHome", hdl.GetBasicNursingHome) //"养老院"获取基础设置 + r.POST("/setNursingHomeWithSpec", hdl.SetNursingHomeWithSpec) //设置"养老院-规格" + r.GET("/getNursingHomeWithSpec", hdl.GetNursingHomeWithSpec) //获取"养老院-规格" + r.POST("/listNursingHomePackage", hdl.ListNursingHomePackage) //"养老院-套餐" 列表 + r.GET("/detailNursingHomePackage", hdl.DetailNursingHomePackage) //"养老院-套餐" 详情 + r.POST("/saveNursingHomePackage", hdl.SaveNursingHomePackage) //新增/编辑 "养老院-套餐" + r.DELETE("/deleteNursingHomePackage/:id", hdl.DeleteNursingHomePackage) //删除 "养老院-套餐" //r.POST("/nursingHome/statisticsExport", hdl2.NursingHomeDataStatisticsExport) //"养老院-数据统计"-导出 //r.POST("/nursingHome/statisticsList", hdl2.NursingHomeDataStatisticsList) //"养老院-数据统计"-列表 //r.DELETE("/nursingHome/statisticsDelete/:id", hdl2.NursingHomeDataStatisticsDelete) //"养老院-数据统计"-删除