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

     return query.all()
 def create_recharge_transaction(t_recharge):
     rechargeTransaction = RechargeTransaction()
     rechargeTransaction.amount = t_recharge.amount
-    ##################################
-    #############TODO    rechargeTransaction.circleId =
+    rechargeTransaction.circleId = t_recharge.circleId
     rechargeTransaction.deviceNum = t_recharge.deviceNum
     rechargeTransaction.deviceType = t_recharge.deviceType
     rechargeTransaction.discount = t_recharge.discount
     rechargeTransaction.email = t_recharge.email
     rechargeTransaction.name = t_recharge.name
     rechargeTransaction.storeId = t_recharge.storeId
     rechargeTransaction.transactionTime = datetime.datetime.now()
     rechargeTransaction.operatorId = t_recharge.operatorId
     rechargeTransaction.plan = t_recharge.plan
     rechargeTransaction.ipAddress = t_recharge.ipAddress
+    rechargeTransaction.paymentAmount = t_recharge.paymentAmount
     session.commit()
     store = HotspotStore.get_by(id=rechargeTransaction.storeId)
     wallet = WalletForCompany.get_by(companyId=store.companyId)
     if store.availableLimit < rechargeTransaction.amount or wallet.amount < rechargeTransaction.amount:
     rechargeTransaction.spiceTID = spiceTID
     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)
     elif retCode in ('STO', 'US', 'UP') and retStatus == 'S':
         rechargeTransaction.status = RechargeOrderStatus.RECHARGE_UNKNOWN
     else:
         rechargeTransaction.status = RechargeOrderStatus.RECHARGE_FAILED
     session.commit()
     return rechargeTransaction
 def get_frcs(circleId, operatorId):
-    return FRC.query.filter(circleId == circleId).filter(operatorId == operatorId).all()
+    frcs = FRC.query.filter(FRC.circleId == circleId).filter(FRC.operatorId == operatorId).all()
+    if frcs is None:
+        return []
+    return frcs
 def get_recharge_transaction(rechargeId):
     recharge = RechargeTransaction.get_by(id = rechargeId)
     if not recharge:
         raise TransactionServiceException(108, "no such transaction")
     return recharge
+def get_hotspot_store(id, hotspotid):
+    store = None
+    if id > 0:
+        store = HotspotStore.query.filter(HotspotStore.id == id).first()
+    elif len(hotspotid) > 0:
+        store = HotspotStore.query.filter(HotspotStore.hotspotId == hotspotid).first()
+    else:
+        raise TransactionServiceException(119, 'No such store')
+    if store:
+        return store
+    else:
+        raise TransactionServiceException(119, 'No such store')
+def get_circle(id, code):
+    circle = None
+    if id > 0:
+        circle = TelecomCircle.get_by(id = id)
+    elif len(code) > 0:
+        circle = TelecomCircle.get_by(code = code)
+    else:
+        raise TransactionServiceException(119, 'No such circle')
+    if circle:
+        return circle
+    else:
+        raise TransactionServiceException(119, 'No such circle')
 if __name__ == '__main__':
     print 'helllo'

Subversion Repositories SmartDukaan

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