|
@@ -939,7 +939,7 @@ func CentralKitchenForSchoolBatchAskForLeaveBySchool(req md.CentralKitchenForSch |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIds = append(identityIds, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIds = append(identityIds, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIds) <= 0 { |
|
|
if len(identityIds) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -961,6 +961,9 @@ func CentralKitchenForSchoolBatchAskForLeaveBySchool(req md.CentralKitchenForSch |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
@@ -1009,7 +1012,7 @@ func CentralKitchenForSchoolBatchAskForLeaveBySchool(req md.CentralKitchenForSch |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIds = append(identityIds, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIds = append(identityIds, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIds) <= 0 { |
|
|
if len(identityIds) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -1031,6 +1034,9 @@ func CentralKitchenForSchoolBatchAskForLeaveBySchool(req md.CentralKitchenForSch |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
@@ -1082,7 +1088,7 @@ func CentralKitchenForSchoolBatchAskForLeaveBySchool(req md.CentralKitchenForSch |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIds = append(identityIds, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIds = append(identityIds, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIds) <= 0 { |
|
|
if len(identityIds) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -1104,6 +1110,9 @@ func CentralKitchenForSchoolBatchAskForLeaveBySchool(req md.CentralKitchenForSch |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
@@ -1199,7 +1208,7 @@ func CentralKitchenForSchoolBatchAskForLeaveByGrade(req md.CentralKitchenForScho |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIdsV2) <= 0 { |
|
|
if len(identityIdsV2) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -1221,6 +1230,9 @@ func CentralKitchenForSchoolBatchAskForLeaveByGrade(req md.CentralKitchenForScho |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
@@ -1268,7 +1280,7 @@ func CentralKitchenForSchoolBatchAskForLeaveByGrade(req md.CentralKitchenForScho |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIdsV2) <= 0 { |
|
|
if len(identityIdsV2) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -1290,6 +1302,9 @@ func CentralKitchenForSchoolBatchAskForLeaveByGrade(req md.CentralKitchenForScho |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
@@ -1337,7 +1352,7 @@ func CentralKitchenForSchoolBatchAskForLeaveByGrade(req md.CentralKitchenForScho |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIdsV2) <= 0 { |
|
|
if len(identityIdsV2) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -1359,6 +1374,9 @@ func CentralKitchenForSchoolBatchAskForLeaveByGrade(req md.CentralKitchenForScho |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
@@ -1444,7 +1462,7 @@ func CentralKitchenForSchoolBatchAskForLeaveByClass(req md.CentralKitchenForScho |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIdsV2) <= 0 { |
|
|
if len(identityIdsV2) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -1466,6 +1484,9 @@ func CentralKitchenForSchoolBatchAskForLeaveByClass(req md.CentralKitchenForScho |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
@@ -1513,7 +1534,7 @@ func CentralKitchenForSchoolBatchAskForLeaveByClass(req md.CentralKitchenForScho |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIdsV2) <= 0 { |
|
|
if len(identityIdsV2) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -1535,6 +1556,9 @@ func CentralKitchenForSchoolBatchAskForLeaveByClass(req md.CentralKitchenForScho |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
@@ -1582,7 +1606,7 @@ func CentralKitchenForSchoolBatchAskForLeaveByClass(req md.CentralKitchenForScho |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
continue |
|
|
continue |
|
|
} |
|
|
} |
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.Id)) |
|
|
|
|
|
|
|
|
identityIdsV2 = append(identityIdsV2, utils.IntToStr(m.IdentityId)) |
|
|
} |
|
|
} |
|
|
if len(identityIdsV2) <= 0 { |
|
|
if len(identityIdsV2) <= 0 { |
|
|
//无请假学生 |
|
|
//无请假学生 |
|
@@ -1604,6 +1628,9 @@ func CentralKitchenForSchoolBatchAskForLeaveByClass(req md.CentralKitchenForScho |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
var centralKitchenForSchoolUserRefundDays []*model.CentralKitchenForSchoolUserRefundDay |
|
|
now := time.Now() |
|
|
now := time.Now() |
|
|
for _, m := range mm { |
|
|
for _, m := range mm { |
|
|
|
|
|
if m.State != enum2.CentralKitchenForSchoolUserWithDayStateForWait { |
|
|
|
|
|
continue |
|
|
|
|
|
} |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
dealOutTradeNo[m.OrdNo] = m.OrdNo |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
//outRequestNo := utils.OrderUUID(m.Uid) |
|
|
outRequestNo := "" |
|
|
outRequestNo := "" |
|
|