Migrates AreaEffectSimulation to generated rtiddsgen API
Converts accessor calls to plain member access across aes service and plugin.
This commit is contained in:
102 files changed
+3307
-3313
No files matched your search
+15
-15
@@ -64,10 +64,10 @@ void HandlerChargeAdministration::onChargeAdministrationModifyRequest(const rti:
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onChargeAdministrationModifyRequest: " << request;
|
||||
ChargeAdministrationModifyRequest newRequest = request;
|
||||
if (!newRequest.amountChangedByOperator())
|
||||
newRequest.id() = getObjectChargeAdministrationId(request.partyId(), request.chargeTypeId(), request.effectSourceId());
|
||||
if (!newRequest.amountChangedByOperator)
|
||||
newRequest.id = getObjectChargeAdministrationId(request.partyId, request.chargeTypeId, request.effectSourceId);
|
||||
|
||||
const auto ret = newRequest.id() > 0 ? chargeAdministrationModifyRequest(newRequest) : chargeAdministrationCreateRequest(request);
|
||||
const auto ret = newRequest.id > 0 ? chargeAdministrationModifyRequest(newRequest) : chargeAdministrationCreateRequest(request);
|
||||
if (ret.error())
|
||||
WARNING_LOG(m_logger) << ret();
|
||||
m_mainHandler->dds()->fts()->chargeAdministrationModifyReply(cookie, ret);
|
||||
@@ -77,11 +77,11 @@ Core::FunctionReplyObject HandlerChargeAdministration::chargeAdministrationCreat
|
||||
{
|
||||
Database::AesChargeAdministration newData;
|
||||
|
||||
newData.chargeTypeId = request.chargeTypeId();
|
||||
newData.partyId = request.partyId();
|
||||
newData.effectSourceId = request.effectSourceId();
|
||||
newData.amount = request.amount();
|
||||
newData.amountChangedByOperator = request.amountChangedByOperator();
|
||||
newData.chargeTypeId = request.chargeTypeId;
|
||||
newData.partyId = request.partyId;
|
||||
newData.effectSourceId = request.effectSourceId;
|
||||
newData.amount = request.amount;
|
||||
newData.amountChangedByOperator = request.amountChangedByOperator;
|
||||
|
||||
ObjectChargeAdministration *ifs(new ObjectChargeAdministration(m_mainHandler, this));
|
||||
|
||||
@@ -98,19 +98,19 @@ Core::FunctionReplyObject HandlerChargeAdministration::chargeAdministrationCreat
|
||||
Core::FunctionReplyObject HandlerChargeAdministration::chargeAdministrationModifyRequest(const ChargeAdministrationModifyRequest &request)
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectChargeAdministration *ifs = getObjectFromMap(m_chargeAdminObjMap, request.id(), ret);
|
||||
ObjectChargeAdministration *ifs = getObjectFromMap(m_chargeAdminObjMap, request.id, ret);
|
||||
if (!ifs)
|
||||
return ret;
|
||||
|
||||
Database::AesChargeAdministration newData(ifs->data());
|
||||
newData.id = request.id();
|
||||
newData.chargeTypeId = request.chargeTypeId();
|
||||
newData.partyId = request.partyId();
|
||||
newData.amount = request.amount();
|
||||
newData.amountChangedByOperator = request.amountChangedByOperator();
|
||||
newData.id = request.id;
|
||||
newData.chargeTypeId = request.chargeTypeId;
|
||||
newData.partyId = request.partyId;
|
||||
newData.amount = request.amount;
|
||||
newData.amountChangedByOperator = request.amountChangedByOperator;
|
||||
|
||||
if (newData.amountChangedByOperator && newData.amount < newData.planned)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Amount is smaller than planned (%1 < %2).")).arg(newData.amount).arg(newData.planned);
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Amount is smaller than planned (%1 < %2).")).arg(newData.amount).arg(newData.planned);
|
||||
|
||||
return ifs->updateObject(newData);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user