作者 陈志颖

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,
@@ -13,6 +13,7 @@ func TransformToOrderGoodDomainModelFromPgModels(orderGoodModel *models.OrderGoo @@ -13,6 +13,7 @@ func TransformToOrderGoodDomainModelFromPgModels(orderGoodModel *models.OrderGoo
13 OrderGoodPrice: orderGoodModel.OrderGoodPrice, 13 OrderGoodPrice: orderGoodModel.OrderGoodPrice,
14 OrderGoodQuantity: orderGoodModel.OrderGoodQuantity, 14 OrderGoodQuantity: orderGoodModel.OrderGoodQuantity,
15 DividendsOrderNumber: orderGoodModel.DividendsOrderNumber, 15 DividendsOrderNumber: orderGoodModel.DividendsOrderNumber,
  16 + DividendsReturnedOrderNumber: orderGoodModel.DividendsReturnedOrderNumber,
16 CooperationContractNumber: orderGoodModel.CooperationContractNumber, 17 CooperationContractNumber: orderGoodModel.CooperationContractNumber,
17 OrderGoodExpense: orderGoodModel.OrderGoodExpense, 18 OrderGoodExpense: orderGoodModel.OrderGoodExpense,
18 OrderGoodDividendsStatus: orderGoodModel.OrderGoodDividendsStatus, 19 OrderGoodDividendsStatus: orderGoodModel.OrderGoodDividendsStatus,