1

app/admin/svc/svc_data_statisstics.go

@@ -1234,7 +1234,10 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD
 					list[v.Enterprise.Name][v.Grade.Name][v.Class.Name] = make(map[string]int64)
 				}
 
-				for _, vv := range nativeResultsMap[v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo] {
+				for kk, vv := range nativeResultsMap[v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo] {
+					if v.CentralKitchenForSchoolPackageOrdForReserve.Kind != kk {
+						continue
+					}
 					for kkk, vvv := range vv {
 						list[v.Enterprise.Name][v.Grade.Name][v.Class.Name][kkk] = vvv
 					}
@@ -1495,7 +1498,10 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD
 					list[v.Enterprise.Name][v.Grade.Name][v.Class.Name][v.UserIdentity.Name] = make(map[string]int64)
 				}
 
-				for _, vv := range nativeResultsMap[v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo] {
+				for kk, vv := range nativeResultsMap[v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo] {
+					if v.CentralKitchenForSchoolPackageOrdForReserve.Kind != kk {
+						continue
+					}
 					for kkk, vvv := range vv {
 						list[v.Enterprise.Name][v.Grade.Name][v.Class.Name][v.UserIdentity.Name][kkk] = vvv
 					}
@@ -2177,7 +2183,11 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD
 				if list[v.Enterprise.Name] == nil {
 					list[v.Enterprise.Name] = map[string]int64{}
 				}
-				for _, vv := range nativeResultsMap[v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo] {
+				for kk, vv := range nativeResultsMap[v.CentralKitchenForSchoolPackageOrdForReserve.OutTradeNo] {
+					if v.CentralKitchenForSchoolPackageOrdForReserve.Kind != kk {
+						continue
+					}
+
 					for kkk, vvv := range vv {
 						list[v.Enterprise.Name][kkk] += vvv
 						list[v.Enterprise.Name]["count"] += vvv