作者 陈志颖

fix:产品查询

@@ -336,7 +336,7 @@ func (repository *DividendsOrderRepository) Remove(dividendsOrder *domain.Divide @@ -336,7 +336,7 @@ func (repository *DividendsOrderRepository) Remove(dividendsOrder *domain.Divide
336 var orderGoodModels []*models.OrderGood 336 var orderGoodModels []*models.OrderGood
337 if _, err := tx.Model(&orderGoodModels). 337 if _, err := tx.Model(&orderGoodModels).
338 Where("company_id = ?", dividendsOrderModel.Company.CompanyId). 338 Where("company_id = ?", dividendsOrderModel.Company.CompanyId).
339 - Where("org_id' = ?", dividendsOrderModel.Org.OrgId). 339 + Where("org_id = ?", dividendsOrderModel.Org.OrgId).
340 Where("dividends_order_number = ?", dividendsOrder.DividendsOrderNumber).Delete(); err != nil { 340 Where("dividends_order_number = ?", dividendsOrder.DividendsOrderNumber).Delete(); err != nil {
341 return nil, err 341 return nil, err
342 } 342 }
@@ -358,7 +358,10 @@ func (repository *DividendsOrderRepository) BatchRemove(dividendsOrders []*domai @@ -358,7 +358,10 @@ func (repository *DividendsOrderRepository) BatchRemove(dividendsOrders []*domai
358 for _, dividendsOrder := range dividendsOrders { 358 for _, dividendsOrder := range dividendsOrders {
359 // 删除订单产品 359 // 删除订单产品
360 var orderGoodModels []*models.OrderGood 360 var orderGoodModels []*models.OrderGood
361 - if _, err := tx.Model(&orderGoodModels).Where("dividends_order_number = ?", dividendsOrder.DividendsOrderNumber).Delete(); err != nil { 361 + if _, err := tx.Model(&orderGoodModels).
  362 + Where("company_id = ?", dividendsOrder.Company.CompanyId).
  363 + Where("org_id = ?", dividendsOrder.Org.OrgId).
  364 + Where("dividends_order_number = ?", dividendsOrder.DividendsOrderNumber).Delete(); err != nil {
362 return nil, err 365 return nil, err
363 } 366 }
364 } 367 }
@@ -371,7 +374,6 @@ func (repository *DividendsOrderRepository) FindOne(queryOptions map[string]inte @@ -371,7 +374,6 @@ func (repository *DividendsOrderRepository) FindOne(queryOptions map[string]inte
371 dividendsOrderModel := new(models.DividendsOrder) 374 dividendsOrderModel := new(models.DividendsOrder)
372 query := sqlbuilder.BuildQuery(tx.Model(dividendsOrderModel), queryOptions) 375 query := sqlbuilder.BuildQuery(tx.Model(dividendsOrderModel), queryOptions)
373 query.SetWhereByQueryOption("dividends_order.dividends_order_id = ?", "dividendsOrderId") 376 query.SetWhereByQueryOption("dividends_order.dividends_order_id = ?", "dividendsOrderId")
374 - //query.SetWhereByQueryOption("dividends_order.dividends_order_number = ?", "dividendsOrderNumber")  
375 if dividendsOrderNumber, ok := queryOptions["dividendsOrderNumber"]; ok && dividendsOrderNumber != "" { 377 if dividendsOrderNumber, ok := queryOptions["dividendsOrderNumber"]; ok && dividendsOrderNumber != "" {
376 query.Where("dividends_order.dividends_order_number = ?", dividendsOrderNumber) 378 query.Where("dividends_order.dividends_order_number = ?", dividendsOrderNumber)
377 } 379 }
@@ -390,7 +392,7 @@ func (repository *DividendsOrderRepository) FindOne(queryOptions map[string]inte @@ -390,7 +392,7 @@ func (repository *DividendsOrderRepository) FindOne(queryOptions map[string]inte
390 orderGoodModelQuery := tx.Model(&orderGoodModels) 392 orderGoodModelQuery := tx.Model(&orderGoodModels)
391 if err := orderGoodModelQuery. 393 if err := orderGoodModelQuery.
392 Where("company_id = ?", dividendsOrderModel.Company.CompanyId). 394 Where("company_id = ?", dividendsOrderModel.Company.CompanyId).
393 - Where("org_id' = ?", dividendsOrderModel.Org.OrgId). 395 + Where("org_id = ?", dividendsOrderModel.Org.OrgId).
394 Where("dividends_order_number = ?", dividendsOrderModel.DividendsOrderNumber).Select(); err != nil { 396 Where("dividends_order_number = ?", dividendsOrderModel.DividendsOrderNumber).Select(); err != nil {
395 return nil, err 397 return nil, err
396 } 398 }
@@ -441,7 +443,7 @@ func (repository *DividendsOrderRepository) Find(queryOptions map[string]interfa @@ -441,7 +443,7 @@ func (repository *DividendsOrderRepository) Find(queryOptions map[string]interfa
441 orderGoodModelQuery := tx.Model(&orderGoodModels) 443 orderGoodModelQuery := tx.Model(&orderGoodModels)
442 if err := orderGoodModelQuery. 444 if err := orderGoodModelQuery.
443 Where("company_id = ?", dividendsOrderModel.Company.CompanyId). 445 Where("company_id = ?", dividendsOrderModel.Company.CompanyId).
444 - Where("org_id' = ?", dividendsOrderModel.Org.OrgId). 446 + Where("org_id = ?", dividendsOrderModel.Org.OrgId).
445 Where("dividends_order_number = ?", dividendsOrderModel.DividendsOrderNumber). 447 Where("dividends_order_number = ?", dividendsOrderModel.DividendsOrderNumber).
446 Select(); err != nil { 448 Select(); err != nil {
447 return 0, nil, err 449 return 0, nil, err