作者 陈志颖

fix:修复分红预算信息列表无退货单问题

@@ -1288,8 +1288,8 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsIncenti @@ -1288,8 +1288,8 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsIncenti
1288 } else { 1288 } else {
1289 var dividendsIncentivesEstimateDtos []*dto.DividendsIncentivesEstimateDto 1289 var dividendsIncentivesEstimateDtos []*dto.DividendsIncentivesEstimateDto
1290 for _, orderGood := range orderGoods { 1290 for _, orderGood := range orderGoods {
1291 - dividendsIncentivesEstimateDto := &dto.DividendsIncentivesEstimateDto{}  
1292 if orderGood.DividendsOrderNumber != "" { // 查询分红订单 1291 if orderGood.DividendsOrderNumber != "" { // 查询分红订单
  1292 + dividendsIncentivesEstimateDto := &dto.DividendsIncentivesEstimateDto{}
1293 dividendsOrder, err := dividendsOrderRepository.FindOne(map[string]interface{}{ 1293 dividendsOrder, err := dividendsOrderRepository.FindOne(map[string]interface{}{
1294 "dividendsOrderNumber": orderGood.DividendsOrderNumber, 1294 "dividendsOrderNumber": orderGood.DividendsOrderNumber,
1295 "companyId": searchDividendsIncentivesEstimateQuery.CompanyId, 1295 "companyId": searchDividendsIncentivesEstimateQuery.CompanyId,
@@ -1308,6 +1308,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsIncenti @@ -1308,6 +1308,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsIncenti
1308 } 1308 }
1309 dividendsIncentivesEstimateDtos = append(dividendsIncentivesEstimateDtos, dividendsIncentivesEstimateDto) 1309 dividendsIncentivesEstimateDtos = append(dividendsIncentivesEstimateDtos, dividendsIncentivesEstimateDto)
1310 } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单 1310 } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单
  1311 + dividendsIncentivesEstimateDto := &dto.DividendsIncentivesEstimateDto{}
1311 dividendsReturnedOrder, err := dividendsReturnedOrderRepository.FindOne(map[string]interface{}{ 1312 dividendsReturnedOrder, err := dividendsReturnedOrderRepository.FindOne(map[string]interface{}{
1312 "dividendsReturnedOrderNumber": orderGood.DividendsReturnedOrderNumber, 1313 "dividendsReturnedOrderNumber": orderGood.DividendsReturnedOrderNumber,
1313 "companyId": searchDividendsIncentivesEstimateQuery.CompanyId, 1314 "companyId": searchDividendsIncentivesEstimateQuery.CompanyId,
@@ -7,19 +7,20 @@ import ( @@ -7,19 +7,20 @@ import (
7 7
8 func TransformToOrderGoodDomainModelFromPgModels(orderGoodModel *models.OrderGood) (*domain.OrderGood, error) { 8 func TransformToOrderGoodDomainModelFromPgModels(orderGoodModel *models.OrderGood) (*domain.OrderGood, error) {
9 return &domain.OrderGood{ 9 return &domain.OrderGood{
10 - OrderGoodId: orderGoodModel.OrderGoodId,  
11 - OrderGoodAmount: orderGoodModel.OrderGoodAmount,  
12 - OrderGoodName: orderGoodModel.OrderGoodName,  
13 - OrderGoodPrice: orderGoodModel.OrderGoodPrice,  
14 - OrderGoodQuantity: orderGoodModel.OrderGoodQuantity,  
15 - DividendsOrderNumber: orderGoodModel.DividendsOrderNumber,  
16 - CooperationContractNumber: orderGoodModel.CooperationContractNumber,  
17 - OrderGoodExpense: orderGoodModel.OrderGoodExpense,  
18 - OrderGoodDividendsStatus: orderGoodModel.OrderGoodDividendsStatus,  
19 - OrgId: orderGoodModel.OrgId,  
20 - CompanyId: orderGoodModel.CompanyId,  
21 - CreatedAt: orderGoodModel.CreatedAt,  
22 - DeletedAt: orderGoodModel.DeletedAt,  
23 - UpdatedAt: orderGoodModel.UpdatedAt, 10 + OrderGoodId: orderGoodModel.OrderGoodId,
  11 + OrderGoodAmount: orderGoodModel.OrderGoodAmount,
  12 + OrderGoodName: orderGoodModel.OrderGoodName,
  13 + OrderGoodPrice: orderGoodModel.OrderGoodPrice,
  14 + OrderGoodQuantity: orderGoodModel.OrderGoodQuantity,
  15 + DividendsOrderNumber: orderGoodModel.DividendsOrderNumber,
  16 + DividendsReturnedOrderNumber: orderGoodModel.DividendsReturnedOrderNumber,
  17 + CooperationContractNumber: orderGoodModel.CooperationContractNumber,
  18 + OrderGoodExpense: orderGoodModel.OrderGoodExpense,
  19 + OrderGoodDividendsStatus: orderGoodModel.OrderGoodDividendsStatus,
  20 + OrgId: orderGoodModel.OrgId,
  21 + CompanyId: orderGoodModel.CompanyId,
  22 + CreatedAt: orderGoodModel.CreatedAt,
  23 + DeletedAt: orderGoodModel.DeletedAt,
  24 + UpdatedAt: orderGoodModel.UpdatedAt,
24 }, nil 25 }, nil
25 } 26 }