支付宝微信支付调整

app/service/order_service.py

@@ -236,8 +236,12 @@ def topUpSuccessAction(order_no):
     with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_pay_engine) as tamp_pay:
         tamp_user_session, tamp_pay_session = tamp_user.session, tamp_pay.session
         topup_order = tamp_user_session.query(OrderFlow).filter(OrderFlow.ab_ordernum == order_no).first()
+        if not topup_order:
+            raise CustomFlaskErr(Errors.NO_ORDERS)
+        else:
+            topup_order = topup_order.to_dict()
         # 幂等校验
-        if topup_order.ab_status == 'SUCCESS':
+        if topup_order.get('ab_status', '') == 'SUCCESS':
             return False
         tamp_user_session.query(OrderFlow).filter(OrderFlow.ab_ordernum == order_no).update({
             'ab_status': 'SUCCESS',
@@ -246,12 +250,14 @@ def topUpSuccessAction(order_no):
         })
         # 账户充值
         account_topup_order = tamp_user_session.query(OrderFlow).filter(OrderFlow.ab_ordernum == order_no).first().to_dict()
+        user_id = account_topup_order.get('createby', '')
+        ab_payment = account_topup_order.get('ab_payment', '')
         # 安卓支付宝，微信支付
-        if not tamp_pay_session.query(AccountBalance).filter(AccountBalance.user_id == account_topup_order.createby):
-            tamp_pay_session.add(AccountBalance(id=AccountBalance.__tablename__ + str(int(time.time()*10000)), user_id=account_topup_order.createby, android_balance=account_topup_order.ab_payment))
+        if not tamp_pay_session.query(AccountBalance).filter(AccountBalance.user_id == user_id).all():
+            tamp_pay_session.add(AccountBalance(id=AccountBalance.__tablename__ + str(int(time.time()*10000)), user_id=user_id, android_balance=ab_payment))
         else:
-            tamp_pay_session.query(AccountBalance).filter(AccountBalance.user_id == account_topup_order.createby).update({
-                'apple_balance': AccountBalance.android_balance + account_topup_order.ab_payment
+            tamp_pay_session.query(AccountBalance).filter(AccountBalance.user_id == user_id).update({
+                'android_balance': AccountBalance.android_balance + ab_payment
             })
 
 
@@ -260,9 +266,13 @@ def consumeSucessAction(order_no):
     """."""
     with TAMP_SQL(tamp_user_engine) as tamp_user:
         tamp_user_session = tamp_user.session
-        curriculum_order = tamp_user_session.query(OrderFlow.ab_ordernum == order_no).all()
+        curriculum_order = tamp_user_session.query(OrderFlow).filter(OrderFlow.ab_ordernum == order_no).first()
+        if not curriculum_order:
+            raise CustomFlaskErr(Errors.NO_ORDERS)
+        else:
+            curriculum_order = curriculum_order.to_dict()
         # 幂等校验
-        if curriculum_order.ab_status == 'SUCCESS':
+        if curriculum_order.get('ab_status', '') == 'SUCCESS':
             return False
         tamp_user_session.query(OrderFlow).filter(OrderFlow.ab_ordernum == order_no).update({
             'ab_status': 'SUCCESS',