作者 陈志颖

合并分支 'dev' 到 'test'

fix:分红预算单生成增加合约暂停判断



查看合并请求 !39
@@ -94,6 +94,25 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo @@ -94,6 +94,25 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
94 Reason: "共创合约" + orderGood.CooperationContractNumber + "不存在", 94 Reason: "共创合约" + orderGood.CooperationContractNumber + "不存在",
95 }) 95 })
96 continue 96 continue
  97 + } else {
  98 + if cooperationContract.Status == 2 {
  99 + var orderNumber string
  100 + if orderGood.DividendsOrderNumber != "" {
  101 + orderNumber = orderGood.DividendsOrderNumber
  102 + } else {
  103 + orderNumber = orderGood.DividendsReturnedOrderNumber
  104 + }
  105 + dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
  106 + DividendsUser: nil,
  107 + DividendsParticipateType: 0,
  108 + DividendsStage: 0,
  109 + DividendsAmount: 0,
  110 + OrderOrReturnedOrderNumber: orderNumber,
  111 + IsSuccessfully: false,
  112 + Reason: "共创合约" + orderGood.CooperationContractNumber + "已暂停",
  113 + })
  114 + continue
  115 + }
97 } 116 }
98 117
99 // 获取共创项目 118 // 获取共创项目