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

转到一个项目

作者 陈志颖
提交 0d7c8268d8c2aba3a1acb2abfb318f8247677063 1 个父辈 146bb5f4

fix:重复取消分红预算单

内嵌 并排对比
正在显示 1 个修改的文件 包含 10 行增加 和 0 行删除
@@ -231,6 +231,11 @@ func (dividendsEstimateService *DividendsEstimateService) CancelDividendsEstimat @@ -231,6 +231,11 @@ func (dividendsEstimateService *DividendsEstimateService) CancelDividendsEstimat
231 return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(cancelDividendsEstimateCommand.DividendsEstimateId, 10))) 231 return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", strconv.FormatInt(cancelDividendsEstimateCommand.DividendsEstimateId, 10)))
232 } 232 }
233 233
  234 + // 校验重复取消
  235 + if dividendsEstimate.IsCanceled {
  236 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已取消的分红单不能重复取消")
  237 + }
  238 +
234 // 校验是否能够取消 239 // 校验是否能够取消
235 if dividendsEstimate.DividendsType == domain.ORDER_DIVIDENDS || dividendsEstimate.DividendsType == domain.RETURN_WRITE_OFF { // 订单分红、退货冲销 240 if dividendsEstimate.DividendsType == domain.ORDER_DIVIDENDS || dividendsEstimate.DividendsType == domain.RETURN_WRITE_OFF { // 订单分红、退货冲销
236 if count, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{"orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum}); err2 != nil { 241 if count, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{"orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum}); err2 != nil {
@@ -336,6 +341,11 @@ func (dividendsEstimateService *DividendsEstimateService) BatchCancelDividendsEs @@ -336,6 +341,11 @@ func (dividendsEstimateService *DividendsEstimateService) BatchCancelDividendsEs
336 if count > 0 { 341 if count > 0 {
337 // 校验分红预算是否可以取消，已有相关分红预算单已结算，无法取消 342 // 校验分红预算是否可以取消，已有相关分红预算单已结算，无法取消
338 for _, dividendsEstimate := range dividendsEstimates { 343 for _, dividendsEstimate := range dividendsEstimates {
  344 + // 校验重复取消
  345 + if dividendsEstimate.IsCanceled {
  346 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已取消的分红单不能重复取消")
  347 + }
  348 +
339 // 校验是否能够取消 349 // 校验是否能够取消
340 if dividendsEstimate.DividendsType == domain.ORDER_DIVIDENDS || dividendsEstimate.DividendsType == domain.RETURN_WRITE_OFF { // 订单分红、退货冲销 350 if dividendsEstimate.DividendsType == domain.ORDER_DIVIDENDS || dividendsEstimate.DividendsType == domain.RETURN_WRITE_OFF { // 订单分红、退货冲销
341 if count, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{"orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum}); err2 != nil { 351 if count, dividendsEstimatesRelative, err2 := dividendsEstimateRepository.Find(map[string]interface{}{"orderOrReturnedOrderNum": dividendsEstimate.OrderOrReturnedOrderNum}); err2 != nil {