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

转到一个项目

作者 陈志颖
提交 4ad331c31962b9701b158b39b7883bfeaaf2278f 1 个父辈 4463b575

fix:多产品分红预算错误

内嵌 并排对比
正在显示 2 个修改的文件 包含 8 行增加 和 11 行删除
@@ -615,7 +615,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -615,7 +615,7 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
615 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 615 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
616 } else { 616 } else {
617 dividendsEstimates := make([]*domain.DividendsEstimate, 0) 617 dividendsEstimates := make([]*domain.DividendsEstimate, 0)
618 - // 统计当前分红预算单数 618 + // 统计当前企业分红预算单数
619 count, err := dividendsEstimateDao.CountDividendsEstimate(map[string]interface{}{ 619 count, err := dividendsEstimateDao.CountDividendsEstimate(map[string]interface{}{
620 "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId, 620 "companyId": confirmDividendsIncentivesEstimateCommand.CompanyId,
621 }) 621 })
@@ -626,8 +626,11 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -626,8 +626,11 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
626 for _, orderGood := range orderGoods { 626 for _, orderGood := range orderGoods {
627 dividendsEstimate := &domain.DividendsEstimate{} 627 dividendsEstimate := &domain.DividendsEstimate{}
628 if orderGood.DividendsOrderNumber != "" { // 查询分红订单 628 if orderGood.DividendsOrderNumber != "" { // 查询分红订单
  629 + // 临时方案
  630 + orderGoodsToConfirm := make([]*domain.OrderGood, 0)
  631 + orderGoodsToConfirm = append(orderGoodsToConfirm, orderGood)
629 // 分红订单产品预算 632 // 分红订单产品预算
630 - if dividendsEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoods); err != nil { 633 + if dividendsEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoodsToConfirm); err != nil {
631 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 634 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
632 } else { 635 } else {
633 for _, dividendsEstimateDetail := range dividendsEstimateDetails { 636 for _, dividendsEstimateDetail := range dividendsEstimateDetails {
@@ -677,8 +680,10 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent @@ -677,8 +680,10 @@ func (dividendsEstimateService *DividendsEstimateService) ConfirmDividendsIncent
677 } 680 }
678 } 681 }
679 } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单 682 } else if orderGood.DividendsReturnedOrderNumber != "" { // 查询分红退货单
  683 + orderGoodsToConfirm := make([]*domain.OrderGood, 0)
  684 + orderGoodsToConfirm = append(orderGoodsToConfirm, orderGood)
680 // 分红退货单产品预算 685 // 分红退货单产品预算
681 - if dividendsReturnedEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoods); err != nil { 686 + if dividendsReturnedEstimateDetails, err := confirmDividendsIncentivesEstimateService.Confirm(orderGoodsToConfirm); err != nil {
682 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error()) 687 return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
683 } else { 688 } else {
684 for _, dividendsReturnedEstimateDetail := range dividendsReturnedEstimateDetails { 689 for _, dividendsReturnedEstimateDetail := range dividendsReturnedEstimateDetails {
@@ -70,7 +70,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -70,7 +70,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
70 Reason: "共创合约错误", 70 Reason: "共创合约错误",
71 }) 71 })
72 continue 72 continue
73 - //return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())  
74 } 73 }
75 if cooperationContract == nil { 74 if cooperationContract == nil {
76 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{ 75 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -83,7 +82,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -83,7 +82,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
83 Reason: "共创合约" + orderGood.CooperationContractNumber + "不存在", 82 Reason: "共创合约" + orderGood.CooperationContractNumber + "不存在",
84 }) 83 })
85 continue 84 continue
86 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("共创合约%s不存在", orderGood.CooperationContractNumber))  
87 } 85 }
88 86
89 // 获取共创项目 87 // 获取共创项目
@@ -117,7 +115,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -117,7 +115,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
117 Reason: "共创项目" + orderGood.CooperationContractNumber + "已结束或不存在", 115 Reason: "共创项目" + orderGood.CooperationContractNumber + "已结束或不存在",
118 }) 116 })
119 continue 117 continue
120 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("共创项目%s不存在", cooperationContract.CooperationProjectNumber))  
121 } 118 }
122 119
123 // 校验合约关联的项目是否已结束 120 // 校验合约关联的项目是否已结束
@@ -153,7 +150,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -153,7 +150,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
153 Reason: "分红订单" + orderGood.DividendsOrderNumber + "查询错误", 150 Reason: "分红订单" + orderGood.DividendsOrderNumber + "查询错误",
154 }) 151 })
155 continue 152 continue
156 - //return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红订单不存在")  
157 } 153 }
158 if dividendsOrder == nil { 154 if dividendsOrder == nil {
159 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{ 155 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -166,7 +162,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -166,7 +162,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
166 Reason: "分红订单" + orderGood.DividendsOrderNumber + "不存在", 162 Reason: "分红订单" + orderGood.DividendsOrderNumber + "不存在",
167 }) 163 })
168 continue 164 continue
169 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("分红订单%s不存在", orderGood.DividendsOrderNumber))  
170 } 165 }
171 166
172 // 匹配分红规则 167 // 匹配分红规则
@@ -189,7 +184,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -189,7 +184,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
189 Reason: "未匹配到分红规则", 184 Reason: "未匹配到分红规则",
190 }) 185 })
191 continue 186 continue
192 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, "未匹配到分红规则")  
193 } 187 }
194 188
195 // 计算分红 189 // 计算分红
@@ -285,7 +279,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -285,7 +279,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
285 Reason: "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在", 279 Reason: "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在",
286 }) 280 })
287 continue 281 continue
288 - //return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "分红退货单不存在")  
289 } 282 }
290 if dividendsReturnedOrder == nil { 283 if dividendsReturnedOrder == nil {
291 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{ 284 dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
@@ -298,7 +291,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -298,7 +291,6 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
298 Reason: "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在", 291 Reason: "退货单" + orderGood.DividendsReturnedOrderNumber + "不存在",
299 }) 292 })
300 continue 293 continue
301 - //return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", orderGood.DividendsReturnedOrderNumber))  
302 } 294 }
303 // 匹配分红规则 295 // 匹配分红规则
304 var dividendsIncentivesRuleMatched *domain.DividendsIncentivesRule 296 var dividendsIncentivesRuleMatched *domain.DividendsIncentivesRule