update

app/admin/svc/enterprise_manage/svc_central_kitchen_for_school.go

@@ -852,23 +852,26 @@ func CentralKitchenForSchoolReserveList(req md.CentralKitchenForSchoolReserveLis
 			if count2 > 0 {
 				state = 3
 				stateZh = "部分退款"
-
-				count3, err3 := centralKitchenForSchoolUserWithDayDb.CountCentralKitchenForSchoolUserWithDayByOrdNoV2(v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo, enum2.CentralKitchenForSchoolUserWithDayStateForWait,
-					v.CentralKitchenForSchoolPackageOrdForReserve.MealTimeStart, v.CentralKitchenForSchoolPackageOrdForReserve.MealTimeEnd, v.CentralKitchenForSchoolPackageOrdForReserve.Kind)
-				if err1 != nil {
-					return nil, 0, err3
-				}
-				if count3 == 0 {
-					count4, err4 := centralKitchenForSchoolUserWithDayDb.CountCentralKitchenForSchoolUserWithDayByOrdNoV2(v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo, enum2.CentralKitchenForSchoolUserWithDayStateForAlready,
-						v.CentralKitchenForSchoolPackageOrdForReserve.MealTimeStart, v.CentralKitchenForSchoolPackageOrdForReserve.MealTimeEnd, v.CentralKitchenForSchoolPackageOrdForReserve.Kind)
-					if err1 != nil {
-						return nil, 0, err4
-					}
-					if count4 == 0 {
-						state = 4
-						stateZh = "已退款"
-					}
+				if count2 >= 30 {
+					state = 4
+					stateZh = "已退款"
 				}
+				//count3, err3 := centralKitchenForSchoolUserWithDayDb.CountCentralKitchenForSchoolUserWithDayByOrdNoV2(v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo, enum2.CentralKitchenForSchoolUserWithDayStateForWait,
+				//	v.CentralKitchenForSchoolPackageOrdForReserve.MealTimeStart, v.CentralKitchenForSchoolPackageOrdForReserve.MealTimeEnd, v.CentralKitchenForSchoolPackageOrdForReserve.Kind)
+				//if err1 != nil {
+				//	return nil, 0, err3
+				//}
+				//if count3 == 0 {
+				//	count4, err4 := centralKitchenForSchoolUserWithDayDb.CountCentralKitchenForSchoolUserWithDayByOrdNoV2(v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo, enum2.CentralKitchenForSchoolUserWithDayStateForAlready,
+				//		v.CentralKitchenForSchoolPackageOrdForReserve.MealTimeStart, v.CentralKitchenForSchoolPackageOrdForReserve.MealTimeEnd, v.CentralKitchenForSchoolPackageOrdForReserve.Kind)
+				//	if err1 != nil {
+				//		return nil, 0, err4
+				//	}
+				//	if count4 == 0 {
+				//		state = 4
+				//		stateZh = "已退款"
+				//	}
+				//}
 			}
 		}