作者 陈志颖

fix:修复业绩分红预算信息产品金额错误

@@ -27,7 +27,6 @@ type ListDividendsIncentivesEstimateQuery struct { @@ -27,7 +27,6 @@ type ListDividendsIncentivesEstimateQuery struct {
27 } 27 }
28 28
29 func (listDividendsIncentivesEstimateQuery *ListDividendsIncentivesEstimateQuery) Valid(validation *validation.Validation) { 29 func (listDividendsIncentivesEstimateQuery *ListDividendsIncentivesEstimateQuery) Valid(validation *validation.Validation) {
30 - //validation.SetError("CustomValid", "未实现的自定义认证")  
31 } 30 }
32 31
33 func (listDividendsIncentivesEstimateQuery *ListDividendsIncentivesEstimateQuery) ValidateQuery() error { 32 func (listDividendsIncentivesEstimateQuery *ListDividendsIncentivesEstimateQuery) ValidateQuery() error {
@@ -1191,7 +1191,11 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsIncenti @@ -1191,7 +1191,11 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsIncenti
1191 } 1191 }
1192 dividendsIncentivesEstimateDtos = append(dividendsIncentivesEstimateDtos, dividendsIncentivesEstimateDto) 1192 dividendsIncentivesEstimateDtos = append(dividendsIncentivesEstimateDtos, dividendsIncentivesEstimateDto)
1193 } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单 1193 } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单
1194 - dividendsReturnedOrder, err := dividendsReturnedOrderRepository.FindOne(map[string]interface{}{"dividendsReturnedOrderNumber": orderGood.DividendsReturnedOrderNumber}) 1194 + dividendsReturnedOrder, err := dividendsReturnedOrderRepository.FindOne(map[string]interface{}{
  1195 + "dividendsReturnedOrderNumber": orderGood.DividendsReturnedOrderNumber,
  1196 + "companyId": orderGood.CompanyId,
  1197 + "orgId": orderGood.OrgId,
  1198 + })
1195 if err != nil { 1199 if err != nil {
1196 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 1200 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
1197 } 1201 }