update

app/admin/svc/enterprise_manage/svc_central_kitchen_for_school.go

@@ -966,17 +966,17 @@ func CentralKitchenForSchoolReserveList(req md.CentralKitchenForSchoolReserveLis
 		}
 	}
 
-	var centralKitchenForSchoolUserWithDayIds []string
-	if req.StartDate != "" && req.EndDate != "" {
-		var m []model.CentralKitchenForSchoolUserWithDay
-		if err1 := db.Db.Where("state != ?", enum2.CentralKitchenForSchoolUserWithDayStateForCancel).
-			And("date >= ? And date <= ?", req.StartDate, req.EndDate).Asc("date").Find(&m); err != nil {
-			return nil, 0, err1
-		}
-		for _, v := range m {
-			centralKitchenForSchoolUserWithDayIds = append(centralKitchenForSchoolUserWithDayIds, v.OrdNo)
-		}
-	}
+	//var centralKitchenForSchoolUserWithDayIds []string
+	//if req.StartDate != "" && req.EndDate != "" {
+	//	var m []model.CentralKitchenForSchoolUserWithDay
+	//	if err1 := db.Db.Where("state != ?", enum2.CentralKitchenForSchoolUserWithDayStateForCancel).
+	//		And("date >= ? And date <= ?", req.StartDate, req.EndDate).Asc("date").Find(&m); err != nil {
+	//		return nil, 0, err1
+	//	}
+	//	for _, v := range m {
+	//		centralKitchenForSchoolUserWithDayIds = append(centralKitchenForSchoolUserWithDayIds, v.OrdNo)
+	//	}
+	//}
 
 	var months []time.Month
 	if req.StartDate != "" {
@@ -1031,9 +1031,9 @@ func CentralKitchenForSchoolReserveList(req md.CentralKitchenForSchoolReserveLis
 	if len(classWithUserIdentityIdsTwo) > 0 {
 		sess.In("user_identity.id", classWithUserIdentityIdsTwo)
 	}
-	if len(centralKitchenForSchoolUserWithDayIds) > 0 {
-		sess.In("central_kitchen_for_school_package_ord.out_trade_no", centralKitchenForSchoolUserWithDayIds)
-	}
+	//if len(centralKitchenForSchoolUserWithDayIds) > 0 {
+	//	sess.In("central_kitchen_for_school_package_ord.out_trade_no", centralKitchenForSchoolUserWithDayIds)
+	//}
 	if len(months) > 0 {
 		sess.In("central_kitchen_for_school_package_ord_for_reserve.reserve_month", months)
 	}