From f2af4265bb2ad703ffa57a3a6bc339f849e82c3e Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Fri, 16 Feb 2024 18:20:59 +0800 Subject: [PATCH] update --- .../hdl/enterprise_manage/hdl_central_kitchen_for_school.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go b/app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go index c4e68f1..60e4dcb 100644 --- a/app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go +++ b/app/admin/hdl/enterprise_manage/hdl_central_kitchen_for_school.go @@ -1064,8 +1064,9 @@ func CentralKitchenForSchoolReserveDetail(c *gin.Context) { var m []*db.CentralKitchenForSchoolUserWithDayWithCentralKitchenForSchoolUserRefundDay sess := db.Db err = sess.Where("central_kitchen_for_school_user_with_day.ord_no =?", centralKitchenForSchoolPackageOrdForReserve.OutTradeNo). - Where("central_kitchen_for_school_user_with_day.date >=? and central_kitchen_for_school_user_with_day.date <=?", centralKitchenForSchoolPackageOrdForReserve.MealTimeStart, centralKitchenForSchoolPackageOrdForReserve.MealTimeEnd). + And("central_kitchen_for_school_user_with_day.date >=? and central_kitchen_for_school_user_with_day.date <=?", centralKitchenForSchoolPackageOrdForReserve.MealTimeStart, centralKitchenForSchoolPackageOrdForReserve.MealTimeEnd). And("central_kitchen_for_school_user_with_day.kind =?", centralKitchenForSchoolPackageOrdForReserve.Kind). + And("central_kitchen_for_school_user_with_day.identity_id =?", centralKitchenForSchoolPackageOrdForReserve.UserIdentityId). Join("LEFT", "central_kitchen_for_school_user_refund_day", "central_kitchen_for_school_user_with_day.id = central_kitchen_for_school_user_refund_day.records_id"). //Distinct("central_kitchen_for_school_user_with_day.*", "central_kitchen_for_school_user_refund_day.refund_date", "central_kitchen_for_school_user_refund_day.id"). Asc("central_kitchen_for_school_user_with_day.id").