allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 e10866ba93035eaf784ad52acfac0753e59a86e0 1 个父辈 1de34fcf

refactor:优化批量删除分红订单

内嵌 并排对比
正在显示 1 个修改的文件 包含 28 行增加 和 24 行删除
... ... @@ -1161,14 +1161,14 @@ func (dividendsOrderService *DividendsOrderService) BatchRemoveDividendsOrder(ba
}
// 分红预算单仓储初始化
var dividendsEstimateRepository domain.DividendsEstimateRepository
if value, err := factory.CreateDividendsEstimateRepository(map[string]interface{}{
"transactionContext": transactionContext,
}); err != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
} else {
dividendsEstimateRepository = value
}
//var dividendsEstimateRepository domain.DividendsEstimateRepository
//if value, err := factory.CreateDividendsEstimateRepository(map[string]interface{}{
// "transactionContext": transactionContext,
//}); err != nil {
// return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
//} else {
// dividendsEstimateRepository = value
//}
// 分红预算单DAO初始化
//var dividendsEstimateDao *dao.DividendsEstimateDao
... ... @@ -1234,22 +1234,22 @@ func (dividendsOrderService *DividendsOrderService) BatchRemoveDividendsOrder(ba
//fmt.Println("退货单计数：", time.Since(startCount))
// 校验分红订单是否有分红预算
startEstimateCount := time.Now()
if countRelative, _, err2 := dividendsEstimateRepository.Find(map[string]interface{}{
"companyId": dividendsOrder.Company.CompanyId,
"orgId": dividendsOrder.Org.OrgId,
"orderOrReturnedOrderNum": dividendsOrder.DividendsOrderNumber,
"limit": 1,
"offset": 0,
"isCanceled": false,
}); err2 != nil {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err2.Error())
} else {
if countRelative > 0 {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, fmt.Sprintf("分红订单%s有关联的预算单，不可删除", dividendsOrder.DividendsOrderNumber))
}
}
fmt.Println("预算单计数：", time.Since(startEstimateCount))
//startEstimateCount := time.Now()
//if countRelative, _, err2 := dividendsEstimateRepository.Find(map[string]interface{}{
// "companyId": dividendsOrder.Company.CompanyId,
// "orgId": dividendsOrder.Org.OrgId,
// "orderOrReturnedOrderNum": dividendsOrder.DividendsOrderNumber,
// "limit": 1,
// "offset": 0,
// "isCanceled": false,
//}); err2 != nil {
// return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err2.Error())
//} else {
// if countRelative > 0 {
// return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, fmt.Sprintf("分红订单%s有关联的预算单，不可删除", dividendsOrder.DividendsOrderNumber))
// }
//}
//fmt.Println("预算单计数：", time.Since(startEstimateCount))
//startEstimateCount := time.Now()
//if estimateOrderExist, err3 := dividendsEstimateDao.CheckDividendsEstimateOrderExist(map[string]interface{}{
... ... @@ -1265,6 +1265,10 @@ func (dividendsOrderService *DividendsOrderService) BatchRemoveDividendsOrder(ba
// }
//}
//fmt.Println("预算单计数：", time.Since(startEstimateCount))
if dividendsOrder.DividendStatus != 1 {
return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, fmt.Sprintf("分红订单%s有关联的预算单，不可删除", dividendsOrder.DividendsOrderNumber))
}
}
fmt.Println("截止目前耗时2：", time.Since(start))
... ...