作者 陈志颖

合并分支 'dev' 到 'test'

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



查看合并请求 !39
... ... @@ -94,6 +94,25 @@ func (domainService *ConfirmDividendsIncentivesEstimateService) Confirm(orderGoo
Reason: "共创合约" + orderGood.CooperationContractNumber + "不存在",
})
continue
} else {
if cooperationContract.Status == 2 {
var orderNumber string
if orderGood.DividendsOrderNumber != "" {
orderNumber = orderGood.DividendsOrderNumber
} else {
orderNumber = orderGood.DividendsReturnedOrderNumber
}
dividendsEstimateDetails = append(dividendsEstimateDetails, &service.DividendsEstimateDetail{
DividendsUser: nil,
DividendsParticipateType: 0,
DividendsStage: 0,
DividendsAmount: 0,
OrderOrReturnedOrderNumber: orderNumber,
IsSuccessfully: false,
Reason: "共创合约" + orderGood.CooperationContractNumber + "已暂停",
})
continue
}
}
// 获取共创项目
... ...