WebSVN – SmartDukaan – Diff – /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py



    if isinstance(recharge_order, DTHRechargeOrder):
        rechargeType = 'RCH'
        deviceNumber = recharge_order.dthAccountNumber
        strProviderCode = get_provider_code(recharge_order.dthOperatorId)
        plan = ''
    retStatus, retCode, spiceTID, description, aggTID, providerTID = RechargeService.rechargeDevice(recharge_order.id, rechargeType, strProviderCode, deviceNumber, recharge_order.totalAmount, plan)
    recharge_order.spiceTID = spiceTID
    recharge_order.responseTimestamp = datetime.datetime.now()
    recharge_order.description = description
    session.commit()
    if retCode == '00' and retStatus == 'S':

    strProviderCode = get_provider_code(rechargeTransaction.operatorId)
    if rechargeTransaction.deviceType == 1:
        rtype = 'MTP'
    else:
        rtype = 'RCH'
    retStatus, retCode, spiceTID, description, aggTID, providerTID = RechargeService.rechargeDevice(rechargeTransaction.id, rtype, strProviderCode, rechargeTransaction.deviceNum, rechargeTransaction.amount, rechargeTransaction.plan)
    rechargeTransaction.spiceTID = spiceTID
    rechargeTransaction.aggTID = aggTID
    rechargeTransaction.providerTID = providerTID
    rechargeTransaction.responseTime = datetime.datetime.now()
    rechargeTransaction.description = description
    if retCode == '00' and retStatus == 'S':
        rechargeTransaction.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL
        rechargeTransaction.invoiceNumber = get_next_invoice_number(OrderType.RCH4HOTSPOT)

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 7364 → 7369

Rev 7364		Rev 7369
Line 3910...		Line 3910...
3910	`if isinstance(recharge_order, DTHRechargeOrder):`	3910	`if isinstance(recharge_order, DTHRechargeOrder):`
3911	`rechargeType = 'RCH'`	3911	`rechargeType = 'RCH'`
3912	`deviceNumber = recharge_order.dthAccountNumber`	3912	`deviceNumber = recharge_order.dthAccountNumber`
3913	`strProviderCode = get_provider_code(recharge_order.dthOperatorId)`	3913	`strProviderCode = get_provider_code(recharge_order.dthOperatorId)`
3914	`plan = ''`	3914	`plan = ''`
3915	`retStatus, retCode, spiceTID, description = RechargeService.rechargeDevice(recharge_order.id, rechargeType, strProviderCode, deviceNumber, recharge_order.totalAmount, plan)`	3915	`retStatus, retCode, spiceTID, description, aggTID, providerTID = RechargeService.rechargeDevice(recharge_order.id, rechargeType, strProviderCode, deviceNumber, recharge_order.totalAmount, plan)`
3916	`recharge_order.spiceTID = spiceTID`	3916	`recharge_order.spiceTID = spiceTID`
3917	`recharge_order.responseTimestamp = datetime.datetime.now()`	3917	`recharge_order.responseTimestamp = datetime.datetime.now()`
3918	`recharge_order.description = description`	3918	`recharge_order.description = description`
3919	`session.commit()`	3919	`session.commit()`
3920	`if retCode == '00' and retStatus == 'S':`	3920	`if retCode == '00' and retStatus == 'S':`
Line 4831...		Line 4831...
4831	`strProviderCode = get_provider_code(rechargeTransaction.operatorId)`	4831	`strProviderCode = get_provider_code(rechargeTransaction.operatorId)`
4832	`if rechargeTransaction.deviceType == 1:`	4832	`if rechargeTransaction.deviceType == 1:`
4833	`rtype = 'MTP'`	4833	`rtype = 'MTP'`
4834	`else:`	4834	`else:`
4835	`rtype = 'RCH'`	4835	`rtype = 'RCH'`
4836	`retStatus, retCode, spiceTID, description = RechargeService.rechargeDevice(rechargeTransaction.id, rtype, strProviderCode, rechargeTransaction.deviceNum, rechargeTransaction.amount, rechargeTransaction.plan)`	4836	`retStatus, retCode, spiceTID, description, aggTID, providerTID = RechargeService.rechargeDevice(rechargeTransaction.id, rtype, strProviderCode, rechargeTransaction.deviceNum, rechargeTransaction.amount, rechargeTransaction.plan)`
4837	`rechargeTransaction.spiceTID = spiceTID`	4837	`rechargeTransaction.spiceTID = spiceTID`
-		4838	`rechargeTransaction.aggTID = aggTID`
-		4839	`rechargeTransaction.providerTID = providerTID`
4838	`rechargeTransaction.responseTime = datetime.datetime.now()`	4840	`rechargeTransaction.responseTime = datetime.datetime.now()`
4839	`rechargeTransaction.description = description`	4841	`rechargeTransaction.description = description`
4840	`if retCode == '00' and retStatus == 'S':`	4842	`if retCode == '00' and retStatus == 'S':`
4841	`rechargeTransaction.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL`	4843	`rechargeTransaction.status = RechargeOrderStatus.RECHARGE_SUCCESSFUL`
4842	`rechargeTransaction.invoiceNumber = get_next_invoice_number(OrderType.RCH4HOTSPOT)`	4844	`rechargeTransaction.invoiceNumber = get_next_invoice_number(OrderType.RCH4HOTSPOT)`