|
...
|
...
|
@@ -1884,18 +1884,30 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc |
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
//// 判断是否超过平台未兑换现金
|
|
|
|
//if activityUpdated.ExchangedSuMoney > activityFoundExchangedSuMoney {
|
|
|
|
// if (activityUpdated.ExchangedSuMoney - activityFoundExchangedSuMoney) * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
|
|
|
|
// row := []interface{}{
|
|
|
|
// createExchangeCashPersonCommand.PersonName,
|
|
|
|
// createExchangeCashPersonCommand.PersonAccount,
|
|
|
|
// createExchangeCashPersonCommand.ExchangedSuMoney,
|
|
|
|
// "已超过现金池未兑换现金",
|
|
|
|
// }
|
|
|
|
// failureDataList = append(failureDataList, row)
|
|
|
|
// continue
|
|
|
|
// }
|
|
|
|
//}
|
|
|
|
|
|
|
|
// 判断是否超过平台未兑换现金
|
|
|
|
if activityUpdated.ExchangedSuMoney > activityFoundExchangedSuMoney {
|
|
|
|
if (activityUpdated.ExchangedSuMoney - activityFoundExchangedSuMoney) * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
|
|
|
|
row := []interface{}{
|
|
|
|
createExchangeCashPersonCommand.PersonName,
|
|
|
|
createExchangeCashPersonCommand.PersonAccount,
|
|
|
|
createExchangeCashPersonCommand.ExchangedSuMoney,
|
|
|
|
"已超过现金池未兑换现金",
|
|
|
|
}
|
|
|
|
failureDataList = append(failureDataList, row)
|
|
|
|
continue
|
|
|
|
if createExchangeCashPersonCommand.ExchangedSuMoney * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
|
|
|
|
row := []interface{}{
|
|
|
|
createExchangeCashPersonCommand.PersonName,
|
|
|
|
createExchangeCashPersonCommand.PersonAccount,
|
|
|
|
createExchangeCashPersonCommand.ExchangedSuMoney,
|
|
|
|
"已超过现金池未兑换现金",
|
|
|
|
}
|
|
|
|
failureDataList = append(failureDataList, row)
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
// 获取平台素币兑换情况
|
|
...
|
...
|
@@ -2085,18 +2097,31 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc |
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
//// 判断是否超过平台未兑换现金
|
|
|
|
//if activityUpdated.ExchangedSuMoney > activityFoundExchangedSuMoney {
|
|
|
|
// if (activityUpdated.ExchangedSuMoney - activityFoundExchangedSuMoney) * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
|
|
|
|
// row := []interface{}{
|
|
|
|
// createExchangeCashPersonCommand.PersonName,
|
|
|
|
// createExchangeCashPersonCommand.PersonAccount,
|
|
|
|
// createExchangeCashPersonCommand.ExchangedSuMoney,
|
|
|
|
// "已超过现金池未兑换现金",
|
|
|
|
// }
|
|
|
|
// failureDataList = append(failureDataList, row)
|
|
|
|
// continue
|
|
|
|
// }
|
|
|
|
//}
|
|
|
|
|
|
|
|
// 判断是否超过平台未兑换现金
|
|
|
|
if activityUpdated.ExchangedSuMoney > activityFoundExchangedSuMoney {
|
|
|
|
if (activityUpdated.ExchangedSuMoney - activityFoundExchangedSuMoney) * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
|
|
|
|
row := []interface{}{
|
|
|
|
createExchangeCashPersonCommand.PersonName,
|
|
|
|
createExchangeCashPersonCommand.PersonAccount,
|
|
|
|
createExchangeCashPersonCommand.ExchangedSuMoney,
|
|
|
|
"已超过现金池未兑换现金",
|
|
|
|
}
|
|
|
|
failureDataList = append(failureDataList, row)
|
|
|
|
continue
|
|
|
|
if createExchangeCashPersonCommand.ExchangedSuMoney * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
|
|
|
|
row := []interface{}{
|
|
|
|
createExchangeCashPersonCommand.PersonName,
|
|
|
|
createExchangeCashPersonCommand.PersonAccount,
|
|
|
|
createExchangeCashPersonCommand.ExchangedSuMoney,
|
|
|
|
"已超过现金池未兑换现金",
|
|
|
|
}
|
|
|
|
failureDataList = append(failureDataList, row)
|
|
|
|
continue
|
|
|
|
//return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已超过投入现金池的未兑换现金")
|
|
|
|
}
|
|
|
|
|
|
|
|
// 获取平台素币兑换情况
|
...
|
...
|
|
